Use Java 21 in jvm toolchain

jellyfin · Oct 15, 2024 · acf8af6 · acf8af6
1 parent b4e4029
commit acf8af6
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/app-build.yaml b/.github/workflows/app-build.yaml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
       - name: Assemble debug APKs

diff --git a/.github/workflows/app-lint.yaml b/.github/workflows/app-lint.yaml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
       - name: Run detekt and lint tasks

diff --git a/.github/workflows/app-publish.yaml b/.github/workflows/app-publish.yaml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
       - name: Set JELLYFIN_VERSION

diff --git a/.github/workflows/app-test.yaml b/.github/workflows/app-test.yaml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
       - name: Run test task

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ buildscript {
 
 java {
 	toolchain {
-		languageVersion.set(JavaLanguageVersion.of("17"))
+		languageVersion.set(JavaLanguageVersion.of(libs.versions.java.jdk.get()))
 	}
 }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 kotlin {
 	jvmToolchain {
-		languageVersion.set(JavaLanguageVersion.of("17"))
+		languageVersion.set(JavaLanguageVersion.of(libs.versions.java.jdk.get()))
 	}
 }
 

diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+	versionCatalogs {
+		create("libs") {
+			from(files("../gradle/libs.versions.toml"))
+		}
+	}
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -26,6 +26,7 @@ androidx-window = "1.3.0"
 androidx-work = "2.9.1"
 coil = "2.7.0"
 detekt = "1.23.7"
+java-jdk = "21"
 jellyfin-androidx-media = "1.3.1+2"
 jellyfin-apiclient = "v0.7.10"
 jellyfin-sdk = "1.6.0-beta.1"
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ buildscript { @@
     java {
     	toolchain {
-    		languageVersion.set(JavaLanguageVersion.of("17"))
+    		languageVersion.set(JavaLanguageVersion.of(libs.versions.java.jdk.get()))
     	}
     }
@@ Expand Down @@