From e5baa1125142e310f82d37deba99ce8468e220c8 Mon Sep 17 00:00:00 2001 From: Fioren <102145692+FiorenMas@users.noreply.github.com> Date: Sat, 21 Dec 2024 23:49:04 +0700 Subject: [PATCH] fix lastest rve --- .github/workflows/ci.yml | 12 ----- .github/workflows/manual-patch.yml | 21 --------- README.md | 6 ++- src/build/Revanced-Extended-Beta.sh | 63 +++++++++++++++++---------- src/build/Revanced-Extended-Reddit.sh | 19 -------- src/build/Revanced-Extended.sh | 63 +++++++++++++++++---------- src/build/utils.sh | 27 ++++++++++++ 7 files changed, 109 insertions(+), 102 deletions(-) delete mode 100644 src/build/Revanced-Extended-Reddit.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8bc9550..892d9fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,10 +45,6 @@ jobs: id: check-rve-beta if: steps.check-gh.outputs.internet_error == '0' run: bash src/etc/ci.sh inotia00/revanced-patches prerelease youtube-beta-revanced-extended.apk - - name: Check new patch Revanced Extended Reddit - id: check-rve-reddit - if: steps.check-gh.outputs.internet_error == '0' - run: bash src/etc/ci.sh inotia00/revanced-patches-arsclib latest reddit-revanced-extended.apk - name: Check new patch Twitter Piko Stable id: check-twitter-piko-stable if: steps.check-gh.outputs.internet_error == '0' @@ -106,7 +102,6 @@ jobs: check_rve_anddea_beta: ${{ steps.check-rve-anddea-beta.outputs.new_patch }} check_rve: ${{ steps.check-rve.outputs.new_patch }} check_rve_beta: ${{ steps.check-rve-beta.outputs.new_patch }} - check_rve_reddit: ${{ steps.check-rve-reddit.outputs.new_patch }} check_twitter_piko_stable: ${{ steps.check-twitter-piko-stable.outputs.new_patch }} check_twitter_piko_beta: ${{ steps.check-twitter-piko-beta.outputs.new_patch }} check_rve67: ${{ steps.check-rve67.outputs.new_patch }} @@ -156,13 +151,6 @@ jobs: uses: ./.github/workflows/manual-patch.yml with: org: "Revanced Extended Beta" - Patch-Revanced-Extended-Reddit: - name: Patch Revanced Extended Reddit - needs: check - if: ${{ needs.check.outputs.check_rve_reddit == 1 }} - uses: ./.github/workflows/manual-patch.yml - with: - org: "Revanced Extended Reddit" Patch-Twitter-Piko-Stable: name: Patch Twitter Piko Stable needs: check diff --git a/.github/workflows/manual-patch.yml b/.github/workflows/manual-patch.yml index 49a8b73..b0828b1 100644 --- a/.github/workflows/manual-patch.yml +++ b/.github/workflows/manual-patch.yml @@ -18,7 +18,6 @@ on: - 'Revanced Beta' - 'Revanced Extended' - 'Revanced Extended Beta' - - 'Revanced Extended Reddit' - 'RVE-anddea-stable' - 'RVE-anddea-beta' - 'Twitter Piko Stable' @@ -172,26 +171,6 @@ jobs: id: release-rve-beta if: steps.check-gh-rve-beta.outputs.internet_error == '0' uses: ./.github/actions/release - patch_rve_reddit: - name: Patch Revanced Extended Reddit - if: ${{ github.event.inputs.org == 'Revanced Extended Reddit' || inputs.org == 'Revanced Extended Reddit' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.2.2 - - name: Preparing to patch - uses: ./.github/actions/preparing - - name: Check github connection - id: check-gh-rve-reddit - run: bash src/etc/connection.sh - - name: Patch apk - id: patch-rve-reddit - if: steps.check-gh-rve-reddit.outputs.internet_error == '0' - run: bash src/build/Revanced-Extended-Reddit.sh - - name: Releasing APK files - id: release-rve-reddit - if: steps.check-gh-rve-reddit.outputs.internet_error == '0' - uses: ./.github/actions/release patch_twitter_piko_stable: name: Patch Twitter Piko Stable if: ${{ github.event.inputs.org == 'Twitter Piko Stable' || inputs.org == 'Twitter Piko Stable' }} diff --git a/README.md b/README.md index 152b459..aef1d72 100644 --- a/README.md +++ b/README.md @@ -244,9 +244,11 @@ Download [![Reddit](https://img.shields.io/badge/Reddit-%23FF4500.svg?style=for-the-badge&logo=Reddit&logoColor=white)](https://play.google.com/store/apps/details?id=com.reddit.frontpage) -### [Revanced Extended: (Version 2024.18.0+)](https://github.com/inotia00/revanced-patches-arsclib) +### Revanced Extended: -[All Architectures](../../releases/download/all/reddit-revanced-extended.apk) +| Stable version | Beta version | +| ----------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- | +| [All Architectures](../../releases/download/all/reddit-revanced-extended.apk) | [All Architectures](../../releases/download/all/reddit-beta-revanced-extended.apk) | --- diff --git a/src/build/Revanced-Extended-Beta.sh b/src/build/Revanced-Extended-Beta.sh index cba1700..d872a5f 100644 --- a/src/build/Revanced-Extended-Beta.sh +++ b/src/build/Revanced-Extended-Beta.sh @@ -9,27 +9,37 @@ revanced_dl(){ 1() { revanced_dl + #Disabled because lastest RVE patch youtube not have splits apk on APKMirror + # Patch YouTube: + #get_patches_key "youtube-revanced-extended" + #get_apk "com.google.android.youtube" "youtube-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + #split_editor "youtube-beta" "youtube-beta" + #patch "youtube-beta" "revanced-extended" "inotia" + # Patch Youtube Arm64-v8a + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube-beta" "youtube-beta-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" + #patch "youtube-beta-arm64-v8a" "revanced-extended" "inotia" + # Patch Youtube Armeabi-v7a + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube-beta" "youtube-beta-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" + #patch "youtube-beta-armeabi-v7a" "revanced-extended" "inotia" + # Patch Youtube x86 + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube-beta" "youtube-beta-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" + #patch "youtube-beta-x86" "revanced-extended" "inotia" + # Patch Youtube x86_64 + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube-beta" "youtube-beta-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" + #patch "youtube-beta-x86_64" "revanced-extended" "inotia" # Patch YouTube: get_patches_key "youtube-revanced-extended" - get_apk "com.google.android.youtube" "youtube-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract" - split_editor "youtube-beta" "youtube-beta" + get_apk "com.google.android.youtube" "youtube-beta" "youtube" "google-inc/youtube/youtube" patch "youtube-beta" "revanced-extended" "inotia" - # Patch Youtube Arm64-v8a + # Split architecture Youtube: get_patches_key "youtube-revanced-extended" - split_editor "youtube-beta" "youtube-beta-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" - patch "youtube-beta-arm64-v8a" "revanced-extended" "inotia" - # Patch Youtube Armeabi-v7a - get_patches_key "youtube-revanced-extended" - split_editor "youtube-beta" "youtube-beta-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" - patch "youtube-beta-armeabi-v7a" "revanced-extended" "inotia" - # Patch Youtube x86 - get_patches_key "youtube-revanced-extended" - split_editor "youtube-beta" "youtube-beta-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" - patch "youtube-beta-x86" "revanced-extended" "inotia" - # Patch Youtube x86_64 - get_patches_key "youtube-revanced-extended" - split_editor "youtube-beta" "youtube-beta-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" - patch "youtube-beta-x86_64" "revanced-extended" "inotia" + for i in {0..3}; do + split_arch "youtube-beta" "revanced-extended" "$(gen_rip_libs ${libs[i]})" + done } 2() { revanced_dl @@ -45,15 +55,20 @@ revanced_dl(){ } 3() { revanced_dl - get_apk "com.google.android.youtube" "youtube-lite-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + # Patch Reddit: + get_patches_key "reddit-rve" + get_apk "com.reddit.frontpage" "reddit-beta" "reddit" "redditinc/reddit/reddit" "Bundle" + patch "reddit-beta" "revanced-extended" + #Disabled because lastest RVE patch youtube not have splits apk on APKMirror + #get_apk "com.google.android.youtube" "youtube-lite-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract" # Patch YouTube Lite Arm64-v8a: - get_patches_key "youtube-revanced-extended" - split_editor "youtube-lite-beta" "youtube-lite-beta-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xhdpi split_config.xxxhdpi" - patch "youtube-lite-beta-arm64-v8a" "revanced-extended" "inotia" + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube-lite-beta" "youtube-lite-beta-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xhdpi split_config.xxxhdpi" + #patch "youtube-lite-beta-arm64-v8a" "revanced-extended" "inotia" # Patch YouTube Lite Armeabi-v7a: - get_patches_key "youtube-revanced-extended" - split_editor "youtube-lite-beta" "youtube-lite-beta-armeabi-v7a" "include" "split_config.armeabi_v7a split_config.en split_config.xhdpi split_config.xxxhdpi" - patch "youtube-lite-beta-armeabi-v7a" "revanced-extended" "inotia" + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube-lite-beta" "youtube-lite-beta-armeabi-v7a" "include" "split_config.armeabi_v7a split_config.en split_config.xhdpi split_config.xxxhdpi" + #patch "youtube-lite-beta-armeabi-v7a" "revanced-extended" "inotia" } case "$1" in 1) diff --git a/src/build/Revanced-Extended-Reddit.sh b/src/build/Revanced-Extended-Reddit.sh deleted file mode 100644 index 71945b4..0000000 --- a/src/build/Revanced-Extended-Reddit.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# Revanced Extended Arsclib build -source src/build/utils.sh - -################################################# - -# Download requirements -dl_gh "revanced-patches-arsclib revanced-integrations revanced-cli-arsclib" "inotia00" "latest" - -################################################# - -# Patch Reddit: -get_patches_key "reddit-rve" -version="2024.49.1" -get_apk "com.reddit.frontpage" "reddit" "reddit" "redditinc/reddit/reddit" "Bundle" -patch "reddit" "revanced-extended" -mv ./release/reddit-revanced-extended.apk/base.apk ./reddit-revanced-extended.apk -rm -f -d ./release/reddit-revanced-extended.apk -mv ./reddit-revanced-extended.apk ./release/reddit-revanced-extended.apk diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended.sh index d2ee247..269d632 100644 --- a/src/build/Revanced-Extended.sh +++ b/src/build/Revanced-Extended.sh @@ -9,27 +9,37 @@ revanced_dl(){ 1() { revanced_dl + #Disabled because lastest RVE patch youtube not have splits apk on APKMirror + # Patch YouTube: + #get_patches_key "youtube-revanced-extended" + #get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + #split_editor "youtube" "youtube" + #patch "youtube" "revanced-extended" "inotia" + # Patch Youtube Arm64-v8a + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube" "youtube-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" + #patch "youtube-arm64-v8a" "revanced-extended" "inotia" + # Patch Youtube Armeabi-v7a + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube" "youtube-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" + #patch "youtube-armeabi-v7a" "revanced-extended" "inotia" + # Patch Youtube x86 + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube" "youtube-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" + #patch "youtube-x86" "revanced-extended" "inotia" + # Patch Youtube x86_64 + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube" "youtube-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" + #patch "youtube-x86_64" "revanced-extended" "inotia" # Patch YouTube: get_patches_key "youtube-revanced-extended" - get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" "Bundle_extract" - split_editor "youtube" "youtube" + get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" patch "youtube" "revanced-extended" "inotia" - # Patch Youtube Arm64-v8a + # Split architecture Youtube: get_patches_key "youtube-revanced-extended" - split_editor "youtube" "youtube-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" - patch "youtube-arm64-v8a" "revanced-extended" "inotia" - # Patch Youtube Armeabi-v7a - get_patches_key "youtube-revanced-extended" - split_editor "youtube" "youtube-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" - patch "youtube-armeabi-v7a" "revanced-extended" "inotia" - # Patch Youtube x86 - get_patches_key "youtube-revanced-extended" - split_editor "youtube" "youtube-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" - patch "youtube-x86" "revanced-extended" "inotia" - # Patch Youtube x86_64 - get_patches_key "youtube-revanced-extended" - split_editor "youtube" "youtube-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" - patch "youtube-x86_64" "revanced-extended" "inotia" + for i in {0..3}; do + split_arch "youtube" "revanced-extended" "$(gen_rip_libs ${libs[i]})" + done } 2() { revanced_dl @@ -45,15 +55,20 @@ revanced_dl(){ } 3() { revanced_dl - get_apk "com.google.android.youtube" "youtube-lite" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + # Patch Reddit: + get_patches_key "reddit-rve" + get_apk "com.reddit.frontpage" "reddit" "reddit" "redditinc/reddit/reddit" "Bundle" + patch "reddit" "revanced-extended" + #Disabled because lastest RVE patch youtube not have splits apk on APKMirror + #get_apk "com.google.android.youtube" "youtube-lite" "youtube" "google-inc/youtube/youtube" "Bundle_extract" # Patch YouTube Lite Arm64-v8a: - get_patches_key "youtube-revanced-extended" - split_editor "youtube-lite" "youtube-lite-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xhdpi split_config.xxxhdpi" - patch "youtube-lite-arm64-v8a" "revanced-extended" "inotia" + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube-lite" "youtube-lite-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xhdpi split_config.xxxhdpi" + #patch "youtube-lite-arm64-v8a" "revanced-extended" "inotia" # Patch YouTube Lite Armeabi-v7a: - get_patches_key "youtube-revanced-extended" - split_editor "youtube-lite" "youtube-lite-armeabi-v7a" "include" "split_config.armeabi_v7a split_config.en split_config.xhdpi split_config.xxxhdpi" - patch "youtube-lite-armeabi-v7a" "revanced-extended" "inotia" + #get_patches_key "youtube-revanced-extended" + #split_editor "youtube-lite" "youtube-lite-armeabi-v7a" "include" "split_config.armeabi_v7a split_config.en split_config.xhdpi split_config.xxxhdpi" + #patch "youtube-lite-armeabi-v7a" "revanced-extended" "inotia" } case "$1" in 1) diff --git a/src/build/utils.sh b/src/build/utils.sh index beb812a..2382648 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -326,3 +326,30 @@ split_editor() { green_log "[+] Merge splits apk to standalone apk" java -jar $APKEditor m -i ./download/$2 -o ./download/$2.apk > /dev/null 2>&1 } + +################################################# + +# Split architectures using Revanced CLI, created by inotia00 +archs=("arm64-v8a" "armeabi-v7a" "x86_64" "x86") +libs=("armeabi-v7a x86_64 x86" "arm64-v8a x86_64 x86" "armeabi-v7a arm64-v8a x86" "armeabi-v7a arm64-v8a x86_64") +gen_rip_libs() { + for lib in $@; do + echo -n "--rip-lib "$lib" " + done +} +split_arch() { + green_log "[+] Splitting $1 to ${archs[i]}:" + if [ -f "./download/$1.apk" ]; then + unset GITHUB_REPOSITORY + eval java -jar revanced-cli*.jar patch \ + -p *.rvp \ + $3 \ + --keystore=./src/_ks.keystore \ + --legacy-options=./src/options/$2.json $excludePatches$includePatches \ + --out=./release/$1-${archs[i]}-$2.apk\ + ./download/$1.apk + else + red_log "[-] Not found $1.apk" + exit 1 + fi +} \ No newline at end of file