mirror of
https://github.com/apple/pkl.git
synced 2026-04-27 18:57:12 +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
101 lines
3.3 KiB
Kotlin
101 lines
3.3 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 java.nio.file.Files
|
|
import java.nio.file.LinkOption
|
|
|
|
plugins {
|
|
pklAllProjects
|
|
pklJavaLibrary
|
|
pklPublishLibrary
|
|
}
|
|
|
|
val pklDistributionCurrent: Configuration by configurations.creating
|
|
val pklHistoricalDistributions: Configuration by configurations.creating
|
|
|
|
// Because pkl-executor doesn't depend on other Pkl modules
|
|
// (nor has overlapping dependencies that could cause a version conflict),
|
|
// clients are free to use different versions of pkl-executor and (say) pkl-config-java-all.
|
|
// (Pkl distributions used by EmbeddedExecutor are isolated via class loaders.)
|
|
dependencies {
|
|
pklDistributionCurrent(project(":pkl-config-java", "fatJar"))
|
|
@Suppress("UnstableApiUsage") pklHistoricalDistributions(libs.pklConfigJavaAll025)
|
|
|
|
implementation(libs.slf4jApi)
|
|
|
|
testImplementation(projects.pklCommonsTest)
|
|
testImplementation(projects.pklCore)
|
|
testImplementation(libs.slf4jSimple)
|
|
}
|
|
|
|
// TODO why is this needed? Without this, we get error:
|
|
// `Entry org/pkl/executor/EmbeddedExecutor.java is a duplicate but no duplicate handling strategy
|
|
// has been set.`
|
|
// However, we do not have multiple of these Java files.
|
|
tasks.named<Jar>("sourcesJar") { duplicatesStrategy = DuplicatesStrategy.EXCLUDE }
|
|
|
|
publishing {
|
|
publications {
|
|
named<MavenPublication>("library") {
|
|
pom {
|
|
url.set("https://github.com/apple/pkl/tree/main/pkl-executor")
|
|
description.set(
|
|
"""
|
|
Library for executing Pkl code in a sandboxed environment.
|
|
"""
|
|
.trimIndent()
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
sourceSets { main { java { srcDir("src/main/java") } } }
|
|
|
|
val prepareHistoricalDistributions by tasks.registering {
|
|
val outputDir = layout.buildDirectory.dir("pklHistoricalDistributions")
|
|
inputs.files(pklHistoricalDistributions.files)
|
|
outputs.dir(outputDir)
|
|
doLast {
|
|
val distributionDir = outputDir.get().asFile.toPath().also(Files::createDirectories)
|
|
for (file in pklHistoricalDistributions.files) {
|
|
val target = distributionDir.resolve(file.name)
|
|
// Create normal files on Windows, symlink on macOS/linux (need admin privileges to create
|
|
// symlinks on Windows)
|
|
if (buildInfo.os.isWindows) {
|
|
if (!Files.isRegularFile(target, LinkOption.NOFOLLOW_LINKS)) {
|
|
if (Files.exists(target)) {
|
|
Files.delete(target)
|
|
}
|
|
Files.copy(file.toPath(), target)
|
|
}
|
|
} else {
|
|
if (!Files.isSymbolicLink(target)) {
|
|
if (Files.exists(target)) {
|
|
Files.delete(target)
|
|
}
|
|
Files.createSymbolicLink(target, file.toPath())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
val prepareTest by tasks.registering {
|
|
dependsOn(pklDistributionCurrent, prepareHistoricalDistributions)
|
|
}
|
|
|
|
tasks.test { dependsOn(prepareTest) }
|