Change Java version definition

SRGSSR · May 21, 2024 · d3d6e09 · d3d6e09
1 parent 61b7bbf
commit d3d6e09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/internal/AppConfig.kt b/build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/internal/AppConfig.kt
@@ -4,11 +4,17 @@
  */
 package ch.srgssr.pillarbox.gradle.internal
 
+import org.gradle.api.JavaVersion
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 internal object AppConfig {
+    // When changing this value, don't forget to also update the Detekt config in the root `build.gradle.kts` file
+    private val javaVersionName = "17"
+
     internal const val minSdk = 21
     internal const val targetSdk = 34
     internal const val compileSdk = 34
 
-    // When changing this value, don't forget to also update the Detekt config in the root `build.gradle.kts` file
-    internal val javaVersion = "17"
+    internal val javaVersion = JavaVersion.valueOf("VERSION_$javaVersionName")
+    internal val jvmTarget = JvmTarget.fromTarget(javaVersionName)
 }
diff --git a/build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/internal/ProjectExtensions.kt b/build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/internal/ProjectExtensions.kt
@@ -21,8 +21,8 @@ internal fun Project.configureAndroidModule(extension: CommonExtension<*, *, *,
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.valueOf("VERSION_" + AppConfig.javaVersion)
-        targetCompatibility = JavaVersion.valueOf("VERSION_" + AppConfig.javaVersion)
+        sourceCompatibility = AppConfig.javaVersion
+        targetCompatibility = AppConfig.javaVersion
         isCoreLibraryDesugaringEnabled = true
     }
 
@@ -40,7 +40,7 @@ internal fun Project.configureAndroidModule(extension: CommonExtension<*, *, *,
 internal fun Project.configureKotlinModule() {
     tasks.withType<KotlinCompile>().configureEach {
         compilerOptions {
-            jvmTarget.set(JvmTarget.fromTarget(AppConfig.javaVersion))
+            jvmTarget.set(AppConfig.jvmTarget)
         }
     }
 }