starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-06-12 00:24:37 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Upgrade JVM toolchain to 25 and Kotlin toolchain to 2.3.20 (#1516)

Browse Source 
Motivation
- Enable correct NullAway analysis
- Pick up toolchain fixes and improvements

Toolchains
- Require JDK 25 for JVM toolchain (keep Java 17 runtime compatibility)
- Require Kotlin 2.3.20 for Kotlin toolchain (keep Kotlin 2.2 runtime
compatibility)
- Require JDK 25 for Gradle daemon JVM (via
gradle-daemon-jvm.properties)
- Fix javac and kotlinc warnings from toolchain upgrades

CI
- Bump GitHub workflows to JDK 25

Building Kotlin
- Bump Kotlin language level to 2.2 to match stdlib version
- Consolidate build logic into pklKotlinBase.gradle.kts
- Adopt modern Kotlin plugin syntax
- Fix new kotlinc warnings
- Update ktfmt to 0.62
  - first version compatible with Kotlin 2.3.20
  - changes formatting compared to 0.61
- Replace dependency resolution rule with BOM alignment
  - rule was too broad and interfered with toolchain/runtime separation

Testing
- Expand matrix to JDK 25 (LTS) and 26
- Ensure each matrix task can be run independently
- Fix KotlinCodeGeneratorsTest and EmbeddedExecutorsTest on affected
JDKs
- Disable one test in CliCommandTest on affected JDKs (failure cause
unknown)

Compatibility fixes
- Fix reflective access in DocGenerator on affected JDKs

Build fixes
- Fix misuse of `task.enabled` vs. `report.required`
- Fix `gradlew tasks` on Windows
- Downgrade Spotless to 8.3.0 to (hopefully) work around sporadic
NoClassDefFoundError

Result
- NullAway runs correctly
- Broader JDK test coverage
- More reproducible and potentially faster builds
This commit is contained in:
odenix
2026-04-14 11:57:09 -07:00
committed by GitHub
parent 20f403e751
commit 2d4286ee7b
49 changed files with 1347 additions and 1096 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkl-tools/gradle.lockfile
+6 -5
View File
@@ -36,10 +36,11 @@ org.graalvm.sdk:word:25.0.1=runtimeClasspath,testRuntimeClasspath
org.graalvm.truffle:truffle-api:25.0.1=runtimeClasspath,testRuntimeClasspath
org.graalvm.truffle:truffle-compiler:25.0.1=runtimeClasspath,testRuntimeClasspath
org.graalvm.truffle:truffle-runtime:25.0.1=runtimeClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-bom:2.2.21=runtimeClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-reflect:2.2.21=runtimeClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2=runtimeClasspath,testRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2=runtimeClasspath,testRuntimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2=runtimeClasspath,testRuntimeClasspath
@@ -53,10 +54,10 @@ org.jetbrains:annotations:13.0=compileClasspath,testCompileClasspath
org.jetbrains:annotations:23.0.0=runtimeClasspath,testRuntimeClasspath
org.jetbrains:markdown-jvm:0.7.3=runtimeClasspath,testRuntimeClasspath
org.jetbrains:markdown:0.7.3=runtimeClasspath,testRuntimeClasspath
org.jline:jline-native:4.0.11=runtimeClasspath,testRuntimeClasspath
org.jline:jline-reader:4.0.11=runtimeClasspath,testRuntimeClasspath
org.jline:jline-terminal-jni:4.0.11=runtimeClasspath,testRuntimeClasspath
org.jline:jline-terminal:4.0.11=runtimeClasspath,testRuntimeClasspath
org.jline:jline-native:4.0.12=runtimeClasspath,testRuntimeClasspath
org.jline:jline-reader:4.0.12=runtimeClasspath,testRuntimeClasspath
org.jline:jline-terminal-jni:4.0.12=runtimeClasspath,testRuntimeClasspath
org.jline:jline-terminal:4.0.12=runtimeClasspath,testRuntimeClasspath
org.msgpack:msgpack-core:0.9.11=runtimeClasspath,testRuntimeClasspath
org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath
org.snakeyaml:snakeyaml-engine:2.10=runtimeClasspath,testRuntimeClasspath