JDK22

WhosNickDoglio · Jun 29, 2024 · 4e987f7 · 4e987f7
1 parent dda0f19
commit 4e987f7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -7,11 +7,11 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: set up JDK 21
+    - name: set up JDK 22
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         distribution: 'zulu'
-        java-version: '21'
+        java-version: '22'
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3
       with:

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -1,3 +1,4 @@
+import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -66,6 +67,8 @@ spotless {
     }
 }
 
+tasks.withType<Detekt>().configureEach { jvmTarget = JvmTarget.JVM_17.target }
+
 tasks.withType<KotlinCompile>().configureEach {
     compilerOptions {
         allWarningsAsErrors = true

diff --git a/build-logic/src/main/kotlin/dev/whosnickdoglio/buildlogic/RulesPlugin.kt b/build-logic/src/main/kotlin/dev/whosnickdoglio/buildlogic/RulesPlugin.kt
@@ -11,8 +11,10 @@ import dev.whosnickdoglio.buildlogic.configuration.configureSpotless
 import dev.whosnickdoglio.buildlogic.configuration.configureTests
 import dev.whosnickdoglio.buildlogic.configuration.dependOnBuildLogicTask
 import dev.whosnickdoglio.buildlogic.configuration.getVersionCatalog
+import io.gitlab.arturbosch.detekt.Detekt
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 class RulesPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -30,6 +32,10 @@ class RulesPlugin : Plugin<Project> {
             dependOnBuildLogicTask("sortDependencies")
             dependOnBuildLogicTask("checkSortDependencies")
 
+            tasks.withType(Detekt::class.java).configureEach {
+                it.jvmTarget = JvmTarget.JVM_17.target
+            }
+
             configureJvm(libs.findVersion("jdk").get().requiredVersion.toInt())
             configureLint()
             configureSpotless(libs.findVersion("ktlint").get().requiredVersion)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ lint = "31.5.0"
 detekt = "1.23.6"
 kover = "0.8.2"
 spotless = "6.25.0"
-jdk = "21"
+jdk = "22"
 sort = "0.6"
 dagger = "2.51.1"
 

diff --git a/test-app/build.gradle.kts b/test-app/build.gradle.kts
@@ -1,3 +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.internal.KaptGenerateStubsTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -106,6 +108,20 @@ spotless {
     }
 }
 
+tasks.withType<Detekt>().configureEach { jvmTarget = "17" }
+
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions {
+        allWarningsAsErrors = true
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    sourceCompatibility = JavaVersion.VERSION_17.toString()
+    targetCompatibility = JavaVersion.VERSION_17.toString()
+}
+
 dependencies {
     coreLibraryDesugaring(libs.desugar)