Skip to content

Commit 02255ec

Browse files
chore: use JDK 21 release instead of toolchain
1 parent 910bf2b commit 02255ec

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

.github/workflows/build.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,14 @@ jobs:
3030
- name: 'Set up JDK'
3131
uses: 'actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9' # v4.2.1
3232
with:
33-
java-version: '17'
34-
distribution: 'temurin'
35-
check-latest: 'true'
33+
java-version: 21
3634

3735
# https://github.com/gradle/actions/tree/main/setup-gradle
3836
- name: 'Set up Gradle'
3937
uses: 'gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70' # v3.5.0
4038
with:
4139
gradle-version: 'wrapper'
42-
gradle-home-cache-includes: |-
43-
jdks
44-
caches
45-
notifications
46-
gradle-home-cache-cleanup: 'true'
40+
gradle-home-cache-cleanup: true
4741
validate-wrappers: true
4842

4943
# https://github.com/gradle/actions/tree/main/dependency-submission

build.gradle.kts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask
44
import com.vanniktech.maven.publish.SonatypeHost
55
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
66
import org.gradle.api.tasks.testing.logging.TestLogEvent
7+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
78

89
/*
910
* Copyright 2023 the original author or authors.
@@ -63,7 +64,16 @@ tasks.withType<AbstractArchiveTask>().configureEach {
6364

6465
kotlin {
6566
explicitApi()
66-
jvmToolchain(21)
67+
}
68+
69+
tasks.withType<KotlinCompile>().configureEach {
70+
kotlinOptions {
71+
jvmTarget = "21"
72+
freeCompilerArgs += listOf(
73+
"-Xjsr305=strict",
74+
"-Xjdk-release=21"
75+
)
76+
}
6777
}
6878

6979
mavenPublishing {

0 commit comments

Comments
 (0)