Use Java 21 in jvm toolchain

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

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
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 @@