Skip to content

Commit c98e3bb

Browse files
JDK22
1 parent 743bd0c commit c98e3bb

File tree

5 files changed

+27
-3
lines changed

5 files changed

+27
-3
lines changed

.github/actions/setup/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ inputs:
77
runs:
88
using: "composite"
99
steps:
10-
- name: set up JDK 21
10+
- name: set up JDK 22
1111
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
1212
with:
1313
distribution: 'zulu'
14-
java-version: '21'
14+
java-version: '22'
1515
- name: Setup Gradle
1616
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
1717
with:

build-logic/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import io.gitlab.arturbosch.detekt.Detekt
12
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
23
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
34

@@ -66,6 +67,8 @@ spotless {
6667
}
6768
}
6869

70+
tasks.withType<Detekt>().configureEach { jvmTarget = "17" }
71+
6972
tasks.withType<KotlinCompile>().configureEach {
7073
compilerOptions {
7174
allWarningsAsErrors = true

build-logic/src/main/kotlin/dev/whosnickdoglio/buildlogic/RulesPlugin.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import dev.whosnickdoglio.buildlogic.configuration.configureSpotless
1111
import dev.whosnickdoglio.buildlogic.configuration.configureTests
1212
import dev.whosnickdoglio.buildlogic.configuration.dependOnBuildLogicTask
1313
import dev.whosnickdoglio.buildlogic.configuration.getVersionCatalog
14+
import io.gitlab.arturbosch.detekt.Detekt
1415
import org.gradle.api.Plugin
1516
import org.gradle.api.Project
1617

@@ -30,6 +31,10 @@ class RulesPlugin : Plugin<Project> {
3031
dependOnBuildLogicTask("sortDependencies")
3132
dependOnBuildLogicTask("checkSortDependencies")
3233

34+
tasks.withType(Detekt::class.java).configureEach {
35+
it.jvmTarget = "17"
36+
}
37+
3338
configureJvm(libs.findVersion("jdk").get().requiredVersion.toInt())
3439
configureLint()
3540
configureSpotless(libs.findVersion("ktlint").get().requiredVersion)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ lint = "31.4.1"
77
detekt = "1.23.6"
88
kover = "0.8.0"
99
spotless = "6.25.0"
10-
jdk = "21"
10+
jdk = "22"
1111
sort = "0.6"
1212
dagger = "2.51.1"
1313

test-app/build.gradle.kts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import io.gitlab.arturbosch.detekt.Detekt
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
13
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
24
import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
35
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -106,6 +108,20 @@ spotless {
106108
}
107109
}
108110

111+
tasks.withType<Detekt>().configureEach { jvmTarget = "17" }
112+
113+
tasks.withType<KotlinCompile>().configureEach {
114+
compilerOptions {
115+
allWarningsAsErrors = true
116+
jvmTarget = JvmTarget.JVM_17
117+
}
118+
}
119+
120+
tasks.withType<JavaCompile>().configureEach {
121+
sourceCompatibility = JavaVersion.VERSION_17.toString()
122+
targetCompatibility = JavaVersion.VERSION_17.toString()
123+
}
124+
109125
dependencies {
110126
coreLibraryDesugaring(libs.desugar)
111127

0 commit comments

Comments
 (0)