diff --git a/.github/workflows/patch-discontinued.yml b/.github/workflows/patch-discontinued.yml new file mode 100644 index 0000000..1088a7a --- /dev/null +++ b/.github/workflows/patch-discontinued.yml @@ -0,0 +1,40 @@ +name: Patch discontinued Revanced Extended +on: + workflow_dispatch: +jobs: + patch2: + name: Patch Revanced Extended by Inotia00 (discontinued) + permissions: write-all + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Set up jdk + uses: actions/setup-java@v3.11.0 + with: + distribution: 'zulu' + java-version: '17' + + - name: Patch apk + run: bash src/build/Revanced-Extended-inotia-discontinued.sh + env: + repository: ${{ github.repository }} + + - name: Generate release info + run: | + echo " + **Change log** :point_down: + [Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest) + "> ${{ github.workspace }}-CHANGELOG.txt + + - name: Release + uses: softprops/action-gh-release@v0.1.15 + with: + files: | + ./build/* + revanced-extended-version.txt + name: Revanced & Revanced Extended + tag_name: all + body_path: ${{ github.workspace }}-CHANGELOG.txt + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index c251115..9684554 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -61,7 +61,7 @@ jobs: keep_minimum_runs: 10 patch2: - name: Patch Revanced Extended + name: Patch ReX permissions: write-all runs-on: ubuntu-latest steps: @@ -74,7 +74,7 @@ jobs: java-version: '17' - name: Patch apk - run: bash src/build/Revanced-Extended.sh + run: bash src/build/ReX.sh env: repository: ${{ github.repository }} @@ -92,7 +92,7 @@ jobs: with: files: | ./build/* - revanced-extended-version.txt + ReX-version.txt name: Revanced & Revanced Extended tag_name: all body_path: ${{ github.workspace }}-CHANGELOG.txt diff --git a/README.md b/README.md index f075ede..3c3790d 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,18 @@ Download [x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-revanced.apk) +### [ReX: (The contiuned Revanced Extended)](https://github.com/YT-Advanced/ReX-patches) + +[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-ReX.apk) + +[Arm64-v8a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-arm64-v8a-ReX.apk) + +[Armeabi-v7a](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-armeabi-v7a-ReX.apk) + +[x86](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86-ReX.apk) + +[x86_64](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-x86_64-ReX.apk) + ### Revanced Extended: (Support Dropped 05/08/2023) [All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended.apk) @@ -138,6 +150,10 @@ Download [All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/reddit-revanced.apk) +### [ReX: (The contiuned Revanced Extended)](https://github.com/YT-Advanced/ReX-patches) + +[All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/reddit-ReX.apk) + ### Revanced Extended: (Support Dropped 05/08/2023) [All Architecture](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/reddit-revanced-extended.apk) @@ -164,6 +180,8 @@ Download [Revanced Patches](https://github.com/revanced/revanced-patches) - [GPL-3.0](https://github.com/revanced/revanced-patches/blob/main/LICENSE) +[ReX-patches](https://github.com/YT-Advanced/ReX-patches) - [GPL-3.0](https://github.com/YT-Advanced/ReX-patches/blob/revanced-extended/LICENSE) + [Revanced Extended Patches](https://github.com/inotia00/revanced-patches/tree/revanced-extended) - [GPL-3.0](https://github.com/inotia00/revanced-patches/blob/revanced-extended/LICENSE) [Revanced Extended for Android 6 & 7 Patches](https://github.com/kitadai31/revanced-patches-android6-7/tree/revanced-extended) - [GPL-3.0](https://github.com/kitadai31/revanced-patches-android6-7/blob/revanced-extended/LICENSE) @@ -180,6 +198,8 @@ Download [Revanced Extended for Android 6 & 7 Integrations](https://github.com/kitadai31/revanced-integrations) - [GPL-3.0](https://github.com/kitadai31/revanced-integrations/blob/revanced-extended/LICENSE) +[ReX-integrations] (https://github.com/YT-Advanced/ReX-integrations) - [GPL-3.0](https://github.com/YT-Advanced/ReX-integrations/blob/revanced-extended/LICENSE) + [Revanced CLI - j-hc](https://github.com/j-hc/revanced-cli) - [GPL-3.0](https://github.com/j-hc/revanced-cli/blob/main/LICENSE) [HTMLQ](https://github.com/mgdm/htmlq) - [MIT](https://github.com/mgdm/htmlq/blob/master/LICENSE.md) diff --git a/src/build/ReX.sh b/src/build/ReX.sh new file mode 100644 index 0000000..66034cd --- /dev/null +++ b/src/build/ReX.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# Revanced Extended build +source src/build/utils.sh + +################################################# + +# Checking new patch +checker "YT-Advanced/ReX-patches" "ReX" + +################################################# + +# Download requirements +dl_gh "ReX-patches ReX-integrations" "YT-Advanced" "latest" +dl_gh "revanced-cli" "inotia00" "latest" +dl_htmlq + +################################################# + +# Patch YouTube Extended: +get_patches_key "youtube-ReX" +get_ver "Hide general ads" "com.google.android.youtube" +get_apk "youtube" "youtube" "google-inc/youtube/youtube" +patch "youtube" "youtube-ReX" + +################################################# + +# Patch YouTube Music Extended: +# Arm64-v8a +get_patches_key "youtube-music-ReX" +get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" +patch "youtube-music-arm64-v8a" "youtube-music-arm64-v8a-ReX" +# Armeabi-v7a +get_patches_key "youtube-music-ReX" +version="6.08.51" +get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" +patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-ReX" + +################################################# + +# Patch Reddit: +get_patches_key "reddit" +get_apk "reddit" "reddit" "redditinc/reddit/reddit" +patch "reddit" "reddit-ReX" + +################################################# + +# Split architecture: +rm -f revanced-cli* +dl_gh "revanced-cli" "j-hc" "latest" +# Split architecture Youtube: +for i in {0..3}; do + split_arch "youtube-ReX" "youtube-${archs[i]}-ReX" "$(gen_rip_libs ${libs[i]})" +done + +################################################# diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended-inotia-discontinued.sh similarity index 77% rename from src/build/Revanced-Extended.sh rename to src/build/Revanced-Extended-inotia-discontinued.sh index 772c15b..77e8bde 100644 --- a/src/build/Revanced-Extended.sh +++ b/src/build/Revanced-Extended-inotia-discontinued.sh @@ -5,7 +5,7 @@ source src/build/utils.sh ################################################# # Checking new patch -checker "inotia00/revanced-patches" "revanced-extended" +checker "inotia00/revanced-patches" "revanced-extended-inotia-discontinued" ################################################# @@ -19,7 +19,7 @@ dl_htmlq 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" "youtube-revanced-extended" +patch "youtube" "youtube-revanced-extended-inotia-discontinued" ################################################# @@ -27,19 +27,19 @@ patch "youtube" "youtube-revanced-extended" # Arm64-v8a get_patches_key "youtube-music-revanced-extended" get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" -patch "youtube-music-arm64-v8a" "youtube-music-arm64-v8a-revanced-extended" +patch "youtube-music-arm64-v8a" "youtube-music-arm64-v8a-revanced-extended-inotia-discontinued" # Armeabi-v7a get_patches_key "youtube-music-revanced-extended" version="6.08.51" get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" -patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-revanced-extended" +patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-revanced-extended-inotia-discontinued" ################################################# # Patch Reddit: get_patches_key "reddit" get_apk "reddit" "reddit" "redditinc/reddit/reddit" -patch "reddit" "reddit-revanced-extended" +patch "reddit" "reddit-revanced-extended-inotia-discontinued" ################################################# @@ -48,7 +48,7 @@ rm -f revanced-cli* dl_gh "revanced-cli" "j-hc" "latest" # Split architecture Youtube: for i in {0..3}; do - split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})" + split_arch "youtube-revanced-extended-inotia-discontinued" "youtube-${archs[i]}-revanced-extended-inotia-discontinued" "$(gen_rip_libs ${libs[i]})" done ################################################# diff --git a/src/patches/youtube-ReX/exclude-patches b/src/patches/youtube-ReX/exclude-patches new file mode 100644 index 0000000..7641864 --- /dev/null +++ b/src/patches/youtube-ReX/exclude-patches @@ -0,0 +1,29 @@ +custom-branding-icon-afn-red +debugging +custom-seekbar-color +disable-startup-shorts-player +disable-quic-protocol +disable-hdr-video +enable-old-quality-layout +force-premium-heading +force-vp9-codec +force-opus-codec +header-switch +hide-cast-button +hide-account-menu +hide-auto-captions +hide-autoplay-button +hide-autoplay-preview +hide-captions-button +hide-email-address +hide-endscreen-cards +hide-endscreen-overlay +hide-filmstrip-overlay +hide-mix-playlists +hide-seekbar +hide-search-terms +hide-load-more-button +hide-quick-actions +hide-previous-next-button +theme +spoof-app-version diff --git a/src/patches/youtube-ReX/include-patches b/src/patches/youtube-ReX/include-patches new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/patches/youtube-ReX/include-patches @@ -0,0 +1 @@ + diff --git a/src/patches/youtube-music-ReX/exclude-patches b/src/patches/youtube-music-ReX/exclude-patches new file mode 100644 index 0000000..893b2c5 --- /dev/null +++ b/src/patches/youtube-music-ReX/exclude-patches @@ -0,0 +1,12 @@ +custom-branding-music-afn-red +compact-header +disable-auto-captions +enable-force-minimized-player +enable-force-shuffle +hide-button-shelf +hide-carousel-shelf +hide-category-bar +hide-music-cast-button +hide-new-playlist +hide-playlist-card +optimize-resource-music diff --git a/src/patches/youtube-music-ReX/include-patches b/src/patches/youtube-music-ReX/include-patches new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/patches/youtube-music-ReX/include-patches @@ -0,0 +1 @@ +