mirror of
https://github.com/apple/pkl.git
synced 2026-05-25 16:19:20 +02:00
odenix
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
56 lines
1.8 KiB
Kotlin
56 lines
1.8 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.
|
|
*/
|
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
|
|
|
plugins {
|
|
`kotlin-dsl`
|
|
`jvm-toolchains`
|
|
}
|
|
|
|
/**
|
|
* To avoid the provisioning of multiple JDKs and other build issues, keep this value in sync with
|
|
* the JVM toolchain versions in `BuildInfo.kt` and `gradle-daemon-jvm.properties`.
|
|
*/
|
|
val toolchainVersion = 25
|
|
|
|
dependencies {
|
|
implementation(libs.downloadTaskPlugin)
|
|
implementation(libs.spotlessPlugin)
|
|
implementation(libs.kotlinPlugin) { exclude(module = "kotlin-android-extensions") }
|
|
implementation(libs.shadowPlugin)
|
|
|
|
// fix from the Gradle team: makes version catalog symbols available in build scripts
|
|
// see here for more: https://github.com/gradle/gradle/issues/15383
|
|
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
|
|
}
|
|
|
|
java {
|
|
toolchain {
|
|
languageVersion = JavaLanguageVersion.of(toolchainVersion)
|
|
vendor = JvmVendorSpec.ADOPTIUM
|
|
}
|
|
}
|
|
|
|
tasks.withType<JavaCompile>().configureEach { options.release = toolchainVersion }
|
|
|
|
kotlin {
|
|
jvmToolchain(toolchainVersion)
|
|
compilerOptions {
|
|
jvmTarget = JvmTarget.fromTarget(toolchainVersion.toString())
|
|
freeCompilerArgs.add("-Xjdk-release=$toolchainVersion")
|
|
}
|
|
}
|