Merge pull request n0k0m3#109 from Serph91P/main

fixed cli parameters so that it builds again

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
         run: ./download_apkmirror.sh
 
       - name: Build APKs
-        run: ./build_revanced.sh
+        run: ./build_revanced.sh clean
 
       - name: Set current date as env variable
         run: echo "date_now=$(date +'%Y-%m-%d')" >> $GITHUB_ENV

build.targets

@@ -1,6 +1,6 @@
-YOUTUBE_ROOT="true"
+YOUTUBE_ROOT="false"
 YOUTUBE_NONROOT="true"
-YTMUSIC_ROOT="true"
+YTMUSIC_ROOT="false"
 YTMUSIC_NONROOT="true"
 TIKTOK_NONROOT="true"
 TWITCH_NONROOT="true"

build_revanced.sh

@@ -60,7 +60,8 @@ populate_patches() {
 
 # cleanup to fetch new revanced on next run
 if [[ "$1" == "clean" ]]; then
-    rm -f revanced-cli.jar revanced-integrations.apk revanced-patches.jar
+    rm -f revanced-cli.jar revanced-integrations.apk revanced-patches.jar vanced-microG.apk
+    rm -rf build/*
     exit
 fi
 
@@ -101,10 +102,14 @@ echo "Building YouTube Root APK"
 echo "************************************"
 
 if [ -f "com.google.android.youtube.apk" ]; then
-    java -jar revanced-cli.jar -m revanced-integrations.apk -b revanced-patches.jar --mount \
+    java -jar revanced-cli.jar patch \
+	-m revanced-integrations.apk \ 
+	-b revanced-patches.jar \
+	--mount \
         -e microg-support ${patches[@]} \
         $EXPERIMENTAL \
-        -a com.google.android.youtube.apk -o "build/revanced-youtube-$(cat versions.json | grep -oP '(?<="com.google.android.youtube.apk": ")[^"]*')-root.apk"
+        -o "build/revanced-youtube-$(cat versions.json | grep -oP '(?<="com.google.android.youtube.apk": ")[^"]*')-root.apk" \
+	com.google.android.youtube.apk
 else
     echo "Cannot find YouTube APK, skipping build"
 fi
@@ -116,10 +121,13 @@ echo "Building YouTube Non-root APK"
 echo "************************************"
 
 if [ -f "com.google.android.youtube.apk" ]; then
-    java -jar revanced-cli.jar -m revanced-integrations.apk -b revanced-patches.jar \
+    java -jar revanced-cli.jar patch \
+    	-m revanced-integrations.apk \
+    	-b revanced-patches.jar \
         ${patches[@]} \
         $EXPERIMENTAL \
-        -a com.google.android.youtube.apk -o "build/revanced-youtube-$(cat versions.json | grep -oP '(?<="com.google.android.youtube.apk": ")[^"]*').apk"
+	-o "build/revanced-youtube-$(cat versions.json | grep -oP '(?<="com.google.android.youtube.apk": ")[^"]*').apk" \
+ 	com.google.android.youtube.apk
 else
     echo "Cannot find YouTube APK, skipping build"
 fi
@@ -132,10 +140,13 @@ echo "************************************"
 
 if [ -f "com.google.android.apps.youtube.music.apk" ]; then
     echo "Building Root APK"
-    java -jar revanced-cli.jar -b revanced-patches.jar --mount \
+    java -jar revanced-cli.jar \
+    	-b revanced-patches.jar \
+     	--mount \
         -e microg-support ${patches[@]} \
         $EXPERIMENTAL \
-        -a com.google.android.apps.youtube.music.apk -o "build/revanced-music-$(cat versions.json | grep -oP '(?<="com.google.android.apps.youtube.music.apk": ")[^"]*')-root.apk"
+        -o "build/revanced-music-$(cat versions.json | grep -oP '(?<="com.google.android.apps.youtube.music.apk": ")[^"]*')-root.apk" \
+	com.google.android.apps.youtube.music.apk 
 else
     echo "Cannot find YouTube Music APK, skipping build"
 fi
@@ -148,10 +159,12 @@ echo "************************************"
 
 if [ -f "com.google.android.apps.youtube.music.apk" ]; then
     echo "Building Non-root APK"
-    java -jar revanced-cli.jar -b revanced-patches.jar \
+    java -jar revanced-cli.jar patch \
+    	-b revanced-patches.jar \
         ${patches[@]} \
         $EXPERIMENTAL \
-        -a com.google.android.apps.youtube.music.apk -o "build/revanced-music-$(cat versions.json | grep -oP '(?<="com.google.android.apps.youtube.music.apk": ")[^"]*').apk"
+        -o "build/revanced-music-$(cat versions.json | grep -oP '(?<="com.google.android.apps.youtube.music.apk": ")[^"]*').apk" \
+	com.google.android.apps.youtube.music.apk
 else
     echo "Cannot find YouTube Music APK, skipping build"
 fi
@@ -165,10 +178,13 @@ echo "************************************"
 
 if [ -f "com.zhiliaoapp.musically.apk" ]; then
     echo "Building Non-root APK"
-    java -Xmx8192m -jar revanced-cli.jar -m revanced-integrations.apk -b revanced-patches.jar \
+    java -Xmx8192m -jar revanced-cli.jar patch \
+    	-m revanced-integrations.apk \
+     	-b revanced-patches.jar \
         ${patches[@]} \
         $EXPERIMENTAL \
-        -a com.zhiliaoapp.musically.apk -o "build/revanced-tiktok-$(cat versions.json | grep -oP '(?<="com.zhiliaoapp.musically.apk": ")[^"]*').apk"
+        -o "build/revanced-tiktok-$(cat versions.json | grep -oP '(?<="com.zhiliaoapp.musically.apk": ")[^"]*').apk" \
+	com.zhiliaoapp.musically.apk 
 else
     echo "Cannot find TikTok APK, skipping build"
 fi
@@ -181,10 +197,13 @@ echo "************************************"
 
 if [ -f "tv.twitch.android.app.apk" ]; then
     echo "Building Non-root APK"
-    java -jar revanced-cli.jar -m revanced-integrations.apk -b revanced-patches.jar \
+    java -jar revanced-cli.jar patch \
+    	-m revanced-integrations.apk \
+     	-b revanced-patches.jar \
         ${patches[@]} \
         $EXPERIMENTAL \
-        -a tv.twitch.android.app.apk -o "build/revanced-twitch-$(cat versions.json | grep -oP '(?<="tv.twitch.android.app.apk": ")[^"]*').apk"
+        -o "build/revanced-twitch-$(cat versions.json | grep -oP '(?<="tv.twitch.android.app.apk": ")[^"]*').apk" \
+	tv.twitch.android.app.apk 
 else
     echo "Cannot find Twitch APK, skipping build"
 fi

versions.json

@@ -1,6 +1,6 @@
 {
-    "com.google.android.youtube.apk": "18.19.35",
+    "com.google.android.youtube.apk": "18.45.43",
     "com.google.android.apps.youtube.music.apk": "6.02.54",
     "com.zhiliaoapp.musically.apk": "27.8.3",
-    "tv.twitch.android.app.apk": "14.6.1"
+    "tv.twitch.android.app.apk": "16.9.1"
 }