Skip to content

Commit 23b1571

Browse files
committed
actions: make sure the CI env JDK is used for java tasks by gradle
1 parent c5b4885 commit 23b1571

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

.github/workflows/gradle-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ jobs:
3030
with:
3131
add-job-summary-as-pr-comment: on-failure
3232

33+
- name: Gradle build environment info
34+
run: ./gradlew -q buildEnvironment
35+
3336
- name: Execute Gradle build
3437
run: ./gradlew --continue build
3538

buildSrc/src/main/kotlin/framefork.java.gradle.kts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ repositories {
1818
java {
1919
sourceCompatibility = JavaVersion.VERSION_21
2020
targetCompatibility = JavaVersion.VERSION_21
21-
22-
toolchain {
23-
languageVersion = JavaLanguageVersion.of(21)
24-
}
2521
}
2622

2723
dependencies {
@@ -54,6 +50,14 @@ idea {
5450
}
5551
}
5652

53+
tasks.withType<JavaCompile>() {
54+
doLast {
55+
javaCompiler.getOrNull()?.also {
56+
println("Used JDK: ${it.metadata.javaRuntimeVersion} ${it.metadata.vendor}")
57+
}
58+
}
59+
}
60+
5761
tasks.withType<Test> {
5862
useJUnitPlatform()
5963

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ org.gradle.configuration-cache=false
66
org.gradle.console=verbose
77
org.gradle.warning.mode=all
88

9+
org.gradle.java.installations.auto-detect=true
10+
org.gradle.java.installations.auto-download=false
11+
912
kapt.use.k2=true
1013
# Enable Kapt Incremental annotation processing requeste
1114
kapt.incremental.apt=true

0 commit comments

Comments
 (0)