diff --git a/README.md b/README.md index 06b2640..b236b24 100644 --- a/README.md +++ b/README.md @@ -234,7 +234,7 @@ Old patches, because latest patch not support split apks | Stable version | Beta version | | ---------------------------------------------------------------------- | ------------------------------------------------------------------------- | | [All Architectures](../../releases/download/all/tiktok-revanced.apk) | [All Architectures](../../releases/download/all/tiktok-beta-revanced.apk) | -| [Arm64-v8a](../../releases/download/all/tiktok-arm64-v8a-revanced.apk) | [Arm64-v8a](../../releases/download/all/tiktok-arm64-v8a-beta-revanced.apk) | +| [Arm64-v8a](../../releases/download/all/tiktok-arm64-v8a-revanced.apk) | [Arm64-v8a](../../releases/download/all/tiktok-beta-arm64-v8a-revanced.apk) | --- diff --git a/src/build/Revanced-Beta.sh b/src/build/Revanced-Beta.sh index 4a13826..5a006d4 100644 --- a/src/build/Revanced-Beta.sh +++ b/src/build/Revanced-Beta.sh @@ -41,7 +41,7 @@ revanced_dl(){ # Patch Facebook: # Arm64-v8a get_patches_key "facebook" - version="490.0.0.63.82" + version="490.0.0.63.82" #Force this version because only patch in this version get_apk "com.facebook.katana" "facebook-arm64-v8a-beta" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+" patch "facebook-arm64-v8a-beta" "revanced" } @@ -58,11 +58,19 @@ revanced_dl(){ patch "gg-photos-armeabi-v7a-beta" "revanced" } 4() { - revanced_dl + dl_gh "revanced-patches" "revanced" "v5.7.2" #Force version this because crash on startup lastest rv patches + dl_gh "revanced-cli" "revanced" "latest" # Patch Tiktok: get_patches_key "tiktok" - get_apk "com.zhiliaoapp.musically" "tiktok-beta" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" + version="37.0.4" #Force this version beacause warning on old version but missing settings menu https://github.com/ReVanced/revanced-patches/issues/4221#issuecomment-2564776573 + get_apk "com.zhiliaoapp.musically" "tiktok-beta" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" "Bundle_extract" + split_editor "tiktok-beta" "tiktok-beta" patch "tiktok-beta" "revanced" + # Patch Tiktok Arm64-v8a: + split_editor "tiktok-beta" "tiktok-beta-arm64-v8a" "exclude" "split_config.armeabi_v7a" + patch "tiktok-beta-arm64-v8a" "revanced" + rm -f *.rvp *.jar + revanced_dl # Patch Instagram: # Arm64-v8a get_patches_key "instagram" diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh index 6014434..674687a 100644 --- a/src/build/Revanced.sh +++ b/src/build/Revanced.sh @@ -40,7 +40,7 @@ revanced_dl(){ # Patch Facebook: # Arm64-v8a get_patches_key "facebook" - version="490.0.0.63.82" + version="490.0.0.63.82" #Force this version because only patch in this version get_apk "com.facebook.katana" "facebook-arm64-v8a" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+" patch "facebook-arm64-v8a" "revanced" } @@ -57,12 +57,19 @@ revanced_dl(){ patch "gg-photos-armeabi-v7a" "revanced" } 4() { - revanced_dl + dl_gh "revanced-patches" "revanced" "v5.7.2" #Force version this because crash on startup lastest rv patches + dl_gh "revanced-cli" "revanced" "latest" # Patch Tiktok: get_patches_key "tiktok" - version="37.0.4" - get_apk "com.zhiliaoapp.musically" "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" + version="37.0.4" #Force this version but missing settings https://github.com/ReVanced/revanced-patches/issues/4221#issuecomment-2564776573 + get_apk "com.zhiliaoapp.musically" "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" "Bundle_extract" + split_editor "tiktok" "tiktok" patch "tiktok" "revanced" + # Patch Tiktok Arm64-v8a: + split_editor "tiktok" "tiktok-arm64-v8a" "exclude" "split_config.armeabi_v7a" + patch "tiktok-arm64-v8a" "revanced" + rm -f *.rvp *.jar + revanced_dl # Patch Instagram: # Arm64-v8a get_patches_key "instagram" diff --git a/src/build/utils.sh b/src/build/utils.sh index 46b36eb..c5a2e38 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -259,15 +259,15 @@ get_apk() { patch() { green_log "[+] Patching $1:" if [ -f "./download/$1.apk" ]; then - local p b m ks a pu opt + local p b m ks a pu opt force if [ "$3" = inotia ]; then - p="patch " b="-p *.rvp" m="" a="" ks="_ks" pu="--purge=true" opt="--legacy-options=./src/options/$2.json" + p="patch " b="-p *.rvp" m="" a="" ks="_ks" pu="--purge=true" opt="--legacy-options=./src/options/$2.json" force=" --force" echo "Patching with Revanced-cli inotia" else if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then num=${BASH_REMATCH[1]} if [ $num -ge 5 ]; then - p="patch " b="-p *.rvp" m="" a="" ks="ks" pu="--purge=true" opt="" + p="patch " b="-p *.rvp" m="" a="" ks="ks" pu="--purge=true" opt="" force=" --force" echo "Patching with Revanced-cli version 5+" elif [ $num -eq 4 ]; then p="patch " b="--patch-bundle *patch*.jar" m="--merge *integration*.apk " a="" ks="ks" pu="--purge=true" opt="--options=./src/options/$2.json " @@ -284,7 +284,7 @@ patch() { if [ "$3" = inotia ]; then unset CI GITHUB_ACTION GITHUB_ACTIONS GITHUB_ACTOR GITHUB_ENV GITHUB_EVENT_NAME GITHUB_EVENT_PATH GITHUB_HEAD_REF GITHUB_JOB GITHUB_REF GITHUB_REPOSITORY GITHUB_RUN_ID GITHUB_RUN_NUMBER GITHUB_SHA GITHUB_WORKFLOW GITHUB_WORKSPACE RUN_ID RUN_NUMBER fi - eval java -jar *cli*.jar $p$b $m$opt --out=./release/$1-$2.apk$excludePatches$includePatches --keystore=./src/$ks.keystore $pu $a./download/$1.apk + eval java -jar *cli*.jar $p$b $m$opt --out=./release/$1-$2.apk$excludePatches$includePatches --keystore=./src/$ks.keystore $pu$force $a./download/$1.apk unset version unset lock_version unset excludePatches