diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index 9c0feb7..be0a04c 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -16,13 +16,6 @@ jobs: java-version: '17' distribution: zulu - - name: Download ReVanced Integrations - uses: robinraju/release-downloader@v1.9 - with: - repository: 'ReVanced/revanced-integrations' - latest: true - fileName: '*.apk' - - name: Download ReVanced CLI uses: robinraju/release-downloader@v1.9 with: @@ -35,7 +28,7 @@ jobs: with: repository: 'ReVanced/revanced-patches' latest: true - fileName: '*.jar' + fileName: '*.rvp' - name: Download YouTube APK uses: robinraju/release-downloader@v1.9 diff --git a/.github/workflows/x.yml b/.github/workflows/x.yml index 8f4305b..4e8991b 100644 --- a/.github/workflows/x.yml +++ b/.github/workflows/x.yml @@ -16,13 +16,6 @@ jobs: java-version: '17' distribution: zulu - - name: Download ReVanced Integrations - uses: robinraju/release-downloader@v1.9 - with: - repository: 'ReVanced/revanced-integrations' - latest: true - fileName: '*.apk' - - name: Download ReVanced CLI uses: robinraju/release-downloader@v1.9 with: @@ -35,7 +28,7 @@ jobs: with: repository: 'ReVanced/revanced-patches' latest: true - fileName: '*.jar' + fileName: '*.rvp' - name: Download X APK uses: robinraju/release-downloader@v1.9 diff --git a/.github/workflows/yt-ytm.yml b/.github/workflows/yt-ytm.yml index e55eaf4..caece67 100644 --- a/.github/workflows/yt-ytm.yml +++ b/.github/workflows/yt-ytm.yml @@ -16,13 +16,6 @@ jobs: java-version: '17' distribution: zulu - - name: Download ReVanced Integrations - uses: robinraju/release-downloader@v1.9 - with: - repository: 'ReVanced/revanced-integrations' - latest: true - fileName: '*.apk' - - name: Download ReVanced CLI uses: robinraju/release-downloader@v1.9 with: @@ -35,7 +28,7 @@ jobs: with: repository: 'ReVanced/revanced-patches' latest: true - fileName: '*.jar' + fileName: '*.rvp' - name: Download YouTube APK uses: robinraju/release-downloader@v1.9 diff --git a/.github/workflows/yt.yml b/.github/workflows/yt.yml index 8f0dd80..6b4b3a2 100644 --- a/.github/workflows/yt.yml +++ b/.github/workflows/yt.yml @@ -16,13 +16,6 @@ jobs: java-version: '17' distribution: zulu - - name: Download ReVanced Integrations - uses: robinraju/release-downloader@v1.9 - with: - repository: 'ReVanced/revanced-integrations' - latest: true - fileName: '*.apk' - - name: Download ReVanced CLI uses: robinraju/release-downloader@v1.9 with: @@ -35,7 +28,7 @@ jobs: with: repository: 'ReVanced/revanced-patches' latest: true - fileName: '*.jar' + fileName: '*.rvp' - name: Download YouTube APK uses: robinraju/release-downloader@v1.9 diff --git a/.github/workflows/ytm.yml b/.github/workflows/ytm.yml index 6c3f90e..27520a1 100644 --- a/.github/workflows/ytm.yml +++ b/.github/workflows/ytm.yml @@ -16,13 +16,6 @@ jobs: java-version: '17' distribution: zulu - - name: Download ReVanced Integrations - uses: robinraju/release-downloader@v1.9 - with: - repository: 'ReVanced/revanced-integrations' - latest: true - fileName: '*.apk' - - name: Download ReVanced CLI uses: robinraju/release-downloader@v1.9 with: @@ -35,7 +28,7 @@ jobs: with: repository: 'ReVanced/revanced-patches' latest: true - fileName: '*.jar' + fileName: '*.rvp' - name: Download YouTube Music APKs uses: robinraju/release-downloader@v1.9 diff --git a/README.md b/README.md index ba8c0a7..561ce2d 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ This repo template will allow you to build non-root ReVanced, ReVanced Music and You can modify the `scripts/build.sh` script to choose the patches you want. A list of available patches and their descriptions can be found [here](https://revanced.app/patches). ### Supported versions -- YouTube: `19.34.42` -- YouTube Music: `7.24.51` -- X: `10.63.1-release.0` +- YouTube: `19.43.41` +- YouTube Music: `7.25.52` +- X: `10.65.2-release.0` ## How to setup 1. Fork or create a new repository using this repository as a template ([Guide](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template)). DO NOT FORK if you need to set the new repo to private. diff --git a/scripts/build.sh b/scripts/build.sh index aa89931..1d0f91f 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -12,16 +12,12 @@ while getopts mrx flag; do esac done -for file in *integrations*; do - mv -- "$file" revanced-integrations.apk -done - for file in *cli*; do mv -- "$file" revanced-cli.jar done for file in *patches*; do - mv -- "$file" revanced-patches.jar + mv -- "$file" revanced-patches.rvp done mkdir -p build/yt @@ -34,8 +30,8 @@ if [ "$revanced" = 'yes' ]; then echo "**************************" if [ -f "youtube.apk" ]; then - java -jar revanced-cli.jar patch -m revanced-integrations.apk \ - -b revanced-patches.jar -o build/yt/yt.apk youtube.apk + java -jar revanced-cli.jar patch -p revanced-patches.rvp \ + -o build/yt/yt.apk youtube.apk echo "YouTube ReVanced build finished" else echo "Cannot find YouTube APK, skipping build" @@ -51,8 +47,8 @@ if [ "$music" = 'yes' ]; then echo "=== Building arm APK ===" if [ -f "music-arm.apk" ]; then - java -jar revanced-cli.jar patch -m revanced-integrations.apk \ - -b revanced-patches.jar -o build/ytm/ytm-armeabi-v7a.apk music-arm.apk + java -jar revanced-cli.jar patch -p revanced-patches.rvp \ + -o build/ytm/ytm-armeabi-v7a.apk music-arm.apk echo "ReVanced Music arm build finished" else echo "Cannot find YouTube Music arm APK, skipping build" @@ -60,8 +56,8 @@ if [ "$music" = 'yes' ]; then echo "=== Building arm64 APK === " if [ -f "music-arm64.apk" ]; then - java -jar revanced-cli.jar patch -m revanced-integrations.apk \ - -b revanced-patches.jar -o build/ytm/ytm-arm64-v8a.apk music-arm64.apk + java -jar revanced-cli.jar patch -p revanced-patches.rvp \ + -o build/ytm/ytm-arm64-v8a.apk music-arm64.apk echo "ReVanced Music arm64 build finished" else echo "Cannot find YouTube Music arm64 APK, skipping build" @@ -69,8 +65,8 @@ if [ "$music" = 'yes' ]; then echo "=== Building x86 APK ===" if [ -f "music-x86.apk" ]; then - java -jar revanced-cli.jar patch -m revanced-integrations.apk \ - -b revanced-patches.jar -o build/ytm/ytm-x86.apk music-x86.apk + java -jar revanced-cli.jar patch -p revanced-patches.rvp \ + -o build/ytm/ytm-x86.apk music-x86.apk echo "ReVanced Music x86 build finished" else echo "Cannot find YouTube Music x86 APK, skipping build" @@ -78,8 +74,8 @@ if [ "$music" = 'yes' ]; then echo "=== Building x86_64 APK ===" if [ -f "music-x86_64.apk" ]; then - java -jar revanced-cli.jar patch -m revanced-integrations.apk \ - -b revanced-patches.jar -o build/ytm/ytm-x86_64.apk music-x86_64.apk + java -jar revanced-cli.jar patch -p revanced-patches.rvp \ + -o build/ytm/ytm-x86_64.apk music-x86_64.apk echo "ReVanced Music x86_64 build finished" else echo "Cannot find YouTube Music x86_64 APK, skipping build" @@ -95,8 +91,8 @@ if [ "$x" = 'yes' ]; then echo "********************" if [ -f "x.apk" ]; then - java -jar revanced-cli.jar patch -m revanced-integrations.apk \ - -b revanced-patches.jar -e "Hide recommended users" \ + java -jar revanced-cli.jar patch -p revanced-patches.rvp \ + --exclusive -e "Hide recommended users" \ -e "Hide view count" -o build/x/x.apk x.apk echo "X build finished" else