From ff597f8e95d8fcf57e26017cff29f27e8831ed46 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Sun, 26 Apr 2026 12:13:24 +0800 Subject: [PATCH 1/2] Update dependencies to latest stable releases Signed-off-by: Aayush Gupta --- .github/workflows/build-release-apk.yml | 2 +- .github/workflows/ci.yml | 6 +++--- .github/workflows/image-minimizer.yml | 2 +- gradle/libs.versions.toml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-release-apk.yml b/.github/workflows/build-release-apk.yml index b558d90dd4f..52c3aeb29bd 100644 --- a/.github/workflows/build-release-apk.yml +++ b/.github/workflows/build-release-apk.yml @@ -32,7 +32,7 @@ jobs: mv app/build/outputs/apk/release/*.apk "app/build/outputs/apk/release/NewPipe_v$VERSION_NAME.apk" - name: "Upload APK" - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: app path: app/build/outputs/apk/release/*.apk diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fa1ca84ccb..87a3ca33c2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: steps: - uses: actions/checkout@v6 - - uses: gradle/actions/wrapper-validation@v5 + - uses: gradle/actions/wrapper-validation@v6 - name: create and checkout branch # push events already checked out the branch @@ -58,7 +58,7 @@ jobs: run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace -DskipFormatKtlint - name: Upload APK - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: app path: app/build/outputs/apk/debug/*.apk @@ -104,7 +104,7 @@ jobs: script: ./gradlew connectedCheck --stacktrace - name: Upload test report when tests fail # because the printed out stacktrace (console) is too short, see also #7553 - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 if: failure() with: name: android-test-report-api${{ matrix.api-level }} diff --git a/.github/workflows/image-minimizer.yml b/.github/workflows/image-minimizer.yml index 264a0ac6c5d..15c2aacaf76 100644 --- a/.github/workflows/image-minimizer.yml +++ b/.github/workflows/image-minimizer.yml @@ -27,7 +27,7 @@ jobs: run: npm i probe-image-size@7.2.3 --ignore-scripts - name: Minimize simple images - uses: actions/github-script@v8 + uses: actions/github-script@v9 timeout-minutes: 3 with: script: | diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9ca4443d695..efa0c62e1c6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,10 +21,10 @@ documentfile = "1.1.0" exoplayer = "2.19.1" fragment = "1.8.9" groupie = "2.10.1" -jsoup = "1.22.1" +jsoup = "1.22.2" junit = "4.13.2" junit-ext = "1.3.0" -kotlin = "2.3.20" +kotlin = "2.3.21" kotlinx-coroutines-rx3 = "1.10.2" kotlinx-serialization-json = "1.11.0" ksp = "2.3.6" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92ed9434714..8e61ef12590 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=60ea723356d81263e8002fec0fcf9e2b0eee0c0850c7a3d7ab0a63f2ccc601f3 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0262dcbd52b..739907dfd15 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. From ad7f8ba9c34a70470c949d31770c09026b95322b Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Tue, 21 Apr 2026 11:17:26 +0800 Subject: [PATCH 2/2] gradle: Build with JDK 21 Checkstyle was already requiring JDK 21 and now about libraries need it too Use the kotlin extension method as it will also configure it for java code Ref: https://kotlinlang.org/docs/gradle-configure-project.html#gradle-java-toolchains-support Signed-off-by: Aayush Gupta --- app/build.gradle.kts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 724b131a263..915a45ea7ed 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,13 +20,8 @@ val gitWorkingBranch = providers.exec { commandLine("git", "rev-parse", "--abbrev-ref", "HEAD") }.standardOutput.asText.map { it.trim() } -java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } -} - kotlin { + jvmToolchain(21) compilerOptions { // TODO: Drop annotation default target when it is stable freeCompilerArgs.addAll( @@ -137,13 +132,6 @@ ksp { // Custom dependency configuration for ktlint val ktlint by configurations.creating -// https://checkstyle.org/#JRE_and_JDK -tasks.withType().configureEach { - javaLauncher = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(21) - } -} - checkstyle { configDirectory = rootProject.file("checkstyle") isIgnoreFailures = false