mirror of
https://github.com/apple/pkl.git
synced 2026-04-30 04:04:18 +02:00
2d4286ee7b
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
85 lines
2.4 KiB
Kotlin
85 lines
2.4 KiB
Kotlin
/*
|
|
* Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* https://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
plugins {
|
|
pklAllProjects
|
|
pklKotlinLibrary
|
|
pklNativeLifecycle
|
|
}
|
|
|
|
dependencies {
|
|
implementation(projects.pklCore)
|
|
implementation(libs.msgpack)
|
|
implementation(libs.truffleApi)
|
|
|
|
testImplementation(projects.pklCommonsTest)
|
|
}
|
|
|
|
tasks.test { exclude("**/NativeServerTest.*") }
|
|
|
|
private fun Test.configureNativeTest() {
|
|
testClassesDirs = files(tasks.test.get().testClassesDirs)
|
|
classpath = tasks.test.get().classpath
|
|
include("**/NativeServerTest.*")
|
|
}
|
|
|
|
val testMacExecutableAarch64 by
|
|
tasks.registering(Test::class) {
|
|
dependsOn(":pkl-cli:macExecutableAarch64")
|
|
configureNativeTest()
|
|
}
|
|
|
|
val testMacExecutableAmd64 by
|
|
tasks.registering(Test::class) {
|
|
dependsOn(":pkl-cli:macExecutableAmd64")
|
|
configureNativeTest()
|
|
}
|
|
|
|
val testLinuxExecutableAmd64 by
|
|
tasks.registering(Test::class) {
|
|
dependsOn(":pkl-cli:linuxExecutableAmd64")
|
|
configureNativeTest()
|
|
}
|
|
|
|
val testLinuxExecutableAarch64 by
|
|
tasks.registering(Test::class) {
|
|
dependsOn(":pkl-cli:linuxExecutableAarch64")
|
|
configureNativeTest()
|
|
}
|
|
|
|
val testAlpineExecutableAmd64 by
|
|
tasks.registering(Test::class) {
|
|
dependsOn(":pkl-cli:alpineExecutableAmd64")
|
|
configureNativeTest()
|
|
}
|
|
|
|
val testWindowsExecutableAmd64 by
|
|
tasks.registering(Test::class) {
|
|
dependsOn(":pkl-cli:windowsExecutableAmd64")
|
|
configureNativeTest()
|
|
}
|
|
|
|
tasks.testNativeMacOsAarch64 { dependsOn(testMacExecutableAarch64) }
|
|
|
|
tasks.testNativeMacOsAmd64 { dependsOn(testMacExecutableAmd64) }
|
|
|
|
tasks.testNativeLinuxAarch64 { dependsOn(testLinuxExecutableAarch64) }
|
|
|
|
tasks.testNativeLinuxAmd64 { dependsOn(testLinuxExecutableAmd64) }
|
|
|
|
tasks.testNativeAlpineLinuxAmd64 { dependsOn(testAlpineExecutableAmd64) }
|
|
|
|
tasks.testNativeWindowsAmd64 { dependsOn(testWindowsExecutableAmd64) }
|