Use Java 21 in jvm toolchain
This commit is contained in:
committed by
Niels van Velzen
parent
b4e4029c86
commit
acf8af6441
2
.github/workflows/app-build.yaml
vendored
2
.github/workflows/app-build.yaml
vendored
@@ -20,7 +20,7 @@ jobs:
|
|||||||
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
|
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 17
|
java-version: 21
|
||||||
- name: Setup Gradle
|
- name: Setup Gradle
|
||||||
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
|
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
|
||||||
- name: Assemble debug APKs
|
- name: Assemble debug APKs
|
||||||
|
|||||||
2
.github/workflows/app-lint.yaml
vendored
2
.github/workflows/app-lint.yaml
vendored
@@ -22,7 +22,7 @@ jobs:
|
|||||||
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
|
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 17
|
java-version: 21
|
||||||
- name: Setup Gradle
|
- name: Setup Gradle
|
||||||
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
|
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
|
||||||
- name: Run detekt and lint tasks
|
- name: Run detekt and lint tasks
|
||||||
|
|||||||
2
.github/workflows/app-publish.yaml
vendored
2
.github/workflows/app-publish.yaml
vendored
@@ -17,7 +17,7 @@ jobs:
|
|||||||
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
|
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 17
|
java-version: 21
|
||||||
- name: Setup Gradle
|
- name: Setup Gradle
|
||||||
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
|
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
|
||||||
- name: Set JELLYFIN_VERSION
|
- name: Set JELLYFIN_VERSION
|
||||||
|
|||||||
2
.github/workflows/app-test.yaml
vendored
2
.github/workflows/app-test.yaml
vendored
@@ -21,7 +21,7 @@ jobs:
|
|||||||
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
|
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: 17
|
java-version: 21
|
||||||
- name: Setup Gradle
|
- name: Setup Gradle
|
||||||
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
|
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
|
||||||
- name: Run test task
|
- name: Run test task
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ buildscript {
|
|||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain {
|
toolchain {
|
||||||
languageVersion.set(JavaLanguageVersion.of("17"))
|
languageVersion.set(JavaLanguageVersion.of(libs.versions.java.jdk.get()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvmToolchain {
|
jvmToolchain {
|
||||||
languageVersion.set(JavaLanguageVersion.of("17"))
|
languageVersion.set(JavaLanguageVersion.of(libs.versions.java.jdk.get()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
7
buildSrc/settings.gradle.kts
Normal file
7
buildSrc/settings.gradle.kts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
dependencyResolutionManagement {
|
||||||
|
versionCatalogs {
|
||||||
|
create("libs") {
|
||||||
|
from(files("../gradle/libs.versions.toml"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,6 +26,7 @@ androidx-window = "1.3.0"
|
|||||||
androidx-work = "2.9.1"
|
androidx-work = "2.9.1"
|
||||||
coil = "2.7.0"
|
coil = "2.7.0"
|
||||||
detekt = "1.23.7"
|
detekt = "1.23.7"
|
||||||
|
java-jdk = "21"
|
||||||
jellyfin-androidx-media = "1.3.1+2"
|
jellyfin-androidx-media = "1.3.1+2"
|
||||||
jellyfin-apiclient = "v0.7.10"
|
jellyfin-apiclient = "v0.7.10"
|
||||||
jellyfin-sdk = "1.6.0-beta.1"
|
jellyfin-sdk = "1.6.0-beta.1"
|
||||||
|
|||||||
Reference in New Issue
Block a user