From 8ef5f193661b929de59e012696ce2ce8be141285 Mon Sep 17 00:00:00 2001 From: siritami <102145692+FiorenMas@users.noreply.github.com> Date: Fri, 6 Oct 2023 22:13:17 +0700 Subject: [PATCH] bump compatibility RV cli v4.0.0, added Tumblr --- .github/workflows/patch.yml | 12 +++---- README.md | 16 ++++----- src/build/ReX.sh | 10 +++--- src/build/Revanced-1.sh | 2 +- src/build/Revanced-2.sh | 2 +- src/build/Revanced-3.sh | 9 ++--- src/build/Revanced-Extended-Android-6-7.sh | 6 ++-- src/build/Revanced-Extended.sh | 10 +++--- src/build/utils.sh | 36 ++++++++++++++++---- src/patches/tumblr/exclude-patches | 1 + src/patches/tumblr/include-patches | 1 + src/patches/youtube-revanced/exclude-patches | 1 + 12 files changed, 66 insertions(+), 40 deletions(-) create mode 100644 src/patches/tumblr/exclude-patches create mode 100644 src/patches/tumblr/include-patches diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index b2b03c8..7f40687 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -36,7 +36,7 @@ jobs: uses: softprops/action-gh-release@v0.1.15 with: files: | - ./build/* + ./release/* revanced-version.txt name: Revanced & Revanced Extended tag_name: all @@ -75,7 +75,7 @@ jobs: uses: softprops/action-gh-release@v0.1.15 with: files: | - ./build/* + ./release/* revanced-version.txt name: Revanced & Revanced Extended tag_name: all @@ -114,7 +114,7 @@ jobs: uses: softprops/action-gh-release@v0.1.15 with: files: | - ./build/* + ./release/* revanced-version.txt name: Revanced & Revanced Extended tag_name: all @@ -153,7 +153,7 @@ jobs: uses: softprops/action-gh-release@v0.1.15 with: files: | - ./build/* + ./release/* revanced-extended-version.txt name: Revanced & Revanced Extended tag_name: all @@ -192,7 +192,7 @@ jobs: uses: softprops/action-gh-release@v0.1.15 with: files: | - ./build/* + ./release/* ReX-version.txt name: Revanced & Revanced Extended tag_name: all @@ -231,7 +231,7 @@ jobs: uses: softprops/action-gh-release@v0.1.15 with: files: | - ./build/* + ./release/* revanced-extended-android-6-7-version.txt name: Revanced & Revanced Extended tag_name: all diff --git a/README.md b/README.md index fb1c2f9..9529a91 100644 --- a/README.md +++ b/README.md @@ -179,6 +179,14 @@ Download --- +[![Tumblr](https://img.shields.io/badge/Tumblr-%2336465D.svg?style=for-the-badge&logo=Tumblr&logoColor=white)](https://play.google.com/store/apps/details?id=com.tumblr) + +### Revanced: + +[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/tumblr-revanced.apk) + +--- + ### [Pixiv:](https://play.google.com/store/apps/details?id=jp.pxv.android) ### Revanced: @@ -211,14 +219,6 @@ Download --- -### [VSCO: Photo & Video Editor:](https://play.google.com/store/apps/details?id=com.vsco.cam) - -### Revanced: - -[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/vsco-revanced.apk) - ---- - # ⚠️ License: [@luxysiv](https://github.com/luxysiv/yt-revanced-nonroot) - [GPL-3.0](https://github.com/luxysiv/revanced-nonroot/blob/main/LICENSE) diff --git a/src/build/ReX.sh b/src/build/ReX.sh index 386cc14..2e215fe 100644 --- a/src/build/ReX.sh +++ b/src/build/ReX.sh @@ -11,7 +11,7 @@ checker "YT-Advanced/ReX-patches" "ReX" # Download requirements dl_gh "ReX-patches ReX-integrations" "YT-Advanced" "latest" -dl_gh "revanced-cli" "revanced" "latest" +dl_gh "revanced-cli" "revanced" "tags/v3.1.1" ################################################# @@ -19,7 +19,7 @@ dl_gh "revanced-cli" "revanced" "latest" get_patches_key "youtube-ReX" get_ver "Hide general ads" "com.google.android.youtube" get_apk "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "ReX" +-patch "youtube" "ReX" ################################################# @@ -28,19 +28,19 @@ patch "youtube" "ReX" get_patches_key "youtube-music-ReX" get_ver "Hide music ads" "com.google.android.apps.youtube.music" get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" -patch "youtube-music-arm64-v8a" "ReX" +-patch "youtube-music-arm64-v8a" "ReX" # Armeabi-v7a get_patches_key "youtube-music-ReX" get_ver "Hide music ads" "com.google.android.apps.youtube.music" get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" -patch "youtube-music-armeabi-v7a" "ReX" +-patch "youtube-music-armeabi-v7a" "ReX" ################################################# # Split architecture: rm -f revanced-cli* revanced-patches*.jar patches.json dl_gh "revanced-cli" "j-hc" "latest" -dl_gh "revanced-patches" "revanced" "latest" +dl_gh "revanced-patches" "revanced" "tags/v2.190.0" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-ReX" "youtube-${archs[i]}-ReX" "$(gen_rip_libs ${libs[i]})" diff --git a/src/build/Revanced-1.sh b/src/build/Revanced-1.sh index 059f0dd..93ec603 100644 --- a/src/build/Revanced-1.sh +++ b/src/build/Revanced-1.sh @@ -37,7 +37,7 @@ patch "youtube-music-armeabi-v7a" "revanced" # Split architecture: rm -f revanced-cli* revanced-patches*.jar patches.json dl_gh "revanced-cli" "j-hc" "latest" -dl_gh "revanced-patches" "revanced" "latest" +dl_gh "revanced-patches" "revanced" "tags/v2.190.0" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-revanced" "youtube-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})" diff --git a/src/build/Revanced-2.sh b/src/build/Revanced-2.sh index 14a265e..6be1853 100644 --- a/src/build/Revanced-2.sh +++ b/src/build/Revanced-2.sh @@ -55,7 +55,7 @@ patch "reddit" "revanced" # Patch Tiktok: get_patches_key "tiktok" -version="30.5.2" +get_ver "Hide ads" "com.zhiliaoapp.musically" get_apk "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" patch "tiktok" "revanced" diff --git a/src/build/Revanced-3.sh b/src/build/Revanced-3.sh index a2fd4fa..4148868 100644 --- a/src/build/Revanced-3.sh +++ b/src/build/Revanced-3.sh @@ -35,10 +35,11 @@ patch "windy" "revanced" ################################################# -# Patch VSCO: Photo & Video Editor: -get_patches_key "vsco" -get_apk "vsco" "vsco-cam" "vsco/vsco-cam/vsco-cam" -patch "vsco" "revanced" +# Patch Tumblr: +get_patches_key "tumblr" +version=31.5.0.110 +get_apk "tumblr" "tumblr" "tumblr-inc/tumblr/tumblr" +patch "tumblr" "revanced" ################################################# diff --git a/src/build/Revanced-Extended-Android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh index 51598a6..2d4b24c 100644 --- a/src/build/Revanced-Extended-Android-6-7.sh +++ b/src/build/Revanced-Extended-Android-6-7.sh @@ -11,7 +11,7 @@ checker "kitadai31/revanced-patches-android6-7" "revanced-extended-android-6-7" # Download requirements dl_gh "revanced-patches-android6-7 revanced-integrations" "kitadai31" "latest" -dl_gh "revanced-cli" "revanced" "latest" +dl_gh "revanced-cli" "revanced" "tags/v3.1.1" ################################################# @@ -19,14 +19,14 @@ dl_gh "revanced-cli" "revanced" "latest" get_patches_key "youtube-revanced-extended-6-7" version="17.34.36" get_apk "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "revanced-extended-android-6-7" +-patch "youtube" "revanced-extended-android-6-7" ################################################# # Split architecture: rm -f revanced-cli* revanced-patches*.jar patches.json dl_gh "revanced-cli" "j-hc" "latest" -dl_gh "revanced-patches" "revanced" "latest" +dl_gh "revanced-patches" "revanced" "tags/v2.190.0" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-revanced-extended-android-6-7" "youtube-${archs[i]}-revanced-extended-android-6-7" "$(gen_rip_libs ${libs[i]})" diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended.sh index 8a26166..3247ca5 100644 --- a/src/build/Revanced-Extended.sh +++ b/src/build/Revanced-Extended.sh @@ -18,7 +18,7 @@ dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "latest" get_patches_key "youtube-revanced-extended" get_ver "Hide general ads" "com.google.android.youtube" get_apk "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "revanced-extended" +-patch "youtube" "revanced-extended" ################################################# @@ -27,26 +27,26 @@ patch "youtube" "revanced-extended" get_patches_key "youtube-music-revanced-extended" get_ver "Hide music ads" "com.google.android.apps.youtube.music" get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" -patch "youtube-music-arm64-v8a" "revanced-extended" +-patch "youtube-music-arm64-v8a" "revanced-extended" # Armeabi-v7a get_patches_key "youtube-music-revanced-extended" get_ver "Hide music ads" "com.google.android.apps.youtube.music" get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" -patch "youtube-music-armeabi-v7a" "revanced-extended" +-patch "youtube-music-armeabi-v7a" "revanced-extended" ################################################# # Patch Reddit: get_patches_key "reddit" get_apk "reddit" "reddit" "redditinc/reddit/reddit" -patch "reddit" "revanced-extended" +-patch "reddit" "revanced-extended" ################################################# # Split architecture: rm -f revanced-cli* revanced-patches*.jar patches.json dl_gh "revanced-cli" "j-hc" "latest" -dl_gh "revanced-patches" "revanced" "latest" +dl_gh "revanced-patches" "revanced" "tags/v2.190.0" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})" diff --git a/src/build/utils.sh b/src/build/utils.sh index 2c9ce11..8ff3c6c 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -1,5 +1,7 @@ #!/bin/bash +mkdir ./release + ################################################# # Checking new patch: @@ -64,7 +66,6 @@ get_ver() { ################################################# # Download apks files from APKMirror: - _req() { if [ "$2" = - ]; then wget -nv -O "$2" --header="$3" "$1" @@ -134,7 +135,9 @@ patch() { ${INCLUDE_PATCHES[@]} \ --options=./src/options/$2.json \ --keystore=./src/ks.keystore \ - --out=./build/$1-$2.apk \ + --out=./release/$1-$2.apk \ + --alias alias \ + --keystore-entry-password ReVanced \ $1.apk unset version unset EXCLUDE_PATCHES @@ -145,6 +148,25 @@ patch() { } # Patching apps with Revanced CLI (old version): +-patch() { + if [ -f "$1.apk" ]; then + java -jar revanced-cli*.jar patch \ + --patch-bundle revanced-patches*.jar \ + --merge revanced-integrations*.apk \ + ${EXCLUDE_PATCHES[@]} \ + ${INCLUDE_PATCHES[@]} \ + --options=./src/options/$2.json \ + --keystore=./src/ks.keystore \ + --out=./release/$1-$2.apk \ + $1.apk + unset version + unset EXCLUDE_PATCHES + unset INCLUDE_PATCHES + else + exit 1 + fi +} + _patch() { if [ -f "$1.apk" ]; then java -jar revanced-cli*.jar \ @@ -155,7 +177,7 @@ _patch() { ${INCLUDE_PATCHES[@]} \ --options=./src/options/$2.json \ --keystore=./src/ks.keystore \ - -o ./build/$1-$2.apk + -o ./release/$1-$2.apk unset version unset EXCLUDE_PATCHES unset INCLUDE_PATCHES @@ -175,13 +197,13 @@ gen_rip_libs() { done } split_arch() { - if [ -f "./build/$1.apk" ]; then + if [ -f "./release/$1.apk" ]; then java -jar revanced-cli*.jar patch \ --patch-bundle revanced-patches*.jar \ $3 \ - --keystore=./src/ks.keystore \ - --out=./build/$2.apk\ - ./build/$1.apk + --keystore=./src/_ks.keystore \ + --out=./release/$2.apk\ + ./release/$1.apk else exit 1 fi diff --git a/src/patches/tumblr/exclude-patches b/src/patches/tumblr/exclude-patches new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/patches/tumblr/exclude-patches @@ -0,0 +1 @@ + diff --git a/src/patches/tumblr/include-patches b/src/patches/tumblr/include-patches new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/patches/tumblr/include-patches @@ -0,0 +1 @@ + diff --git a/src/patches/youtube-revanced/exclude-patches b/src/patches/youtube-revanced/exclude-patches index 95c8656..c09adf1 100644 --- a/src/patches/youtube-revanced/exclude-patches +++ b/src/patches/youtube-revanced/exclude-patches @@ -11,3 +11,4 @@ hide-video-action-buttons hide-captions-button hide-timestamp spoof-app-version +Return YouTube Dislike