From 8db778ebdb30cc006982b2aa5828c285435ebadf Mon Sep 17 00:00:00 2001 From: siritami <102145692+FiorenMas@users.noreply.github.com> Date: Mon, 2 Jun 2025 01:19:58 +0700 Subject: [PATCH] add Spotjfy anddea --- .github/workflows/manual-patch.yml | 25 ++-------------------- README.md | 9 +++++++- src/build/Anddea-Revanced-Extended-Beta.sh | 7 ++++++ src/build/Anddea-Revanced-Extended.sh | 7 ++++++ src/build/Revanced-Beta.sh | 12 +++++++++++ src/build/Revanced.sh | 12 +++++++++++ src/build/Spotjfy.sh | 13 ----------- src/patches/Spotjfy-anddea/exclude-patches | 0 src/patches/Spotjfy-anddea/include-patches | 0 9 files changed, 48 insertions(+), 37 deletions(-) delete mode 100644 src/build/Spotjfy.sh create mode 100644 src/patches/Spotjfy-anddea/exclude-patches create mode 100644 src/patches/Spotjfy-anddea/include-patches diff --git a/.github/workflows/manual-patch.yml b/.github/workflows/manual-patch.yml index 2138ec3..536c27e 100644 --- a/.github/workflows/manual-patch.yml +++ b/.github/workflows/manual-patch.yml @@ -16,7 +16,6 @@ on: options: - 'Revanced' - 'Revanced Beta' - - 'Spotjfy' - 'Revanced Extended' - 'Revanced Extended Beta' - 'RVE-anddea-stable' @@ -40,7 +39,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] + run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] steps: - name: Checkout uses: actions/checkout@v4.2.2 @@ -63,7 +62,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] + run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] steps: - name: Checkout uses: actions/checkout@v4.2.2 @@ -332,26 +331,6 @@ jobs: id: release-rve5 if: steps.check-gh-rve5.outputs.internet_error == '0' uses: ./.github/actions/release - patch_Spotjfy: - name: Patch Spotjfy - if: ${{ github.event.inputs.org == 'Spotjfy' || inputs.org == 'Spotjfy' }} - 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-spotjfy - run: bash src/etc/connection.sh - - name: Patch apk - id: patch-spotjfy - if: steps.check-gh-spotjfy.outputs.internet_error == '0' - run: bash src/build/Spotjfy.sh - - name: Releasing APK files - id: release-spotjfy - if: steps.check-gh-spotjfy.outputs.internet_error == '0' - uses: ./.github/actions/release patch_BiliRoamingM: name: Patch BiliRoamingM if: ${{ github.event.inputs.org == 'BiliRoamingM' || inputs.org == 'BiliRoamingM' }} diff --git a/README.md b/README.md index 79f9ac8..1f25746 100644 --- a/README.md +++ b/README.md @@ -238,7 +238,14 @@ Download ### [Revanced](https://github.com/revanced/revanced-patches) -[Arm64-v8a](../../releases/download/all/spotjfy-arm64-v8a-revanced.apk) +| Stable version | Beta version | +| ------------------------------------------------------------------------- | ------------------------------------------------------------------------------ | +| [Arm64-v8a](../../releases/download/all/spotjfy-arm64-v8a-revanced.apk) | [Arm64-v8a](../../releases/download/all/spotjfy-beta-arm64-v8a-revanced.apk) | + +### [Revanced Extended forked by anddea:](https://github.com/anddea/revanced-patches) +| Stable version | Beta version | +| ------------------------------------------------------------------------- | ------------------------------------------------------------------------------ | +| [Arm64-v8a](../../releases/download/all/spotjfy-arm64-v8a-anddea.apk) | [Arm64-v8a](../../releases/download/all/spotjfy-beta-arm64-v8a-anddea.apk) | --- diff --git a/src/build/Anddea-Revanced-Extended-Beta.sh b/src/build/Anddea-Revanced-Extended-Beta.sh index 63a2973..4e7c5cf 100644 --- a/src/build/Anddea-Revanced-Extended-Beta.sh +++ b/src/build/Anddea-Revanced-Extended-Beta.sh @@ -54,6 +54,13 @@ get_patches_key "youtube-music-rve-anddea" get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-x86" "youtube-music" "google-inc/youtube-music/youtube-music" "x86" patch "youtube-music-beta-x86" "anddea" "inotia" +# Patch Spotjfy Arm64-v8a +get_patches_key "Spotjfy-anddea" +j="i" +version="9.0.44.478" #https://github.com/ReVanced/revanced-patches/issues/4958#issuecomment-2883387940 +get_apkpure "com.spot"$j"fy.music" "spotjfy-beta-arm64-v8a" "spot"$j"fy-music-and-podcasts-for-android/com.spot"$j"fy.music" +patch "spotjfy-beta-arm64-v8a" "anddea" + # Patch YouTube Lite Arm64-v8a: get_patches_key "youtube-rve-anddea" split_editor "youtube-beta" "youtube-lite-beta-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xhdpi split_config.xxxhdpi" diff --git a/src/build/Anddea-Revanced-Extended.sh b/src/build/Anddea-Revanced-Extended.sh index 14c971a..cc9dec1 100644 --- a/src/build/Anddea-Revanced-Extended.sh +++ b/src/build/Anddea-Revanced-Extended.sh @@ -54,6 +54,13 @@ get_patches_key "youtube-music-rve-anddea" get_apk "com.google.android.apps.youtube.music" "youtube-music-stable-x86" "youtube-music" "google-inc/youtube-music/youtube-music" "x86" patch "youtube-music-stable-x86" "anddea" "inotia" +# Patch Spotjfy Arm64-v8a +get_patches_key "Spotjfy-anddea" +j="i" +version="9.0.44.478" #https://github.com/ReVanced/revanced-patches/issues/4958#issuecomment-2883387940 +get_apkpure "com.spot"$j"fy.music" "spotjfy-arm64-v8a" "spot"$j"fy-music-and-podcasts-for-android/com.spot"$j"fy.music" +patch "spotjfy-arm64-v8a" "anddea" + # Patch YouTube Lite Arm64-v8a: get_patches_key "youtube-rve-anddea" split_editor "youtube-stable" "youtube-lite-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xhdpi split_config.xxxhdpi" diff --git a/src/build/Revanced-Beta.sh b/src/build/Revanced-Beta.sh index d6b93f3..87afd8a 100644 --- a/src/build/Revanced-Beta.sh +++ b/src/build/Revanced-Beta.sh @@ -181,6 +181,15 @@ revanced_dl(){ get_apkpure "com.strava" "strava-beta-arm64-v8a" "strava-run-hike-2025-health/com.strava" "Bundle" patch "strava-beta-arm64-v8a" "revanced" } +12() { + revanced_dl + # Patch Spotjfy Arm64-v8a + get_patches_key "Spotjfy-revanced" + j="i" + version="9.0.44.478" #https://github.com/ReVanced/revanced-patches/issues/4958#issuecomment-2883387940 + get_apkpure "com.spot"$j"fy.music" "spotjfy-beta-arm64-v8a" "spot"$j"fy-music-and-podcasts-for-android/com.spot"$j"fy.music" + patch "spotjfy-beta-arm64-v8a" "revanced" +} case "$1" in 1) 1 @@ -215,4 +224,7 @@ case "$1" in 11) 11 ;; + 12) + 12 + ;; esac diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh index 2e427dc..2f51fdb 100644 --- a/src/build/Revanced.sh +++ b/src/build/Revanced.sh @@ -178,6 +178,15 @@ revanced_dl(){ get_apkpure "com.strava" "strava-arm64-v8a" "strava-run-hike-2025-health/com.strava" "Bundle" patch "strava-arm64-v8a" "revanced" } +12() { + revanced_dl + # Patch Spotjfy Arm64-v8a + get_patches_key "Spotjfy-revanced" + j="i" + version="9.0.44.478" #https://github.com/ReVanced/revanced-patches/issues/4958#issuecomment-2883387940 + get_apkpure "com.spot"$j"fy.music" "spotjfy-arm64-v8a" "spot"$j"fy-music-and-podcasts-for-android/com.spot"$j"fy.music" + patch "spotjfy-arm64-v8a" "revanced" +} case "$1" in 1) 1 @@ -212,4 +221,7 @@ case "$1" in 11) 11 ;; + 12) + 12 + ;; esac diff --git a/src/build/Spotjfy.sh b/src/build/Spotjfy.sh deleted file mode 100644 index f1f31f8..0000000 --- a/src/build/Spotjfy.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -# $potjfy build -source src/build/utils.sh - -# Download requirements -dl_gh "revanced-patches revanced-cli" "revanced" "latest" - -# Patch Spotjfy Arm64-v8a -get_patches_key "Spotjfy-revanced" -j="i" -version="9.0.44.478" #https://github.com/ReVanced/revanced-patches/issues/4958#issuecomment-2883387940 -get_apkpure "com.spot"$j"fy.music" "spotjfy-arm64-v8a" "spot"$j"fy-music-and-podcasts-for-android/com.spot"$j"fy.music" -patch "spotjfy-arm64-v8a" "revanced" diff --git a/src/patches/Spotjfy-anddea/exclude-patches b/src/patches/Spotjfy-anddea/exclude-patches new file mode 100644 index 0000000..e69de29 diff --git a/src/patches/Spotjfy-anddea/include-patches b/src/patches/Spotjfy-anddea/include-patches new file mode 100644 index 0000000..e69de29