Target Java 17 bytecode for app. Target Java 21 bytecode for build.

ReactiveCircus · Dec 15, 2023 · 72ee6c5 · 72ee6c5
1 parent 73f70f3
commit 72ee6c5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -1,6 +1,5 @@
 import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -24,13 +23,13 @@ kotlin {
 
 tasks.withType<KotlinCompile>().configureEach {
     compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_17)
+        jvmTarget.set(JvmTarget.JVM_21)
     }
 }
 
 tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_17.toString()
-    targetCompatibility = JavaVersion.VERSION_17.toString()
+    sourceCompatibility = JavaVersion.VERSION_21.toString()
+    targetCompatibility = JavaVersion.VERSION_21.toString()
 }
 
 detekt {
@@ -42,7 +41,7 @@ detekt {
 }
 
 tasks.withType<Detekt>().configureEach {
-    jvmTarget = JvmTarget.JVM_17.target
+    jvmTarget = JvmTarget.JVM_21.target
     reports {
         xml.required.set(false)
         txt.required.set(false)

diff --git a/...src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/AllProjectsBuildLogic.kt b/...src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/AllProjectsBuildLogic.kt
@@ -44,7 +44,7 @@ internal fun Project.configureDetekt() {
             parallel = true
         }
         tasks.withType<Detekt>().configureEach {
-            jvmTarget = JvmTarget.JVM_11.target
+            jvmTarget = JvmTarget.JVM_21.target
             reports {
                 xml.required.set(false)
                 txt.required.set(false)

diff --git a/...gic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/AndroidBuildLogic.kt b/...gic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/AndroidBuildLogic.kt
@@ -29,8 +29,8 @@ internal fun TestedExtension.configureCommonAndroidOptions(project: Project) {
     testOptions.animationsDisabled = true
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
         isCoreLibraryDesugaringEnabled = true
     }
 
@@ -76,8 +76,8 @@ internal fun TestExtension.configureAndroidTestOptions() {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 

diff --git a/...c/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/KotlinJvmBuildLogic.kt b/...c/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/KotlinJvmBuildLogic.kt
@@ -19,7 +19,7 @@ internal fun KotlinProjectExtension.configureKotlinJvm(target: Project) {
     }
     target.tasks.withType<KotlinJvmCompile>().configureEach {
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_11)
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
 }