diff --git a/.github/workflows/BETA-patch.yml b/.github/workflows/BETA-patch.yml index 7a6bb29..a838d36 100644 --- a/.github/workflows/BETA-patch.yml +++ b/.github/workflows/BETA-patch.yml @@ -25,6 +25,7 @@ jobs: **Change log** :point_down: [Revanced](https://github.com/revanced/revanced-patches/releases/latest) [Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest) + [Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/releases/latest) "> ${{ github.workspace }}-CHANGELOG.txt - name: Release diff --git a/.github/workflows/patch-6-7.yml b/.github/workflows/patch-6-7.yml new file mode 100644 index 0000000..b76f5a2 --- /dev/null +++ b/.github/workflows/patch-6-7.yml @@ -0,0 +1,61 @@ +name: Patch Revanced Extended for Android 6 & 7 +on: +# push: + schedule: + - cron: "0 10 */10 * *" + workflow_dispatch: +jobs: + + patch2: + name: Patch Revanced Extended for Android 6 & 7 + 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/build-rve-android-6-7.sh + + - name: Generate release info + run: | + echo " + [![](https://visitcount.itsvg.in/api?id=Fioren&label=Visitors&color=6&icon=5&pretty=true)](https://visitcount.itsvg.in) + **Change log** :point_down: + [Revanced](https://github.com/revanced/revanced-patches/releases/latest) + [Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest) + [Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/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 }} + + - name: Delete older releases + uses: dev-drprasad/delete-older-releases@v0.2.1 + with: + keep_latest: 1 + delete_tags: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Delete workflow runs + uses: Mattraks/delete-workflow-runs@v2 + with: + token: ${{ github.token }} + repository: ${{ github.repository }} + retain_days: 0 + keep_minimum_runs: 15 diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index 521b3db..bb70066 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -28,6 +28,7 @@ jobs: **Change log** :point_down: [Revanced](https://github.com/revanced/revanced-patches/releases/latest) [Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest) + [Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/releases/latest) "> ${{ github.workspace }}-CHANGELOG.txt - name: Release diff --git a/README.md b/README.md index a4496dd..16c0659 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ [![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced.apk) +[![Release](https://img.shields.io/github/downloads/fiorenmas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced%20Extended%20for%20Android%206%20%26%207&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended-android-6-7.apk) # [![YouTube Music](https://img.shields.io/badge/YouTube_Music-FF0000?style=for-the-badge&logo=youtube-music&logoColor=white)](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music) diff --git a/src/Banner.png b/src/Banner.png new file mode 100644 index 0000000..b357365 Binary files /dev/null and b/src/Banner.png differ diff --git a/src/build/build-rve-android-6-7.sh b/src/build/build-rve-android-6-7.sh new file mode 100644 index 0000000..a0a77b4 --- /dev/null +++ b/src/build/build-rve-android-6-7.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# Revanced Extended for android 6 & 7 build +source src/build/tools.sh + +release=$(curl -s "https://api.github.com/repos/kitadai31/revanced-patches-android6-7/releases/latest") +asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url') +curl -sL -O "$asset" +ls revanced-patches*.jar >> new.txt +rm -f revanced-patches*.jar +release=$(curl -s "https://api.github.com/repos/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/latest") +asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-extended-version.txt") | .browser_download_url') +curl -sL -O "$asset" +if diff -q revanced-extended-android-6-7-version.txt new.txt >/dev/null ; then +echo "Old patch!!! Not build" +exit 0 +else +rm -f *.tx + +dl_gh2 "kitadai31" +dl_gh3 "inotia00" + +# Patch YouTube Extended +get_patches_key "youtube-revanced-extended-6-7" +#version="" +get_ver "hide-general-ads" "com.google.android.youtube" +get_apk "youtube" "youtube" "google-inc/youtube/youtube" +patch "youtube" "youtube-revanced-extended-android-6-7" + +ls revanced-patches*.jar >> revanced-extended-version.txt +fi \ No newline at end of file diff --git a/src/build/tools.sh b/src/build/tools.sh index ba291cd..ce67b71 100644 --- a/src/build/tools.sh +++ b/src/build/tools.sh @@ -22,6 +22,30 @@ dl_gh1() { done echo "All assets downloaded" } +dl_gh2() { + for repo in revanced-patches-android6-7 revanced-integrations ; do + asset_urls=$(wget -qO- "https://api.github.com/repos/$1/$repo/releases/latest" \ + | jq -r '.assets[] | "\(.browser_download_url) \(.name)"') + while read -r url names + do + echo "Downloading $names from $url" + wget -q -O "$names" $url + done <<< "$asset_urls" + done +echo "All assets downloaded" +} +dl_gh3() { + for repo in revanced-cli ; do + asset_urls=$(wget -qO- "https://api.github.com/repos/$1/$repo/releases/latest" \ + | jq -r '.assets[] | "\(.browser_download_url) \(.name)"') + while read -r url names + do + echo "Downloading $names from $url" + wget -q -O "$names" $url + done <<< "$asset_urls" + done +echo "All assets downloaded" +} dl_revanced_integrations() { curl --retry 10 --retry-max-time 60 -H "Cache-Control: no-cache" -fsSL github.com/$1/revanced-integrations/releases/download/v$2/revanced-integrations-$2.apk -o revanced-integrations-$2.apk } diff --git a/src/patches/youtube-revanced-extended-6-7/exclude-patches b/src/patches/youtube-revanced-extended-6-7/exclude-patches new file mode 100644 index 0000000..acb20da --- /dev/null +++ b/src/patches/youtube-revanced-extended-6-7/exclude-patches @@ -0,0 +1,25 @@ +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 +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 +optimize-resource +spoof-app-version diff --git a/src/patches/youtube-revanced-extended-6-7/include-patches b/src/patches/youtube-revanced-extended-6-7/include-patches new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/patches/youtube-revanced-extended-6-7/include-patches @@ -0,0 +1 @@ +