From f7d945470ce15a75db388283fdc42bf1892021bd Mon Sep 17 00:00:00 2001 From: Zsombor Gegesy Date: Sun, 14 Jul 2024 13:46:41 +0200 Subject: [PATCH 1/5] Adjust for new rhino warnings --- app/proguard-rules.pro | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index fd3aa1ff4..efac4370c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -27,3 +27,10 @@ -dontwarn java.awt.** -dontwarn javax.swing.** -dontwarn org.slf4j.impl.StaticLoggerBinder + +# New Rhino warnings +-dontwarn java.beans.BeanDescriptor +-dontwarn java.beans.BeanInfo +-dontwarn java.beans.IntrospectionException +-dontwarn java.beans.Introspector +-dontwarn java.beans.PropertyDescriptor From 87f95613d1e31390ca0a9f966c18f4c7a02a7d93 Mon Sep 17 00:00:00 2001 From: Zsombor Gegesy Date: Sun, 14 Jul 2024 17:44:51 +0200 Subject: [PATCH 2/5] Upgrade gradle wrapper to 8.7 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 792cc6d23..117014cf2 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { maven { url "https://jitpack.io" } // for lib extractor } dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' + classpath 'com.android.tools.build:gradle:8.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'de.mannodermaus.gradle.plugins:android-junit5:1.10.0.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da1db5f04..48c0a02ca 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 2c5a2172b8edfd1d3dc22c2f6748962838780624 Mon Sep 17 00:00:00 2001 From: Zsombor Gegesy Date: Sun, 14 Jul 2024 17:56:32 +0200 Subject: [PATCH 3/5] Build tools version to 34.0.0 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index dc2388a3c..9b743456e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: "de.mannodermaus.android-junit5" android { compileSdkVersion 33 - buildToolsVersion '33.0.2' + buildToolsVersion '34.0.0' namespace 'free.rm.skytube' defaultConfig { From 25d7be52684692512b900fc2864282edcea6013f Mon Sep 17 00:00:00 2001 From: Zsombor Gegesy Date: Sun, 14 Jul 2024 12:53:27 +0200 Subject: [PATCH 4/5] Release v2.989 --- CHANGELOG | 9 +++++++++ README.md | 2 +- app/build.gradle | 4 ++-- fastlane/metadata/android/en-US/changelogs/49.txt | 7 +++++++ 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/49.txt diff --git a/CHANGELOG b/CHANGELOG index 00e54c7e3..257b83304 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,12 @@ +v2.989 - 2024-07-14 + * Fix video/channel sharing + * Update NewPipeExtractor to fix recent Youtube site changes. + * Clean up non-existent HookTube and Invidious sites by drogga + * Updated translations for: + * Albanian, Arabic, Czech, Chinese (Simplified), Chinese (Traditional), Croatian, Estonian, French, German, Italian, Hungarian, Polish, Portuguese, Portuguese (Brazil), Slovak, Spanish, Turkish, Ukrainian + * Translators: + * Besnik Bleta, Eryk Michalak, Fjuro, Flavio F. M, Ihor Hordiichuk, J. Lavoie, Jeff Huang, Massimo Pissarello, Milan, Milo Ivir, Oğuz Ersen, Priit Jõerüüt, Rex_sa, Samylo199, Sergio Marques, Szia Tomi, gallegonovato, 大王叫我来巡山 + v2.988 - 2024-04-29 * Fix couple of bugs around subscribing and unsubscribing * Fix crashes around comment parsing diff --git a/README.md b/README.md index 79d2a8a40..16b7479b3 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ If you have older Android device - however, at least 4.0, you should try [SkyTub | Official YouTube player support* | ✅ | ❌ | | Chromecast Support* | ✅ | ❌ | | Updates availability | Immediate | Normally up to 5 days | -| Download APK | [![Download SkyTube Extra APK](screenshots/download_apk.png)](https://github.com/SkyTubeTeam/SkyTube/releases/download/v2.988/SkyTube-Extra-2.988.apk) | [![Download SkyTube (Vanilla) APK](https://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Get_it_on_F-Droid.svg/200px-Get_it_on_F-Droid.svg.png)](https://f-droid.org/packages/free.rm.skytube.oss/) +| Download APK | [![Download SkyTube Extra APK](screenshots/download_apk.png)](https://github.com/SkyTubeTeam/SkyTube/releases/download/v2.989/SkyTube-Extra-2.989.apk) | [![Download SkyTube (Vanilla) APK](https://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Get_it_on_F-Droid.svg/200px-Get_it_on_F-Droid.svg.png)](https://f-droid.org/packages/free.rm.skytube.oss/) _* powered by a closed-source, third-party library._ diff --git a/app/build.gradle b/app/build.gradle index 9b743456e..6bee67b69 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { //noinspection ExpiredTargetSdkVersion targetSdkVersion 28 - versionName "2.988" // digits of the *fractional part* shall NOT be > than "9" - versionCode 48 + versionName "2.989" // digits of the *fractional part* shall NOT be > than "9" + versionCode 49 // Third party devs: pls be ethical and change the below keys buildConfigField 'String', 'YOUTUBE_API_KEYS_DEBUG', '""' buildConfigField 'String[]', 'YOUTUBE_API_KEYS', '{}' diff --git a/fastlane/metadata/android/en-US/changelogs/49.txt b/fastlane/metadata/android/en-US/changelogs/49.txt new file mode 100644 index 000000000..ad473ac41 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/49.txt @@ -0,0 +1,7 @@ +* Fix video/channel sharing +* Update NewPipeExtractor to fix recent Youtube site changes. +* Clean up non-existent HookTube and Invidious sites by drogga +* Updated translations for: + * Albanian, Arabic, Czech, Chinese (Simplified), Chinese (Traditional), Croatian, Estonian, French, German, Italian, Hungarian, Polish, Portuguese, Portuguese (Brazil), Slovak, Spanish, Turkish, Ukrainian +* Translators: + * Besnik Bleta, Eryk Michalak, Fjuro, Flavio F. M, Ihor Hordiichuk, J. Lavoie, Jeff Huang, Massimo Pissarello, Milan, Milo Ivir, Oğuz Ersen, Priit Jõerüüt, Rex_sa, Samylo199, Sergio Marques, Szia Tomi, gallegonovato, 大王叫我来巡山 From 78fef9a98af8f0fc428f92f66597801bdf77b80d Mon Sep 17 00:00:00 2001 From: Zsombor Gegesy Date: Sun, 14 Jul 2024 21:12:51 +0200 Subject: [PATCH 5/5] Create a release workflow --- .github/workflows/android.yml | 6 ++-- .github/workflows/release.yml | 52 +++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2b790db4e..9ff8fc607 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -12,15 +12,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: gradle/wrapper-validation-action@v1 - name: set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 17 distribution: "adopt" - name: Cache Gradle packages - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..2e809fa47 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,52 @@ +name: Release + +on: + workflow_dispatch: + inputs: + version_number: + description: 'Version Number' + required: true + default: 'v2.988' + type: string + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - uses: gradle/actions/wrapper-validation@v3 + + - name: set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: "adopt" + + - name: Cache Gradle packages + uses: actions/cache@v4 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + + - name: Setup Keystore + id: setup_keystore + uses: timheuer/base64-to-file@v1.2 + with: + fileName: 'release.keystore' + encodedString: ${{ secrets.SIGNING_KEY }} + + - name: sha256sum + run: sha256sum ${{steps.setup_keystore.outputs.filePath}} + + - name: Build with Gradle + run: ./gradlew assembleRelease -Pandroid.injected.signing.store.file=${{steps.setup_keystore.outputs.filePath}} -Pandroid.injected.signing.store.password=${{secrets.KEY_STORE_PASSWORD}} -Pandroid.injected.signing.key.alias=${{secrets.ALIAS}} -Pandroid.injected.signing.key.password=${{secrets.KEY_PASSWORD}} + + - name: Create Github Release + uses: ncipollo/release-action@v1 + with: + artifacts: "app/build/outputs/apk/oss/release/SkyTube-Oss-*.apk,app/build/outputs/apk/extra/release/SkyTube-Extra-*.apk" + draft: "true" + name: "Version ${{ inputs.version_number }}" + tag: ${{ inputs.version_number}}