Skip to content

Commit cd171da

Browse files
authored
Merge pull request #13454 from TeamNewPipe/depUpdate
Update dependencies and build with JDK 21
2 parents 07b4fa7 + ad7f8ba commit cd171da

7 files changed

Lines changed: 11 additions & 23 deletions

File tree

.github/workflows/build-release-apk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
mv app/build/outputs/apk/release/*.apk "app/build/outputs/apk/release/NewPipe_v$VERSION_NAME.apk"
3333
3434
- name: "Upload APK"
35-
uses: actions/upload-artifact@v6
35+
uses: actions/upload-artifact@v7
3636
with:
3737
name: app
3838
path: app/build/outputs/apk/release/*.apk

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- uses: actions/checkout@v6
41-
- uses: gradle/actions/wrapper-validation@v5
41+
- uses: gradle/actions/wrapper-validation@v6
4242

4343
- name: create and checkout branch
4444
# push events already checked out the branch
@@ -58,7 +58,7 @@ jobs:
5858
run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace -DskipFormatKtlint
5959

6060
- name: Upload APK
61-
uses: actions/upload-artifact@v6
61+
uses: actions/upload-artifact@v7
6262
with:
6363
name: app
6464
path: app/build/outputs/apk/debug/*.apk
@@ -104,7 +104,7 @@ jobs:
104104
script: ./gradlew connectedCheck --stacktrace
105105

106106
- name: Upload test report when tests fail # because the printed out stacktrace (console) is too short, see also #7553
107-
uses: actions/upload-artifact@v6
107+
uses: actions/upload-artifact@v7
108108
if: failure()
109109
with:
110110
name: android-test-report-api${{ matrix.api-level }}

.github/workflows/image-minimizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: npm i probe-image-size@7.2.3 --ignore-scripts
2828

2929
- name: Minimize simple images
30-
uses: actions/github-script@v8
30+
uses: actions/github-script@v9
3131
timeout-minutes: 3
3232
with:
3333
script: |

app/build.gradle.kts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,8 @@ val gitWorkingBranch = providers.exec {
2020
commandLine("git", "rev-parse", "--abbrev-ref", "HEAD")
2121
}.standardOutput.asText.map { it.trim() }
2222

23-
java {
24-
toolchain {
25-
languageVersion = JavaLanguageVersion.of(17)
26-
}
27-
}
28-
2923
kotlin {
24+
jvmToolchain(21)
3025
compilerOptions {
3126
// TODO: Drop annotation default target when it is stable
3227
freeCompilerArgs.addAll(
@@ -137,13 +132,6 @@ ksp {
137132
// Custom dependency configuration for ktlint
138133
val ktlint by configurations.creating
139134

140-
// https://checkstyle.org/#JRE_and_JDK
141-
tasks.withType<Checkstyle>().configureEach {
142-
javaLauncher = javaToolchains.launcherFor {
143-
languageVersion = JavaLanguageVersion.of(21)
144-
}
145-
}
146-
147135
checkstyle {
148136
configDirectory = rootProject.file("checkstyle")
149137
isIgnoreFailures = false

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ documentfile = "1.1.0"
2121
exoplayer = "2.19.1"
2222
fragment = "1.8.9"
2323
groupie = "2.10.1"
24-
jsoup = "1.22.1"
24+
jsoup = "1.22.2"
2525
junit = "4.13.2"
2626
junit-ext = "1.3.0"
27-
kotlin = "2.3.20"
27+
kotlin = "2.3.21"
2828
kotlinx-coroutines-rx3 = "1.10.2"
2929
kotlinx-serialization-json = "1.11.0"
3030
ksp = "2.3.6"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=60ea723356d81263e8002fec0fcf9e2b0eee0c0850c7a3d7ab0a63f2ccc601f3
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
3+
distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)