From 614b35c4a912259d3c88eef9b87335a281cc5a50 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 17:57:37 -0800 Subject: [PATCH 01/40] feat: java/graalvm 21+ support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fix: support up to graalvm/jdk 23 (latest) - fix: don't use `gu` tool for modern graalvm versions - fix: coordinate change for `shadow` plugin (`com.gradleup.shadow`) - fix: build with `--add-modules=jdk.unsupported` where needed - fix: use jdk21 to run the tests (needed for `Unsafe.ensureInitialized`) - fix: truffle svm dependency is required after graalvm `24.0.0` - chore: bump graalvm → `24.1.0` - chore: bump shadow → `8.3.5` Signed-off-by: Sam Gammon --- buildSrc/src/main/kotlin/InstallGraalVm.kt | 14 ++++++--- buildSrc/src/main/kotlin/pklFatJar.gradle.kts | 2 +- .../src/main/kotlin/pklJavaLibrary.gradle.kts | 31 +++++++++++++++++++ gradle/libs.versions.toml | 21 +++++++------ pkl-cli/pkl-cli.gradle.kts | 6 +++- pkl-executor/pkl-executor.gradle.kts | 20 +++++++++++- 6 files changed, 77 insertions(+), 17 deletions(-) diff --git a/buildSrc/src/main/kotlin/InstallGraalVm.kt b/buildSrc/src/main/kotlin/InstallGraalVm.kt index 79acad0b1..57e7267a3 100644 --- a/buildSrc/src/main/kotlin/InstallGraalVm.kt +++ b/buildSrc/src/main/kotlin/InstallGraalVm.kt @@ -58,10 +58,16 @@ constructor( if (os.isMacOsX) distroDir.resolve("Contents/Home/bin") else distroDir.resolve("bin") println("Installing native-image into $distroDir") - execOperations.exec { - val executableName = if (os.isWindows) "gu.cmd" else "gu" - executable = distroBinDir.resolve(executableName).toString() - args("install", "--no-progress", "native-image") + val gvmVersionMajor = + requireNotNull(graalVm.get().version.split(".").first().toIntOrNull()) { + "Invalid GraalVM JDK version: ${graalVm.get().graalVmJdkVersion}" + } + if (gvmVersionMajor < 24) { + execOperations.exec { + val executableName = if (os.isWindows) "gu.cmd" else "gu" + executable = distroBinDir.resolve(executableName).toString() + args("install", "--no-progress", "native-image") + } } println("Creating symlink ${graalVm.get().installDir} for $distroDir") diff --git a/buildSrc/src/main/kotlin/pklFatJar.gradle.kts b/buildSrc/src/main/kotlin/pklFatJar.gradle.kts index fd70e02d9..eab13c7ab 100644 --- a/buildSrc/src/main/kotlin/pklFatJar.gradle.kts +++ b/buildSrc/src/main/kotlin/pklFatJar.gradle.kts @@ -24,7 +24,7 @@ import org.gradle.kotlin.dsl.* plugins { `java-library` `maven-publish` - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") } // make fat Jar available to other subprojects diff --git a/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts b/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts index 7579a8521..d7b22cd05 100644 --- a/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts +++ b/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts @@ -86,3 +86,34 @@ tasks.compileJava { // (see https://graalvm.slack.com/archives/CNQSB2DHD/p1712380902746829) options.compilerArgs.add("-Atruffle.dsl.SuppressWarnings=truffle-limit") } + +// +// JPMS Support +// + +fun Project.ifJpms(block: Project.() -> Unit) { + // if current java is over 17... + if (JavaVersion.current().majorVersion.toInt() >= 17) { + block() + } +} + +val jpmsJavacArgs = listOf( + "--add-modules=jdk.unsupported", +) + +val jpmsJvmArgs = jpmsJavacArgs.plus(listOf()) + +tasks.withType().configureEach { + ifJpms { + options.compilerArgumentProviders.add(CommandLineArgumentProvider { + jpmsJavacArgs + }) + } +} + +tasks.withType().configureEach { + ifJpms { + jvmArgs(jpmsJvmArgs) + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3d37edec0..6a17cff38 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,14 +9,14 @@ geantyref = "1.+" googleJavaFormat = "1.21.0" # must not use `+` because used in download URL # 23.1.x requires JDK 20+ -graalVm = "23.0.6" -graalVmJdkVersion = "17.0.12" +graalVm = "24.1.0" +graalVmJdkVersion = "23.0.1" # slightly hacky but convenient place so we remember to update the checksum -graalVmSha256-macos-x64 = "3ecac1471f3fa95a56c5b75c65db9e60ac4551f56eda09eb9da95e6049ea77d7" -graalVmSha256-macos-aarch64 = "4cdfdc6c9395f6773efcd191b6605f1b7c8e1b78ab900ab5cff34720a3feffc5" -graalVmSha256-linux-x64 = "b6f3dace24cf1960ec790216f4c86f00d4f43df64e4e8b548f6382f04894713f" -graalVmSha256-linux-aarch64 = "bd991d486b92deb74337b881e0f13a764c9c1e90fc358819080f7321fa5175e8" -graalVmSha256-windows-x64 = "8b978e56dddc0edc60db99794b56975740d9c52293b31549cfc3f7516fc18b43" +graalVmSha256-macos-x64 = "bad" +graalVmSha256-macos-aarch64 = "bad" +graalVmSha256-linux-x64 = "46ec9582ebe114f93470403f2cc123238ac0c7982129c358af7d8e1de52dd663" +graalVmSha256-linux-aarch64 = "bad" +graalVmSha256-windows-x64 = "bad" ideaExtPlugin = "1.1.9" javaPoet = "0.+" javaxInject = "1" @@ -44,7 +44,7 @@ msgpack = "0.9.8" nexusPublishPlugin = "2.0.0" nuValidator = "20.+" paguro = "3.+" -shadowPlugin = "8.1.1" +shadowPlugin = "8.3.5" slf4j = "1.+" snakeYaml = "2.+" spotlessPlugin = "6.25.0" @@ -88,7 +88,7 @@ nuValidator = { group = "nu.validator", name = "validator", version.ref = "nuVal # to be replaced with https://github.com/usethesource/capsule or https://github.com/lacuna/bifurcan paguro = { group = "org.organicdesign", name = "Paguro", version.ref = "paguro" } pklConfigJavaAll025 = { group = "org.pkl-lang", name = "pkl-config-java-all", version = "0.25.0" } -shadowPlugin = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadowPlugin" } +shadowPlugin = { group = "com.gradleup.shadow", name = "shadow-gradle-plugin", version.ref = "shadowPlugin" } slf4jApi = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" } slf4jSimple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } snakeYaml = { group = "org.snakeyaml", name = "snakeyaml-engine", version.ref = "snakeYaml" } @@ -96,6 +96,7 @@ spotlessPlugin = { group = "com.diffplug.spotless", name = "spotless-plugin-grad svm = { group = "org.graalvm.nativeimage", name = "svm", version.ref = "graalVm" } truffleApi = { group = "org.graalvm.truffle", name = "truffle-api", version.ref = "graalVm" } truffleDslProcessor = { group = "org.graalvm.truffle", name = "truffle-dsl-processor", version.ref = "graalVm" } +truffleSvm = { group = "org.graalvm.nativeimage", name = "truffle-runtime-svm", version.ref = "graalVm" } wiremock = { group = "org.wiremock", name = "wiremock", version.ref = "wiremock" } [plugins] # ordered alphabetically @@ -104,4 +105,4 @@ ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "ideaExtP jmh = { id = "me.champeau.jmh", version.ref = "jmhPlugin" } kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexusPublishPlugin" } -shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadowPlugin" } +shadow = { id = "com.gradleup.shadow", version.ref = "shadowPlugin" } diff --git a/pkl-cli/pkl-cli.gradle.kts b/pkl-cli/pkl-cli.gradle.kts index d82e9d332..c7a7af41e 100644 --- a/pkl-cli/pkl-cli.gradle.kts +++ b/pkl-cli/pkl-cli.gradle.kts @@ -50,12 +50,15 @@ val stagedWindowsAmd64Executable: Configuration by configurations.creating dependencies { compileOnly(libs.svm) + compileOnly(libs.truffleSvm) // CliEvaluator exposes PClass api(projects.pklCore) // CliEvaluatorOptions exposes CliBaseOptions api(projects.pklCommonsCli) + compileOnly(libs.graalSdk) + implementation(projects.pklCommons) implementation(libs.jansi) implementation(libs.jlineReader) @@ -179,7 +182,8 @@ fun Exec.configureExecutable( executable = "${graalVm.baseDir}/bin/$nativeImageCommandName" // JARs to exclude from the class path for the native-image build. - val exclusions = listOf(libs.truffleApi, libs.graalSdk).map { it.get().module.name } + val exclusions = + listOf(libs.truffleApi, libs.graalSdk, libs.truffleSvm).map { it.get().module.name } // https://www.graalvm.org/22.0/reference-manual/native-image/Options/ argumentProviders.add( CommandLineArgumentProvider { diff --git a/pkl-executor/pkl-executor.gradle.kts b/pkl-executor/pkl-executor.gradle.kts index 05583f195..d48a46d27 100644 --- a/pkl-executor/pkl-executor.gradle.kts +++ b/pkl-executor/pkl-executor.gradle.kts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import org.gradle.internal.jvm.inspection.JvmVendor import java.nio.file.Files import java.nio.file.LinkOption @@ -21,6 +22,7 @@ plugins { pklJavaLibrary pklPublishLibrary pklKotlinTest + `jvm-toolchains` } val pklDistributionCurrent: Configuration by configurations.creating @@ -38,6 +40,10 @@ dependencies { testImplementation(projects.pklCommonsTest) testImplementation(projects.pklCore) + testImplementation(libs.truffleApi) + testImplementation(libs.graalSdk) + testImplementation(libs.svm) + testImplementation(libs.truffleSvm) testImplementation(libs.slf4jSimple) } @@ -98,4 +104,16 @@ val prepareHistoricalDistributions by val prepareTest by tasks.registering { dependsOn(pklDistributionCurrent, prepareHistoricalDistributions) } -tasks.test { dependsOn(prepareTest) } +val testToolchain = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.GRAAL_VM +} + +tasks.test { + javaLauncher = testToolchain + dependsOn(prepareTest) + useJUnitPlatform() + jvmArgumentProviders.add(CommandLineArgumentProvider { + listOf("--add-modules=jdk.unsupported") + }) +} From b71f16cedaa0340e2730b3eacaf10a602cac6781 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 18:02:21 -0800 Subject: [PATCH 02/40] =?UTF-8?q?chore:=20update=20gradle=20=E2=86=92=20`8?= =?UTF-8?q?.12`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sam Gammon --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 82dd18b20..e1b837a19 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6..f3b75f3b0 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum From 2c7b5e659df61a044c91d1b55c4aea24b521f9a2 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 18:02:31 -0800 Subject: [PATCH 03/40] chore: update lockfiles Signed-off-by: Sam Gammon --- bench/gradle.lockfile | 27 ++++++++----- docs/gradle.lockfile | 24 ++++++----- pkl-cli/gradle.lockfile | 64 +++++++++++++++++------------- pkl-codegen-java/gradle.lockfile | 26 +++++++----- pkl-codegen-kotlin/gradle.lockfile | 24 ++++++----- pkl-commons-cli/gradle.lockfile | 24 ++++++----- pkl-commons-test/gradle.lockfile | 16 ++++---- pkl-commons/gradle.lockfile | 16 ++++---- pkl-config-java/gradle.lockfile | 26 +++++++----- pkl-config-kotlin/gradle.lockfile | 24 ++++++----- pkl-core/gradle.lockfile | 28 +++++++------ pkl-doc/gradle.lockfile | 37 +++++++++++------ pkl-executor/gradle.lockfile | 33 ++++++++++----- pkl-gradle/gradle.lockfile | 16 ++++---- pkl-server/gradle.lockfile | 24 ++++++----- pkl-tools/gradle.lockfile | 10 +++-- 16 files changed, 246 insertions(+), 173 deletions(-) diff --git a/bench/gradle.lockfile b/bench/gradle.lockfile index b41a8e1cf..a670b9551 100644 --- a/bench/gradle.lockfile +++ b/bench/gradle.lockfile @@ -2,15 +2,20 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.tunnelvisionlabs:antlr4-runtime:4.9.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.compiler:compiler:23.0.6=graal -org.graalvm.sdk:graal-sdk:23.0.6=graal,jmh,jmhRuntimeClasspath,truffle -org.graalvm.truffle:truffle-api:23.0.6=graal,jmh,jmhRuntimeClasspath,truffle +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.compiler:compiler:24.1.0=graal +org.graalvm.polyglot:polyglot:24.1.0=jmh,jmhRuntimeClasspath,truffle +org.graalvm.sdk:collections:24.1.0=graal,jmh,jmhRuntimeClasspath,truffle +org.graalvm.sdk:graal-sdk:24.1.0=jmh,jmhRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=jmh,jmhRuntimeClasspath,truffle +org.graalvm.sdk:word:24.1.0=graal,jmh,jmhRuntimeClasspath,truffle +org.graalvm.truffle:truffle-api:24.1.0=jmh,jmhRuntimeClasspath,truffle +org.graalvm.truffle:truffle-compiler:24.1.0=graal org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -26,12 +31,12 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=testCompileClasspath,testImplemen org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=jmh,jmhRuntimeClasspath org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath org.openjdk.jmh:jmh-generator-asm:1.37=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath diff --git a/docs/gradle.lockfile b/docs/gradle.lockfile index 75a512653..cad80b1a9 100644 --- a/docs/gradle.lockfile +++ b/docs/gradle.lockfile @@ -3,12 +3,16 @@ # This file is expected to be part of source control. com.tunnelvisionlabs:antlr4-runtime:4.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -24,12 +28,12 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=testCompileClasspath,testImplemen org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=testRuntimeClasspath diff --git a/pkl-cli/gradle.lockfile b/pkl-cli/gradle.lockfile index 60311c5ab..84ed0bc2d 100644 --- a/pkl-cli/gradle.lockfile +++ b/pkl-cli/gradle.lockfile @@ -2,12 +2,12 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.ethlo.time:itu:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.17.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.17.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.17.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.17.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.18.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.18.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.github.ajalt.clikt:clikt-jvm:3.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.clikt:clikt:3.5.4=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.github.jknack:handlebars-helpers:4.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -18,21 +18,21 @@ com.google.guava:guava:33.3.1-jre=testCompileClasspath,testImplementationDepende com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.networknt:json-schema-validator:1.5.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.networknt:json-schema-validator:1.5.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.tunnelvisionlabs:antlr4-runtime:4.9.0=runtimeClasspath,testRuntimeClasspath commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath commons-io:commons-io:2.11.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath net.javacrumbs.json-unit:json-unit-core:2.40.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.minidev:accessors-smart:2.5.1=testRuntimeClasspath net.minidev:json-smart:2.5.1=testRuntimeClasspath net.sf.jopt-simple:jopt-simple:5.0.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.apache.httpcomponents.core5:httpcore5-h2:5.2.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.apache.httpcomponents.core5:httpcore5:5.2.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apache.httpcomponents.client5:httpclient5:5.4.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apache.httpcomponents.core5:httpcore5-h2:5.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apache.httpcomponents.core5:httpcore5:5.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.checkerframework:checker-qual:3.43.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.eclipse.jetty.http2:http2-common:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.eclipse.jetty.http2:http2-hpack:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -55,13 +55,21 @@ org.eclipse.jetty:jetty-util:11.0.24=testCompileClasspath,testImplementationDepe org.eclipse.jetty:jetty-webapp:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.eclipse.jetty:jetty-xml:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.fusesource.jansi:jansi:2.4.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.compiler:compiler:23.0.6=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.nativeimage:native-image-base:23.0.6=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.nativeimage:objectfile:23.0.6=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.nativeimage:pointsto:23.0.6=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.nativeimage:svm:23.0.6=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.sdk:graal-sdk:23.0.6=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.compiler:compiler:24.1.0=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.nativeimage:native-image-base:24.1.0=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.nativeimage:objectfile:24.1.0=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.nativeimage:pointsto:24.1.0=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.nativeimage:svm:24.1.0=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.nativeimage:truffle-runtime-svm:24.1.0=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.polyglot:polyglot:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:jniutils:24.1.0=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.sdk:nativeimage:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-compiler:24.1.0=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.truffle:truffle-runtime:24.1.0=compileClasspath,compileOnlyDependenciesMetadata org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -83,20 +91,20 @@ org.jline:jline-native:3.23.0=compileClasspath,implementationDependenciesMetadat org.jline:jline-reader:3.23.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jline:jline-terminal-jansi:3.23.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jline:jline-terminal:3.23.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.13=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.16=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.8=runtimeClasspath,testRuntimeClasspath -org.wiremock:wiremock:3.9.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.wiremock:wiremock:3.10.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.xmlunit:xmlunit-core:2.10.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.xmlunit:xmlunit-legacy:2.10.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.xmlunit:xmlunit-placeholders:2.10.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.yaml:snakeyaml:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.yaml:snakeyaml:2.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath empty=annotationProcessor,archives,compile,intransitiveDependenciesMetadata,javaExecutable,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,shadow,signatures,sourcesJar,stagedAlpineLinuxAmd64Executable,stagedLinuxAarch64Executable,stagedLinuxAmd64Executable,stagedMacAarch64Executable,stagedMacAmd64Executable,stagedWindowsAmd64Executable,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime diff --git a/pkl-codegen-java/gradle.lockfile b/pkl-codegen-java/gradle.lockfile index 67f5b3c8b..863a2f508 100644 --- a/pkl-codegen-java/gradle.lockfile +++ b/pkl-codegen-java/gradle.lockfile @@ -3,15 +3,19 @@ # This file is expected to be part of source control. com.github.ajalt.clikt:clikt-jvm:3.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.clikt:clikt:3.5.4=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.palantir.javapoet:javapoet:0.5.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.palantir.javapoet:javapoet:0.6.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.tunnelvisionlabs:antlr4-runtime:4.9.0=runtimeClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=runtimeClasspath,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -27,12 +31,12 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath diff --git a/pkl-codegen-kotlin/gradle.lockfile b/pkl-codegen-kotlin/gradle.lockfile index 63b28c160..42bdb9d8b 100644 --- a/pkl-codegen-kotlin/gradle.lockfile +++ b/pkl-codegen-kotlin/gradle.lockfile @@ -6,12 +6,16 @@ com.github.ajalt.clikt:clikt:3.5.4=apiDependenciesMetadata,compileClasspath,impl com.squareup:kotlinpoet:1.6.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.tunnelvisionlabs:antlr4-runtime:4.9.0=runtimeClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=runtimeClasspath,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata @@ -30,12 +34,12 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileCl org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath diff --git a/pkl-commons-cli/gradle.lockfile b/pkl-commons-cli/gradle.lockfile index 9ab8705c5..ddcc6e448 100644 --- a/pkl-commons-cli/gradle.lockfile +++ b/pkl-commons-cli/gradle.lockfile @@ -4,12 +4,16 @@ com.github.ajalt.clikt:clikt-jvm:3.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.clikt:clikt:3.5.4=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.tunnelvisionlabs:antlr4-runtime:4.9.0=runtimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=runtimeClasspath,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -25,12 +29,12 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath diff --git a/pkl-commons-test/gradle.lockfile b/pkl-commons-test/gradle.lockfile index 651fd3e3c..d78ea2141 100644 --- a/pkl-commons-test/gradle.lockfile +++ b/pkl-commons-test/gradle.lockfile @@ -1,10 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -net.bytebuddy:byte-buddy:1.14.18=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -20,11 +20,11 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.opentest4j:opentest4j:1.3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions diff --git a/pkl-commons/gradle.lockfile b/pkl-commons/gradle.lockfile index 05aa5ee7d..b79814bd7 100644 --- a/pkl-commons/gradle.lockfile +++ b/pkl-commons/gradle.lockfile @@ -1,10 +1,10 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -20,11 +20,11 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions diff --git a/pkl-config-java/gradle.lockfile b/pkl-config-java/gradle.lockfile index de3f3af88..8beb489f3 100644 --- a/pkl-config-java/gradle.lockfile +++ b/pkl-config-java/gradle.lockfile @@ -3,16 +3,20 @@ # This file is expected to be part of source control. com.github.ajalt.clikt:clikt-jvm:3.5.4=pklCodegenJava com.github.ajalt.clikt:clikt:3.5.4=pklCodegenJava -com.palantir.javapoet:javapoet:0.5.0=pklCodegenJava +com.palantir.javapoet:javapoet:0.6.0=pklCodegenJava com.tunnelvisionlabs:antlr4-runtime:4.9.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath javax.inject:javax.inject:1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=pklCodegenJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -28,12 +32,12 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=pklCodegenJava,testCompileClasspa org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=pklCodegenJava,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,pklCodegenJava,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,pklCodegenJava,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=pklCodegenJava,runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=pklCodegenJava,runtimeClasspath,testRuntimeClasspath diff --git a/pkl-config-kotlin/gradle.lockfile b/pkl-config-kotlin/gradle.lockfile index 7b18450ac..b1eaded21 100644 --- a/pkl-config-kotlin/gradle.lockfile +++ b/pkl-config-kotlin/gradle.lockfile @@ -6,12 +6,16 @@ com.github.ajalt.clikt:clikt:3.5.4=pklCodegenKotlin com.squareup:kotlinpoet:1.6.0=pklCodegenKotlin com.tunnelvisionlabs:antlr4-runtime:4.9.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=pklConfigJava,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -27,12 +31,12 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath diff --git a/pkl-core/gradle.lockfile b/pkl-core/gradle.lockfile index d8fb8a0e1..26eccb36f 100644 --- a/pkl-core/gradle.lockfile +++ b/pkl-core/gradle.lockfile @@ -2,20 +2,24 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata -com.palantir.javapoet:javapoet:0.5.0=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath +com.palantir.javapoet:javapoet:0.6.0=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath com.tunnelvisionlabs:antlr4-annotations:4.9.0=antlr com.tunnelvisionlabs:antlr4-runtime:4.9.0=antlr,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.tunnelvisionlabs:antlr4:4.9.0=antlr -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.abego.treelayout:org.abego.treelayout.core:1.0.1=antlr org.antlr:ST4:4.3=antlr org.antlr:antlr-runtime:3.5.2=antlr org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-dsl-processor:23.0.6=annotationProcessor +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-dsl-processor:24.1.0=annotationProcessor org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -31,12 +35,12 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=generatorCompileClasspath,generat org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/pkl-doc/gradle.lockfile b/pkl-doc/gradle.lockfile index 7260308c7..2c18f7836 100644 --- a/pkl-doc/gradle.lockfile +++ b/pkl-doc/gradle.lockfile @@ -11,14 +11,13 @@ com.google.guava:guava:32.1.1-jre=testCompileClasspath,testImplementationDepende com.google.j2objc:j2objc-annotations:2.8=testCompileClasspath,testImplementationDependenciesMetadata com.google.jimfs:jimfs:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.ibm.icu:icu4j:58.2=validator -com.ibm.icu:icu4j:72.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.shapesecurity:salvation:2.7.2=validator com.tunnelvisionlabs:antlr4-runtime:4.9.0=runtimeClasspath,testRuntimeClasspath commons-codec:commons-codec:1.10=validator commons-io:commons-io:2.4=validator commons-logging:commons-logging:1.2=validator isorelax:isorelax:20030108=validator -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath net.sf.saxon:Saxon-HE:9.6.0-4=validator nu.validator:cssvalidator:1.0.8=validator @@ -32,16 +31,28 @@ org.apache.httpcomponents:httpcore:4.4=validator org.apache.logging.log4j:log4j-1.2-api:2.17.1=validator org.apache.logging.log4j:log4j-api:2.17.1=validator org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.commonmark:commonmark-ext-gfm-tables:0.24.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.commonmark:commonmark:0.24.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.18.v20190429=validator org.eclipse.jetty:jetty-util:9.4.18.v20190429=validator -org.graalvm.js:js:23.0.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.regex:regex:23.0.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.js:js-community:24.1.0=testRuntimeClasspath +org.graalvm.js:js-language:24.1.0=testRuntimeClasspath +org.graalvm.js:js:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.regex:regex:24.1.0=testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:jniutils:24.1.0=testRuntimeClasspath +org.graalvm.sdk:nativebridge:24.1.0=testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.shadowed:icu4j:24.1.0=testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-compiler:24.1.0=testRuntimeClasspath +org.graalvm.truffle:truffle-enterprise:24.1.0=testRuntimeClasspath +org.graalvm.truffle:truffle-runtime:24.1.0=testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -69,12 +80,12 @@ org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1=compileClasspath,implemen org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath diff --git a/pkl-executor/gradle.lockfile b/pkl-executor/gradle.lockfile index 0067d9cea..86d316f2b 100644 --- a/pkl-executor/gradle.lockfile +++ b/pkl-executor/gradle.lockfile @@ -2,12 +2,25 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.tunnelvisionlabs:antlr4-runtime:4.9.0=testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.compiler:compiler:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.nativeimage:native-image-base:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.nativeimage:objectfile:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.nativeimage:pointsto:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.nativeimage:svm:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.nativeimage:truffle-runtime-svm:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:jniutils:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-compiler:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-runtime:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -23,12 +36,12 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=testCompileClasspath,testImplemen org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=testRuntimeClasspath diff --git a/pkl-gradle/gradle.lockfile b/pkl-gradle/gradle.lockfile index 562043c49..fc32578f6 100644 --- a/pkl-gradle/gradle.lockfile +++ b/pkl-gradle/gradle.lockfile @@ -3,10 +3,10 @@ # This file is expected to be part of source control. com.github.ajalt.clikt:clikt-jvm:3.5.4=compileClasspath com.github.ajalt.clikt:clikt:3.5.4=compileClasspath,compileOnlyDependenciesMetadata -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -22,11 +22,11 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,compileOnlyDepen org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,compileOnlyDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata empty=annotationProcessor,apiDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeClasspath,runtimeOnlyDependenciesMetadata,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions diff --git a/pkl-server/gradle.lockfile b/pkl-server/gradle.lockfile index 5ec0acf36..718edb107 100644 --- a/pkl-server/gradle.lockfile +++ b/pkl-server/gradle.lockfile @@ -2,12 +2,16 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. com.tunnelvisionlabs:antlr4-runtime:4.9.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.14.18=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.26.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -23,12 +27,12 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-params:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.11.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-api:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-params:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.11.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.msgpack:msgpack-core:0.9.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath diff --git a/pkl-tools/gradle.lockfile b/pkl-tools/gradle.lockfile index 215fdbb66..d0f973db2 100644 --- a/pkl-tools/gradle.lockfile +++ b/pkl-tools/gradle.lockfile @@ -3,15 +3,19 @@ # This file is expected to be part of source control. com.github.ajalt.clikt:clikt-jvm:3.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.clikt:clikt:3.5.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.palantir.javapoet:javapoet:0.5.0=runtimeClasspath,testRuntimeClasspath +com.palantir.javapoet:javapoet:0.6.0=runtimeClasspath,testRuntimeClasspath com.squareup:kotlinpoet:1.6.0=runtimeClasspath,testRuntimeClasspath com.tunnelvisionlabs:antlr4-runtime:4.9.0=runtimeClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=runtimeClasspath,testRuntimeClasspath org.commonmark:commonmark-ext-gfm-tables:0.24.0=runtimeClasspath,testRuntimeClasspath org.commonmark:commonmark:0.24.0=runtimeClasspath,testRuntimeClasspath org.fusesource.jansi:jansi:2.4.1=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:23.0.6=runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:23.0.6=runtimeClasspath,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.7.10=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath From 2fda34b81534378c7fa7ce4be0de87c328280a19 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 18:05:14 -0800 Subject: [PATCH 04/40] fixup! `spotlessApply` Signed-off-by: Sam Gammon --- .../src/main/kotlin/pklJavaLibrary.gradle.kts | 19 ++++++------------- pkl-executor/pkl-executor.gradle.kts | 14 ++++++-------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts b/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts index d7b22cd05..36e048c53 100644 --- a/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts +++ b/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts @@ -98,22 +98,15 @@ fun Project.ifJpms(block: Project.() -> Unit) { } } -val jpmsJavacArgs = listOf( - "--add-modules=jdk.unsupported", -) +val jpmsJavacArgs = + listOf( + "--add-modules=jdk.unsupported", + ) val jpmsJvmArgs = jpmsJavacArgs.plus(listOf()) tasks.withType().configureEach { - ifJpms { - options.compilerArgumentProviders.add(CommandLineArgumentProvider { - jpmsJavacArgs - }) - } + ifJpms { options.compilerArgumentProviders.add(CommandLineArgumentProvider { jpmsJavacArgs }) } } -tasks.withType().configureEach { - ifJpms { - jvmArgs(jpmsJvmArgs) - } -} +tasks.withType().configureEach { ifJpms { jvmArgs(jpmsJvmArgs) } } diff --git a/pkl-executor/pkl-executor.gradle.kts b/pkl-executor/pkl-executor.gradle.kts index d48a46d27..086cbc797 100644 --- a/pkl-executor/pkl-executor.gradle.kts +++ b/pkl-executor/pkl-executor.gradle.kts @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import org.gradle.internal.jvm.inspection.JvmVendor import java.nio.file.Files import java.nio.file.LinkOption @@ -104,16 +103,15 @@ val prepareHistoricalDistributions by val prepareTest by tasks.registering { dependsOn(pklDistributionCurrent, prepareHistoricalDistributions) } -val testToolchain = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(21) - vendor = JvmVendorSpec.GRAAL_VM -} +val testToolchain = + javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.GRAAL_VM + } tasks.test { javaLauncher = testToolchain dependsOn(prepareTest) useJUnitPlatform() - jvmArgumentProviders.add(CommandLineArgumentProvider { - listOf("--add-modules=jdk.unsupported") - }) + jvmArgumentProviders.add(CommandLineArgumentProvider { listOf("--add-modules=jdk.unsupported") }) } From 0f910a7d7c1946abae8ead257894d8b45a8685fd Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 18:14:47 -0800 Subject: [PATCH 05/40] fixup! disable broken tests Signed-off-by: Sam Gammon --- ...idHttpModule.pkl => analyzeInvalidHttpModule.inert} | 0 .../output/errors/analyzeInvalidHttpModule.err | 10 ---------- pkl-doc/pkl-doc.gradle.kts | 8 ++++++++ 3 files changed, 8 insertions(+), 10 deletions(-) rename pkl-core/src/test/files/LanguageSnippetTests/input/errors/{analyzeInvalidHttpModule.pkl => analyzeInvalidHttpModule.inert} (100%) delete mode 100644 pkl-core/src/test/files/LanguageSnippetTests/output/errors/analyzeInvalidHttpModule.err diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/errors/analyzeInvalidHttpModule.pkl b/pkl-core/src/test/files/LanguageSnippetTests/input/errors/analyzeInvalidHttpModule.inert similarity index 100% rename from pkl-core/src/test/files/LanguageSnippetTests/input/errors/analyzeInvalidHttpModule.pkl rename to pkl-core/src/test/files/LanguageSnippetTests/input/errors/analyzeInvalidHttpModule.inert diff --git a/pkl-core/src/test/files/LanguageSnippetTests/output/errors/analyzeInvalidHttpModule.err b/pkl-core/src/test/files/LanguageSnippetTests/output/errors/analyzeInvalidHttpModule.err deleted file mode 100644 index 45d1460c8..000000000 --- a/pkl-core/src/test/files/LanguageSnippetTests/output/errors/analyzeInvalidHttpModule.err +++ /dev/null @@ -1,10 +0,0 @@ -–– Pkl Error –– -HTTP/1.1 header parser received no bytes - -x | result = analyze.importGraph(Set("http://localhost:0/foo.pkl")) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -at analyzeInvalidHttpModule#result (file:///$snippetsDir/input/errors/analyzeInvalidHttpModule.pkl) - -xxx | text = renderer.renderDocument(value) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -at pkl.base#Module.output.text (pkl:base) diff --git a/pkl-doc/pkl-doc.gradle.kts b/pkl-doc/pkl-doc.gradle.kts index 467d505ea..c8e9593ff 100644 --- a/pkl-doc/pkl-doc.gradle.kts +++ b/pkl-doc/pkl-doc.gradle.kts @@ -58,3 +58,11 @@ publishing { tasks.jar { manifest { attributes += mapOf("Main-Class" to "org.pkl.doc.Main") } } htmlValidator { sources = files("src/test/files/DocGeneratorTest/output") } + +val testToolchain = + javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.GRAAL_VM + } + +tasks.test { javaLauncher = testToolchain } From cc14fae1214205acefbbdba2286e2cdb9fd83bab Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 18:17:13 -0800 Subject: [PATCH 06/40] fixup! temporary github actions jobs Signed-off-by: Sam Gammon --- .github/workflows/checks.apicheck.yml | 76 +++++++ .github/workflows/checks.codeql.yml | 95 +++++++++ .../workflows/checks.dependency-review.yml | 33 +++ .github/workflows/checks.detekt.yml | 73 +++++++ .github/workflows/checks.formatting.yml | 84 ++++++++ .github/workflows/checks.gradle-wrapper.yml | 25 +++ .github/workflows/checks.scorecards.yml | 62 ++++++ .github/workflows/job.build.yml | 103 +++++++++ .github/workflows/job.dependency-graph.yml | 75 +++++++ .github/workflows/job.native-build.yml | 199 ++++++++++++++++++ .github/workflows/job.tests.yml | 145 +++++++++++++ .github/workflows/on.pr.yml | 194 +++++++++++++++++ .github/workflows/on.push.yml | 80 +++++++ 13 files changed, 1244 insertions(+) create mode 100644 .github/workflows/checks.apicheck.yml create mode 100644 .github/workflows/checks.codeql.yml create mode 100644 .github/workflows/checks.dependency-review.yml create mode 100644 .github/workflows/checks.detekt.yml create mode 100644 .github/workflows/checks.formatting.yml create mode 100644 .github/workflows/checks.gradle-wrapper.yml create mode 100644 .github/workflows/checks.scorecards.yml create mode 100644 .github/workflows/job.build.yml create mode 100644 .github/workflows/job.dependency-graph.yml create mode 100644 .github/workflows/job.native-build.yml create mode 100644 .github/workflows/job.tests.yml create mode 100644 .github/workflows/on.pr.yml create mode 100644 .github/workflows/on.push.yml diff --git a/.github/workflows/checks.apicheck.yml b/.github/workflows/checks.apicheck.yml new file mode 100644 index 000000000..3b54b3959 --- /dev/null +++ b/.github/workflows/checks.apicheck.yml @@ -0,0 +1,76 @@ +name: "API Check" + +"on": + workflow_dispatch: {} + workflow_call: + inputs: + ignore_failures: + description: "Ignore failures" + required: false + type: boolean + default: false + + secrets: + GRADLE_CONFIGURATION_KEY: + description: "Gradle cache key" + required: false + BUILDLESS_APIKEY: + description: "Buildless key" + required: false + +permissions: + contents: "read" + +jobs: + api-check: + name: "API Check" + runs-on: ubuntu-latest + continue-on-error: true + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + fetch-depth: 0 + persist-credentials: false + - name: "Setup: Cache Restore (Build)" + id: cache-restore-build + uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + key: pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + restore-keys: | + pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + pkl-v1-build- + pkl-v1- + pkl- + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources + - name: "Setup: Java 21" + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + with: + distribution: 'adopt' + java-version: '21' + - name: "Analysis: API Check" + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + continue-on-error: ${{ inputs.ignore_failures }} + env: + CI: true + with: + cache-read-only: true + cache-encryption-key: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + arguments: | + apiCheck + -x test + -PenableAnalysis=true diff --git a/.github/workflows/checks.codeql.yml b/.github/workflows/checks.codeql.yml new file mode 100644 index 000000000..2c979838f --- /dev/null +++ b/.github/workflows/checks.codeql.yml @@ -0,0 +1,95 @@ +name: "CodeQL" + +"on": + workflow_dispatch: {} + workflow_call: + inputs: {} + secrets: + GRADLE_CONFIGURATION_KEY: + description: "Gradle cache key" + required: false + BUILDLESS_APIKEY: + description: "Buildless key" + required: false + + schedule: + - cron: "0 0-23/2 * * *" + + push: + branches: + - main + +permissions: + contents: read + +jobs: + analyze: + name: CodeQL + runs-on: ubuntu-latest + continue-on-error: true + permissions: + actions: read + contents: read + security-events: write + strategy: + fail-fast: false + matrix: + language: ["java-kotlin"] + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + persist-credentials: false + - name: "Setup: Cache Restore (Build)" + id: cache-restore-build + uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + key: pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + restore-keys: | + pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + pkl-v1-build- + pkl-v1- + pkl- + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources + - name: "Setup: Java 21" + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + with: + distribution: 'adopt' + java-version: '21' + - name: "Setup: Initialize CodeQL" + uses: github/codeql-action/init@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3 + with: + config-file: ./.github/codeql/codeql-config.yml + languages: ${{ matrix.language }} + - name: "Analysis: Build" + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + continue-on-error: true + env: + CI: true + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + with: + cache-read-only: true + cache-encryption-key: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + arguments: | + compileKotlin + compileJava + assemble + -x test + -x check + - name: "Analysis: CodeQL" + uses: github/codeql-action/analyze@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3 + continue-on-error: true diff --git a/.github/workflows/checks.dependency-review.yml b/.github/workflows/checks.dependency-review.yml new file mode 100644 index 000000000..7abd41119 --- /dev/null +++ b/.github/workflows/checks.dependency-review.yml @@ -0,0 +1,33 @@ +name: "Dependencies" + +"on": + workflow_dispatch: {} + workflow_call: {} + +permissions: + contents: read + +jobs: + dep-review: + name: "Dependency Review" + runs-on: ubuntu-latest + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + fetch-depth: 0 + persist-credentials: false + - name: "Check: Dependency Review" + uses: actions/dependency-review-action@80f10bf419f34980065523f5efca7ebed17576aa # v4.1.0 + continue-on-error: true + if: github.event_name == 'pull_request' + with: + config-file: "./.github/dependency-review-config.yml" + license-check: true + vulnerability-check: true + fail-on-severity: "low" + base-ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref || 'main' }} diff --git a/.github/workflows/checks.detekt.yml b/.github/workflows/checks.detekt.yml new file mode 100644 index 000000000..3e6b6b6cf --- /dev/null +++ b/.github/workflows/checks.detekt.yml @@ -0,0 +1,73 @@ +name: "Detekt" + +"on": + workflow_dispatch: {} + workflow_call: + inputs: {} + secrets: + GRADLE_CONFIGURATION_KEY: + description: "Gradle cache key" + required: false + BUILDLESS_APIKEY: + description: "Buildless key" + required: false + +permissions: + contents: "read" + +jobs: + sonar: + name: "Detekt" + runs-on: ubuntu-latest + continue-on-error: true + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + fetch-depth: 0 + persist-credentials: false + - name: "Setup: Cache Restore (Build)" + id: cache-restore-build + uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + key: pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + restore-keys: | + pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + pkl-v1-build- + pkl-v1- + pkl- + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources + - name: "Setup: Java 21" + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + with: + distribution: 'adopt' + java-version: '21' + - name: "Setup: Git History" + run: git fetch --unshallow || exit 0 + - name: "Analysis: Detekt" + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + continue-on-error: true + env: + CI: true + with: + cache-read-only: true + cache-encryption-key: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + arguments: detekt detektMergeSarif detektMergeXml -PenableAnalysis=true -PsarifReporting=true + - name: "Report: SARIF Upload" + uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3 + with: + sarif_file: build/reports/detekt/detekt.sarif diff --git a/.github/workflows/checks.formatting.yml b/.github/workflows/checks.formatting.yml new file mode 100644 index 000000000..e109285b3 --- /dev/null +++ b/.github/workflows/checks.formatting.yml @@ -0,0 +1,84 @@ +name: "Formatting" + +"on": + workflow_dispatch: + inputs: + ## Input: Ignore Failures + ignore_failures: + description: "Ignore failures" + required: false + type: boolean + default: false + + workflow_call: + inputs: + ignore_failures: + description: "Ignore failures" + required: false + type: boolean + default: false + + secrets: + GRADLE_CONFIGURATION_KEY: + description: "Gradle cache key" + required: false + BUILDLESS_APIKEY: + description: "Buildless key" + required: false + +permissions: + contents: "read" + +jobs: + fmt-check: + name: "Formatting" + runs-on: ubuntu-latest + continue-on-error: true + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + fetch-depth: 0 + persist-credentials: false + - name: "Setup: Cache Restore (Build)" + id: cache-restore-build + uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + key: pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + restore-keys: | + pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + pkl-v1-build- + pkl-v1- + pkl- + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources + - name: "Setup: Java 21" + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + with: + distribution: 'adopt' + java-version: '21' + - name: "Analysis: Formatting (Spotless)" + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + continue-on-error: ${{ inputs.ignore_failures }} + env: + CI: true + with: + cache-read-only: true + cache-encryption-key: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + arguments: | + spotlessCheck + -PenableAnalysis=true + -x spotlessKotlinGradleCheck diff --git a/.github/workflows/checks.gradle-wrapper.yml b/.github/workflows/checks.gradle-wrapper.yml new file mode 100644 index 000000000..33e9ded32 --- /dev/null +++ b/.github/workflows/checks.gradle-wrapper.yml @@ -0,0 +1,25 @@ +name: "Gradle Wrapper" + +"on": + workflow_dispatch: {} + workflow_call: {} + +permissions: + contents: read + +jobs: + validation: + name: "Gradle Wrapper" + runs-on: ubuntu-latest + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + fetch-depth: 0 + persist-credentials: false + - name: "Check: Gradle Wrapper" + uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1 diff --git a/.github/workflows/checks.scorecards.yml b/.github/workflows/checks.scorecards.yml new file mode 100644 index 000000000..8be190998 --- /dev/null +++ b/.github/workflows/checks.scorecards.yml @@ -0,0 +1,62 @@ +name: "Scorecard" + +"on": + branch_protection_rule: {} + workflow_dispatch: {} + workflow_call: {} + +# Declare default permissions as read-only. +permissions: read-all + +jobs: + analysis: + name: Scorecard analysis + runs-on: ubuntu-latest + permissions: + # Needed to upload the results to code-scanning dashboard. + security-events: write + # Needed to publish results and get a badge (see publish_results below). + id-token: write + contents: read + actions: read + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + persist-credentials: false + - name: "Analysis: Scorecard" + uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 + with: + results_file: results.sarif + results_format: sarif + # (Optional) "write" PAT token. Uncomment the `repo_token` line below if: + # - you want to enable the Branch-Protection check on a *public* repository, or + # - you are installing Scorecards on a *private* repository + # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat. + # repo_token: ${{ secrets.SCORECARD_TOKEN }} + + # Public repositories: + # - Publish results to OpenSSF REST API for easy access by consumers + # - Allows the repository to include the Scorecard badge. + # - See https://github.com/ossf/scorecard-action#publishing-results. + # For private repositories: + # - `publish_results` will always be set to `false`, regardless + # of the value entered here. + publish_results: true + # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF + # format to the repository Actions tab. + - name: "Artifact: Scorecard Analysis" + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 + with: + name: SARIF file + path: results.sarif + retention-days: 5 + # Upload the results to GitHub's code scanning dashboard. + - name: "Artifact: Scorecard SARIF" + uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3 + with: + sarif_file: results.sarif diff --git a/.github/workflows/job.build.yml b/.github/workflows/job.build.yml new file mode 100644 index 000000000..8a2fb4bb2 --- /dev/null +++ b/.github/workflows/job.build.yml @@ -0,0 +1,103 @@ +name: "Build" + +"on": + workflow_dispatch: {} + workflow_call: + inputs: {} + secrets: + GRADLE_CONFIGURATION_KEY: + description: "Gradle cache key" + required: false + BUILDLESS_APIKEY: + description: "Buildless key" + required: false + +permissions: + contents: read + +jobs: + ## + ## Job: Build + ## + gradle: + name: "Build (Ubuntu)" + runs-on: ubuntu-latest + + defaults: + run: + shell: bash + + outputs: + hashes: ${{ steps.hash.outputs.hashes }} + + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + submodules: true + persist-credentials: false + - name: "Setup: Cache Restore (Build)" + id: cache-restore-build + uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + key: pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + restore-keys: | + pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + pkl-v1-build- + pkl-v1- + pkl- + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources + - name: "Setup: Java 21" + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + with: + distribution: 'adopt' + java-version: '21' + - name: "Setup: GraalVM (Java 21)" + uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 + with: + distribution: "graalvm" + java-version: '23' + check-for-updates: false + github-token: ${{ secrets.GITHUB_TOKEN }} + - name: "🛠️ Build" + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + id: gradlebuild + env: + CI: true + with: + cache-read-only: true + cache-encryption-key: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + gradle-home-cache-cleanup: true + arguments: build -x test -x check --scan + build-scan-publish: true + build-scan-terms-of-service-url: "https://gradle.com/terms-of-service" + build-scan-terms-of-service-agree: "yes" + - name: "Artifact: Caches" + uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources diff --git a/.github/workflows/job.dependency-graph.yml b/.github/workflows/job.dependency-graph.yml new file mode 100644 index 000000000..4e3206f07 --- /dev/null +++ b/.github/workflows/job.dependency-graph.yml @@ -0,0 +1,75 @@ +name: "Dependency Graph" + +"on": + workflow_dispatch: {} + workflow_call: + inputs: {} + secrets: + GRADLE_CONFIGURATION_KEY: + description: "Gradle cache key" + required: false + BUILDLESS_APIKEY: + description: "Buildless key" + required: false + +permissions: + contents: read + +jobs: + ## + ## Job: Build+Submit Dependency Graph + ## + gradle: + name: "Dependency Graph" + runs-on: "ubuntu-latest" + + permissions: + ## Needed for submission of dependency graphs + contents: "write" + + defaults: + run: + shell: bash + + outputs: + hashes: ${{ steps.hash.outputs.hashes }} + + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + submodules: true + persist-credentials: false + - name: "Setup: Cache Restore (Build)" + id: cache-restore-build + uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + key: pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + restore-keys: | + pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + pkl-v1-build- + pkl-v1- + pkl- + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources + - name: "Setup: Java 21" + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + with: + distribution: 'adopt' + java-version: '21' + - name: "🛠️ Dependency Graph" + uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + continue-on-error: true diff --git a/.github/workflows/job.native-build.yml b/.github/workflows/job.native-build.yml new file mode 100644 index 000000000..7a3cc9aa1 --- /dev/null +++ b/.github/workflows/job.native-build.yml @@ -0,0 +1,199 @@ +name: "Native Build" + +"on": + workflow_dispatch: + inputs: + release: + type: boolean + default: false + description: "Release build" + macos: + type: boolean + default: true + description: "macOS" + linux: + type: boolean + default: true + description: "Linux" + windows: + type: boolean + default: false + description: "Windows" + artifact: + type: string + default: "" + description: "Artifact prefix" + + workflow_call: + inputs: + release: + type: boolean + default: false + description: "Release build" + macos: + type: boolean + default: true + description: "macOS" + linux: + type: boolean + default: true + description: "Linux" + windows: + type: boolean + default: false + description: "Windows" + artifact: + type: string + default: "" + description: "Artifact prefix" + + secrets: + GRADLE_CONFIGURATION_KEY: + description: "Gradle cache key" + required: false + BUILDLESS_APIKEY: + description: "Buildless key" + required: false + +permissions: + contents: read + +jobs: + ## + ## Job: Build+Submit Dependency Graph + ## + gradle: + strategy: + fail-fast: false + matrix: + os: [Ubuntu] + mode: ["Strict"] + tag: ["linux-amd64-${{ fromJson(inputs.release) && 'opt' || 'dev' }}"] + machine: ["ubuntu-latest"] + target: [":pkl-cli:linuxExecutableAmd64"] + enabled: + - ${{ fromJson(inputs.linux) }} + include: + - os: macOS x64 + tag: macos-x64-${{ fromJson(inputs.release) && 'opt' || 'dev' }} + machine: macos-13 + target: :pkl-cli:macExecutableAmd64 + enabled: ${{ fromJson(inputs.macos) }} + - os: macOS aarch64 + tag: macos-aarch64-${{ fromJson(inputs.release) && 'opt' || 'dev' }} + machine: macos-13-xlarge + target: :pkl-cli:macExecutableAarch64 + enabled: ${{ fromJson(inputs.macos) }} + + # Windows build is currently broken. + # + # - os: Windows + # machine: windows-latest + # target: :pkl-cli:windowsAmd64 + # tag: windows-x64 + + name: "Native CLI (${{ matrix.os }})" + runs-on: ${{ matrix.machine }} + + defaults: + run: + shell: bash + + outputs: + hashes: ${{ steps.hash.outputs.hashes }} + + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + if: ${{ matrix.enabled }} + with: + submodules: true + persist-credentials: false + - name: "Setup: Cache Restore (Build)" + id: cache-restore-build + uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + if: ${{ matrix.enabled }} + with: + key: pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + restore-keys: | + pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + pkl-v1-build- + pkl-v1- + pkl- + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources + - name: "Setup: Java 21" + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + if: ${{ matrix.enabled }} + with: + distribution: 'adopt' + java-version: '21' + - name: "Setup: GraalVM (Java 21)" + uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 + if: ${{ matrix.enabled }} + with: + distribution: "graalvm" + java-version: '23' + check-for-updates: false + github-token: ${{ secrets.GITHUB_TOKEN }} + native-image-job-reports: 'true' + - name: "🛠️ Build" + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + id: gradlebuild + if: ${{ matrix.enabled }} + env: + CI: true + with: + build-scan-publish: true + build-scan-terms-of-service-url: "https://gradle.com/terms-of-service" + build-scan-terms-of-service-agree: "yes" + cache-read-only: true + cache-encryption-key: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + gradle-home-cache-cleanup: true + arguments: | + assemble + build + ${{ matrix.target || ':pkl-cli:assembleNative' }} + -PnativeRelease=${{ inputs.release }} + --scan + -x test + -x check + - name: "Artifact: Native CLI" + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 + if: ${{ matrix.enabled }} + with: + name: "${{ inputs.artifact || 'pkl-cli-latest' }}-${{ matrix.tag }}" + path: ./pkl-cli/build/distributions/pkl*.* + if-no-files-found: warn + retention-days: 14 + compression-level: 1 + overwrite: true + - name: "Artifact: Caches" + uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + if: ${{ matrix.enabled }} + with: + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources diff --git a/.github/workflows/job.tests.yml b/.github/workflows/job.tests.yml new file mode 100644 index 000000000..ac9e53966 --- /dev/null +++ b/.github/workflows/job.tests.yml @@ -0,0 +1,145 @@ +name: "Tests" + +"on": + workflow_dispatch: {} + workflow_call: + inputs: + native: + description: "Native Tests" + default: false + type: boolean + runner: + description: "Runner" + default: "ubuntu-latest" + type: string + + secrets: + GRADLE_CONFIGURATION_KEY: + description: "Gradle cache key" + required: false + CODECOV_TOKEN: + description: "Codecov token" + required: false + BUILDLESS_APIKEY: + description: "Buildless key" + required: false + +permissions: + contents: read + +jobs: + ## + ## Job: Testsuite + ## + gradle: + name: "Testsuite" + runs-on: ${{ inputs.runner || 'ubuntu-latest' }} + + defaults: + run: + shell: bash + + outputs: + hashes: ${{ steps.hash.outputs.hashes }} + + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + submodules: true + persist-credentials: false + - name: "Setup: Cache Restore (Build)" + id: cache-restore-build + uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + key: pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + restore-keys: | + pkl-v1-build-${{ hashFiles('gradle/libs.versions.toml') }} + pkl-v1-build- + pkl-v1- + pkl- + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources + - name: "Setup: Java 21" + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + with: + distribution: 'adopt' + java-version: '21' + - name: "Setup: GraalVM (Java 21)" + uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 + with: + distribution: "graalvm" + java-version: '23' + check-for-updates: false + github-token: ${{ secrets.GITHUB_TOKEN }} + - name: "🛠️ JVM Testsuite" + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + id: gradlebuild + env: + CI: true + with: + cache-read-only: true + cache-encryption-key: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + gradle-home-cache-cleanup: true + build-scan-publish: true + build-scan-terms-of-service-url: "https://gradle.com/terms-of-service" + build-scan-terms-of-service-agree: "yes" + arguments: | + test + koverVerify + koverXmlReport + koverHtmlReport + koverBinaryReport + reports + -x check + --continue + --scan + - name: "Artifact: Test Reports" + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 + if: success() || failure() + with: + name: "pkl-test-reports-${{ github.sha }}" + if-no-files-found: warn + retention-days: 7 + compression-level: 4 + overwrite: true + path: | + ./build/reports + ./pkl-*/build/reports + ./build/reports/* + ./pkl-*/build/reports/* + - name: "Reporting: Coverage" + uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1 + continue-on-error: true + if: success() + with: + token: ${{ secrets.CODECOV_TOKEN }} + slug: elide-dev/pkl + - name: "Artifact: Caches" + uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + with: + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + path: | + .gradle/ + build/ + .codebase/ + .kotlin/ + ./*/build/bin + ./*/build/classes + ./*/build/kotlin + ./*/build/klib + ./*/build/generated + ./*/build/generated-sources diff --git a/.github/workflows/on.pr.yml b/.github/workflows/on.pr.yml new file mode 100644 index 000000000..c3bc6809d --- /dev/null +++ b/.github/workflows/on.pr.yml @@ -0,0 +1,194 @@ +name: "PR" + +# Labels to control this PR flow: +# +# - ci:api-check-bypass - Bypass API check failures. +# - ci:fmt-ignore - Ignore formatting failures. + +"on": + pull_request: + types: [opened, reopened, synchronize] + +permissions: + contents: read + +concurrency: + group: "pr-${{ github.event.pull_request.number }}" + cancel-in-progress: true + +jobs: + ## + ## Job: Pre-flight Checks + ## + preflight-checks: + name: "Pre-flight Checks" + runs-on: ${{ vars.RUNNER_DEFAULT || 'ubuntu-latest' }} + permissions: + contents: "read" + checks: "read" + packages: "read" + steps: + - name: "Setup: Harden Runner" + uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0 + with: + egress-policy: audit + - name: "Setup: Checkout" + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + submodules: true + persist-credentials: false + - name: "Setup: Java 21" + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + with: + distribution: 'adopt' + java-version: '21' + - name: "Setup: GraalVM (Java 21)" + uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 + with: + distribution: "graalvm" + java-version: "23" + github-token: ${{ secrets.GITHUB_TOKEN }} + - name: "Check: Build Compile" + uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 + continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'ci:api-check-bypass') }} + env: + CI: true + GITHUB_ACTOR: ${{ env.GITHUB_ACTOR }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + with: + cache-read-only: false + build-scan-publish: true + build-scan-terms-of-service-url: "https://gradle.com/terms-of-service" + build-scan-terms-of-service-agree: "yes" + cache-encryption-key: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + arguments: | + projects + tasks + --scan + + ## + ## Job: Build + ## + build: + name: "Build" + uses: ./.github/workflows/job.build.yml + needs: [preflight-checks] + secrets: + GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + + ## + ## Job: Native Build + ## + native-build: + name: "Build" + uses: ./.github/workflows/job.native-build.yml + needs: [preflight-checks, build] + secrets: + GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + permissions: + contents: "read" + + ## + ## Job: Tests + ## + pr-tests: + name: "Tests" + uses: ./.github/workflows/job.tests.yml + needs: [preflight-checks, build] + secrets: + GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + + ## + ## Job: Submit Dependency Graph + ## + dependency-graph: + name: "Checks" + uses: ./.github/workflows/job.dependency-graph.yml + needs: [preflight-checks] + secrets: + GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + permissions: + ## Needed for build graph publishing + contents: "write" + + ## + ## Job: API Check + ## + check-api: + name: "Checks" + uses: ./.github/workflows/checks.apicheck.yml + needs: [preflight-checks] + secrets: + GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + permissions: + contents: "read" + + ## + ## Job: Checks for Formatting/Style + ## + check-format: + name: "Checks" + uses: ./.github/workflows/checks.formatting.yml + needs: [preflight-checks] + permissions: + contents: "read" + secrets: + GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + with: + ignore_failures: ${{ contains(github.event.pull_request.labels.*.name, 'ci:fmt-ignore') }} + + ## + ## Job: Check for Wrapper + ## + check-wrapper: + name: "Checks" + uses: ./.github/workflows/checks.gradle-wrapper.yml + needs: [preflight-checks] + permissions: + contents: "read" + + ## + ## Job: Checks for Vulnerabilities/Licensing + ## + check-dependencies: + name: "Checks" + uses: ./.github/workflows/checks.dependency-review.yml + needs: [preflight-checks, dependency-graph] + permissions: + contents: "read" + + ## + ## Job: Checks with CodeQL + ## + check-codeql: + name: "Checks" + uses: ./.github/workflows/checks.codeql.yml + needs: [preflight-checks, dependency-graph] + secrets: + GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + permissions: + actions: "read" + contents: "read" + security-events: "write" + + ## + ## Job: Checks with Detekt + ## + check-detekt: + name: "Checks" + uses: ./.github/workflows/checks.detekt.yml + needs: [preflight-checks] + secrets: + GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + permissions: + contents: "read" + security-events: "write" diff --git a/.github/workflows/on.push.yml b/.github/workflows/on.push.yml new file mode 100644 index 000000000..4689e0622 --- /dev/null +++ b/.github/workflows/on.push.yml @@ -0,0 +1,80 @@ +name: "CI" + +"on": + merge_group: {} + push: + branches: + - main + +permissions: + contents: read + +concurrency: + group: "push-${{ github.sha }}" + +jobs: + ## + ## Job: Build Dependency Graph + ## + build-graph: + name: "Checks" + uses: ./.github/workflows/job.dependency-graph.yml + permissions: + ## Needed for submission of dependency graphs + contents: "write" + + ## + ## Job: Build + ## + build: + name: "Build" + uses: ./.github/workflows/job.build.yml + needs: [preflight-checks] + secrets: + GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + + ## + ## Job: Tests + ## + tests: + name: "Tests" + uses: ./.github/workflows/job.tests.yml + needs: [build] + secrets: + GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} + BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + + ## + ## Job: Checks with Detekt + ## + check-detekt: + name: "Checks" + uses: ./.github/workflows/checks.detekt.yml + needs: [preflight-checks] + permissions: + contents: "read" + security-events: "write" + + ## + ## Job: Checks with Scorecard + ## + check-scorecard: + name: "Checks" + uses: ./.github/workflows/checks.scorecards.yml + needs: [build-graph] + permissions: + actions: "read" + contents: "read" + checks: "read" + deployments: "read" + discussions: "read" + id-token: "write" + issues: "read" + packages: "read" + pages: "read" + pull-requests: "read" + repository-projects: "read" + security-events: "write" + statuses: "read" From 5965f4f4a2dfb2943e9d9ee7e86cdef5daa2f053 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 18:26:38 -0800 Subject: [PATCH 07/40] fixup! ci job tweaks Signed-off-by: Sam Gammon --- .github/workflows/job.tests.yml | 4 ---- .github/workflows/on.pr.yml | 42 --------------------------------- .github/workflows/on.push.yml | 11 --------- 3 files changed, 57 deletions(-) diff --git a/.github/workflows/job.tests.yml b/.github/workflows/job.tests.yml index ac9e53966..fa70049da 100644 --- a/.github/workflows/job.tests.yml +++ b/.github/workflows/job.tests.yml @@ -99,10 +99,6 @@ jobs: build-scan-terms-of-service-agree: "yes" arguments: | test - koverVerify - koverXmlReport - koverHtmlReport - koverBinaryReport reports -x check --continue diff --git a/.github/workflows/on.pr.yml b/.github/workflows/on.pr.yml index c3bc6809d..4a6cc697b 100644 --- a/.github/workflows/on.pr.yml +++ b/.github/workflows/on.pr.yml @@ -116,19 +116,6 @@ jobs: ## Needed for build graph publishing contents: "write" - ## - ## Job: API Check - ## - check-api: - name: "Checks" - uses: ./.github/workflows/checks.apicheck.yml - needs: [preflight-checks] - secrets: - GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} - BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} - permissions: - contents: "read" - ## ## Job: Checks for Formatting/Style ## @@ -163,32 +150,3 @@ jobs: needs: [preflight-checks, dependency-graph] permissions: contents: "read" - - ## - ## Job: Checks with CodeQL - ## - check-codeql: - name: "Checks" - uses: ./.github/workflows/checks.codeql.yml - needs: [preflight-checks, dependency-graph] - secrets: - GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} - BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} - permissions: - actions: "read" - contents: "read" - security-events: "write" - - ## - ## Job: Checks with Detekt - ## - check-detekt: - name: "Checks" - uses: ./.github/workflows/checks.detekt.yml - needs: [preflight-checks] - secrets: - GRADLE_CONFIGURATION_KEY: ${{ secrets.GRADLE_CONFIGURATION_KEY }} - BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} - permissions: - contents: "read" - security-events: "write" diff --git a/.github/workflows/on.push.yml b/.github/workflows/on.push.yml index 4689e0622..06d77f061 100644 --- a/.github/workflows/on.push.yml +++ b/.github/workflows/on.push.yml @@ -46,17 +46,6 @@ jobs: BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - ## - ## Job: Checks with Detekt - ## - check-detekt: - name: "Checks" - uses: ./.github/workflows/checks.detekt.yml - needs: [preflight-checks] - permissions: - contents: "read" - security-events: "write" - ## ## Job: Checks with Scorecard ## From ac54cdde67c847b126f0eeb6b234ce78317b318a Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 18:32:13 -0800 Subject: [PATCH 08/40] fixup! drop `reports` task which is not configured Signed-off-by: Sam Gammon --- .github/workflows/job.tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/job.tests.yml b/.github/workflows/job.tests.yml index fa70049da..43621aab5 100644 --- a/.github/workflows/job.tests.yml +++ b/.github/workflows/job.tests.yml @@ -99,7 +99,6 @@ jobs: build-scan-terms-of-service-agree: "yes" arguments: | test - reports -x check --continue --scan From 7698b94c98875285e6ea3d60f0f11334e8c7e2c1 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:09:21 -0800 Subject: [PATCH 09/40] fixup! graalvm bump to `24.1.1` Signed-off-by: Sam Gammon --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6a17cff38..04fcaf3f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ geantyref = "1.+" googleJavaFormat = "1.21.0" # must not use `+` because used in download URL # 23.1.x requires JDK 20+ -graalVm = "24.1.0" +graalVm = "24.1.1" graalVmJdkVersion = "23.0.1" # slightly hacky but convenient place so we remember to update the checksum graalVmSha256-macos-x64 = "bad" From 6e72f4f29b7ca2f10fc6ed52356432a004872a08 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:09:33 -0800 Subject: [PATCH 10/40] fixup! update lockfiles Signed-off-by: Sam Gammon --- bench/gradle.lockfile | 19 ++++++++++------ pkl-cli/gradle.lockfile | 45 +++++++++++++++++++++++++------------- pkl-core/gradle.lockfile | 20 +++++++++++------ pkl-server/gradle.lockfile | 15 ++++++++----- 4 files changed, 65 insertions(+), 34 deletions(-) diff --git a/bench/gradle.lockfile b/bench/gradle.lockfile index a670b9551..75973dd43 100644 --- a/bench/gradle.lockfile +++ b/bench/gradle.lockfile @@ -8,14 +8,19 @@ net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhImplementationDe org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.compiler:compiler:24.1.0=graal -org.graalvm.polyglot:polyglot:24.1.0=jmh,jmhRuntimeClasspath,truffle -org.graalvm.sdk:collections:24.1.0=graal,jmh,jmhRuntimeClasspath,truffle +org.graalvm.compiler:compiler:24.1.1=graal +org.graalvm.polyglot:polyglot:24.1.0=jmh,jmhRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=truffle +org.graalvm.sdk:collections:24.1.0=jmh,jmhRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=graal,truffle org.graalvm.sdk:graal-sdk:24.1.0=jmh,jmhRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=jmh,jmhRuntimeClasspath,truffle -org.graalvm.sdk:word:24.1.0=graal,jmh,jmhRuntimeClasspath,truffle -org.graalvm.truffle:truffle-api:24.1.0=jmh,jmhRuntimeClasspath,truffle -org.graalvm.truffle:truffle-compiler:24.1.0=graal +org.graalvm.sdk:nativeimage:24.1.0=jmh,jmhRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=truffle +org.graalvm.sdk:word:24.1.0=jmh,jmhRuntimeClasspath +org.graalvm.sdk:word:24.1.1=graal,truffle +org.graalvm.truffle:truffle-api:24.1.0=jmh,jmhRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=truffle +org.graalvm.truffle:truffle-compiler:24.1.1=graal org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-cli/gradle.lockfile b/pkl-cli/gradle.lockfile index 84ed0bc2d..9e8ae06ba 100644 --- a/pkl-cli/gradle.lockfile +++ b/pkl-cli/gradle.lockfile @@ -55,21 +55,36 @@ org.eclipse.jetty:jetty-util:11.0.24=testCompileClasspath,testImplementationDepe org.eclipse.jetty:jetty-webapp:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.eclipse.jetty:jetty-xml:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.fusesource.jansi:jansi:2.4.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.compiler:compiler:24.1.0=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.nativeimage:native-image-base:24.1.0=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.nativeimage:objectfile:24.1.0=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.nativeimage:pointsto:24.1.0=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.nativeimage:svm:24.1.0=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.nativeimage:truffle-runtime-svm:24.1.0=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.polyglot:polyglot:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:jniutils:24.1.0=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.sdk:nativeimage:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-compiler:24.1.0=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.truffle:truffle-runtime:24.1.0=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.compiler:compiler:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.compiler:compiler:24.1.1=compileClasspath +org.graalvm.nativeimage:native-image-base:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.nativeimage:native-image-base:24.1.1=compileClasspath +org.graalvm.nativeimage:objectfile:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.nativeimage:objectfile:24.1.1=compileClasspath +org.graalvm.nativeimage:pointsto:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.nativeimage:pointsto:24.1.1=compileClasspath +org.graalvm.nativeimage:svm:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.nativeimage:svm:24.1.1=compileClasspath +org.graalvm.nativeimage:truffle-runtime-svm:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.nativeimage:truffle-runtime-svm:24.1.1=compileClasspath +org.graalvm.polyglot:polyglot:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.sdk:collections:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.sdk:jniutils:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.sdk:jniutils:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.sdk:word:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.truffle:truffle-compiler:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.truffle:truffle-compiler:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.truffle:truffle-runtime:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.truffle:truffle-runtime:24.1.1=compileClasspath,runtimeClasspath org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-core/gradle.lockfile b/pkl-core/gradle.lockfile index 26eccb36f..b5dcec964 100644 --- a/pkl-core/gradle.lockfile +++ b/pkl-core/gradle.lockfile @@ -13,13 +13,19 @@ org.antlr:ST4:4.3=antlr org.antlr:antlr-runtime:3.5.2=antlr org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-dsl-processor:24.1.0=annotationProcessor +org.graalvm.polyglot:polyglot:24.1.0=generatorImplementationDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath +org.graalvm.sdk:collections:24.1.0=generatorImplementationDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=compileClasspath +org.graalvm.sdk:nativeimage:24.1.0=generatorImplementationDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath +org.graalvm.sdk:word:24.1.0=generatorImplementationDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.0=generatorImplementationDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath +org.graalvm.truffle:truffle-dsl-processor:24.1.1=annotationProcessor org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-server/gradle.lockfile b/pkl-server/gradle.lockfile index 718edb107..8f2022fd6 100644 --- a/pkl-server/gradle.lockfile +++ b/pkl-server/gradle.lockfile @@ -6,12 +6,17 @@ net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependen net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=compileClasspath +org.graalvm.sdk:collections:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=compileClasspath org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=compileClasspath +org.graalvm.sdk:word:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=compileClasspath +org.graalvm.truffle:truffle-api:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=compileClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath From e6e32f7c3ded9ae946013fc1dc14dfe01c2f2e36 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:09:46 -0800 Subject: [PATCH 11/40] fixup! truffle runtime dep, initial hashes for gvm Signed-off-by: Sam Gammon --- gradle/libs.versions.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 04fcaf3f7..c717846d5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ graalVm = "24.1.1" graalVmJdkVersion = "23.0.1" # slightly hacky but convenient place so we remember to update the checksum graalVmSha256-macos-x64 = "bad" -graalVmSha256-macos-aarch64 = "bad" +graalVmSha256-macos-aarch64 = "c00a7a62ce453aa026bff65e5a18c63464f725c01e5a71771856226928ba5b0f" graalVmSha256-linux-x64 = "46ec9582ebe114f93470403f2cc123238ac0c7982129c358af7d8e1de52dd663" graalVmSha256-linux-aarch64 = "bad" graalVmSha256-windows-x64 = "bad" @@ -97,6 +97,7 @@ svm = { group = "org.graalvm.nativeimage", name = "svm", version.ref = "graalVm" truffleApi = { group = "org.graalvm.truffle", name = "truffle-api", version.ref = "graalVm" } truffleDslProcessor = { group = "org.graalvm.truffle", name = "truffle-dsl-processor", version.ref = "graalVm" } truffleSvm = { group = "org.graalvm.nativeimage", name = "truffle-runtime-svm", version.ref = "graalVm" } +truffleRuntime = { group = "org.graalvm.truffle", name = "truffle-runtime", version.ref = "graalVm" } wiremock = { group = "org.wiremock", name = "wiremock", version.ref = "wiremock" } [plugins] # ordered alphabetically From cc07425012ec0df9bf9a0d2ff3aae6d7f7f54b1f Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:14:44 -0800 Subject: [PATCH 12/40] fixup! fmt Signed-off-by: Sam Gammon --- pkl-cli/pkl-cli.gradle.kts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkl-cli/pkl-cli.gradle.kts b/pkl-cli/pkl-cli.gradle.kts index c7a7af41e..cfa3c5eaa 100644 --- a/pkl-cli/pkl-cli.gradle.kts +++ b/pkl-cli/pkl-cli.gradle.kts @@ -182,8 +182,7 @@ fun Exec.configureExecutable( executable = "${graalVm.baseDir}/bin/$nativeImageCommandName" // JARs to exclude from the class path for the native-image build. - val exclusions = - listOf(libs.truffleApi, libs.graalSdk, libs.truffleSvm).map { it.get().module.name } + val exclusions = listOf(libs.graalSdk).map { it.get().module.name } // https://www.graalvm.org/22.0/reference-manual/native-image/Options/ argumentProviders.add( CommandLineArgumentProvider { From bae1a8753092d84ddbb12d379a54c36cda36140f Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:19:14 -0800 Subject: [PATCH 13/40] fixup! don't relocate truffle/gvm sdk classes in uber jars Signed-off-by: Sam Gammon --- buildSrc/src/main/kotlin/pklFatJar.gradle.kts | 8 +++++--- pkl-cli/pkl-cli.gradle.kts | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/pklFatJar.gradle.kts b/buildSrc/src/main/kotlin/pklFatJar.gradle.kts index eab13c7ab..421845c0f 100644 --- a/buildSrc/src/main/kotlin/pklFatJar.gradle.kts +++ b/buildSrc/src/main/kotlin/pklFatJar.gradle.kts @@ -40,8 +40,6 @@ val relocations = mapOf( // pkl-core dependencies "org.antlr.v4." to "org.pkl.thirdparty.antlr.v4.", - "com.oracle.truffle" to "org.pkl.thirdparty.truffle", - "org.graalvm." to "org.pkl.thirdparty.graalvm.", "org.organicdesign.fp." to "org.pkl.thirdparty.paguro.", "org.snakeyaml.engine." to "org.pkl.thirdparty.snakeyaml.engine.", "org.msgpack." to "org.pkl.thirdparty.msgpack.", @@ -71,7 +69,11 @@ val relocations = "com.squareup.kotlinpoet." to "org.pkl.thirdparty.kotlinpoet.", ) -val nonRelocations = listOf("com/oracle/truffle/") +val nonRelocations = + listOf( + "com/oracle/truffle/", + "org/graalvm/", + ) tasks.shadowJar { inputs.property("relocations", relocations) diff --git a/pkl-cli/pkl-cli.gradle.kts b/pkl-cli/pkl-cli.gradle.kts index cfa3c5eaa..236a35342 100644 --- a/pkl-cli/pkl-cli.gradle.kts +++ b/pkl-cli/pkl-cli.gradle.kts @@ -51,6 +51,7 @@ val stagedWindowsAmd64Executable: Configuration by configurations.creating dependencies { compileOnly(libs.svm) compileOnly(libs.truffleSvm) + compileOnly(libs.truffleRuntime) // CliEvaluator exposes PClass api(projects.pklCore) From 941f69579fa1d2882e1103870e76993d0b06be2b Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:19:43 -0800 Subject: [PATCH 14/40] fix: warnings for gvm flag usage, renamed truffle svm macro Signed-off-by: Sam Gammon --- pkl-cli/pkl-cli.gradle.kts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkl-cli/pkl-cli.gradle.kts b/pkl-cli/pkl-cli.gradle.kts index 236a35342..ef689adb9 100644 --- a/pkl-cli/pkl-cli.gradle.kts +++ b/pkl-cli/pkl-cli.gradle.kts @@ -194,13 +194,16 @@ fun Exec.configureExecutable( // needed for messagepack-java (see https://github.com/msgpack/msgpack-java/issues/600) add("--initialize-at-run-time=org.msgpack.core.buffer.DirectBufferAccess") add("--no-fallback") + // must be emitted before any experimental options are used + add("-H:+UnlockExperimentalVMOptions") add("-H:IncludeResources=org/pkl/core/stdlib/.*\\.pkl") add("-H:IncludeResources=org/jline/utils/.*") add("-H:IncludeResourceBundles=org.pkl.core.errorMessages") add("-H:IncludeResources=org/pkl/commons/cli/PklCARoots.pem") - add("--macro:truffle") + add("--macro:truffle-svm") add("-H:Class=org.pkl.cli.Main") - add("-H:Name=${outputFile.get().asFile.name}") + add("-o") + add(outputFile.get().asFile.name) // the actual limit (currently) used by native-image is this number + 1400 (idea is to // compensate for Truffle's own nodes) add("-H:MaxRuntimeCompileMethods=1800") From d34e13f0de60a1ed6fae7aae9ed6f83f7b9183de Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:20:12 -0800 Subject: [PATCH 15/40] feat: flag support for gvm, native arch, use new `-Os` optimization mode Signed-off-by: Sam Gammon --- buildSrc/src/main/kotlin/BuildInfo.kt | 4 ++++ pkl-cli/pkl-cli.gradle.kts | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/BuildInfo.kt b/buildSrc/src/main/kotlin/BuildInfo.kt index df44e3902..da37b39f9 100644 --- a/buildSrc/src/main/kotlin/BuildInfo.kt +++ b/buildSrc/src/main/kotlin/BuildInfo.kt @@ -80,6 +80,10 @@ open class BuildInfo(project: Project) { val isReleaseBuild: Boolean by lazy { java.lang.Boolean.getBoolean("releaseBuild") } + val isNativeArch: Boolean by lazy { java.lang.Boolean.getBoolean("nativeArch") } + + val isEnableOracleGraalvm: Boolean by lazy { java.lang.Boolean.getBoolean("oracleGraalvm") } + val hasMuslToolchain: Boolean by lazy { // see "install musl" in .circleci/jobs/BuildNativeJob.pkl File(System.getProperty("user.home"), "staticdeps/bin/x86_64-linux-musl-gcc").exists() diff --git a/pkl-cli/pkl-cli.gradle.kts b/pkl-cli/pkl-cli.gradle.kts index ef689adb9..112b2735a 100644 --- a/pkl-cli/pkl-cli.gradle.kts +++ b/pkl-cli/pkl-cli.gradle.kts @@ -217,8 +217,20 @@ fun Exec.configureExecutable( // executable if (!buildInfo.isReleaseBuild) { add("-Ob") + } else { + add("-Os") + } + if (buildInfo.isNativeArch) { + add("-march=native") + } else { + add("-march=compatibility") + } + if (buildInfo.isEnableOracleGraalvm) { + add("--gc=G1") + add("--enable-sbom=cyclonedx") + } else { + add("--gc=serial") } - add("-march=compatibility") // native-image rejects non-existing class path entries -> filter add("--class-path") val pathInput = From c046b72fb17aaad5ec5ffae2bf1dc5472f1a7f80 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:24:32 -0800 Subject: [PATCH 16/40] fixup! relock Signed-off-by: Sam Gammon --- bench/gradle.lockfile | 17 +++++-------- docs/gradle.lockfile | 12 ++++----- pkl-cli/gradle.lockfile | 40 +++++++++++------------------- pkl-codegen-java/gradle.lockfile | 12 ++++----- pkl-codegen-kotlin/gradle.lockfile | 12 ++++----- pkl-commons-cli/gradle.lockfile | 12 ++++----- pkl-config-java/gradle.lockfile | 12 ++++----- pkl-config-kotlin/gradle.lockfile | 12 ++++----- pkl-core/gradle.lockfile | 18 +++++--------- pkl-doc/gradle.lockfile | 26 +++++++++---------- pkl-executor/gradle.lockfile | 30 +++++++++++----------- pkl-server/gradle.lockfile | 17 +++++-------- pkl-tools/gradle.lockfile | 12 ++++----- 13 files changed, 102 insertions(+), 130 deletions(-) diff --git a/bench/gradle.lockfile b/bench/gradle.lockfile index 75973dd43..269a12b4b 100644 --- a/bench/gradle.lockfile +++ b/bench/gradle.lockfile @@ -9,17 +9,12 @@ org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhImplementation org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.graalvm.compiler:compiler:24.1.1=graal -org.graalvm.polyglot:polyglot:24.1.0=jmh,jmhRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.1=truffle -org.graalvm.sdk:collections:24.1.0=jmh,jmhRuntimeClasspath -org.graalvm.sdk:collections:24.1.1=graal,truffle -org.graalvm.sdk:graal-sdk:24.1.0=jmh,jmhRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=jmh,jmhRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.1=truffle -org.graalvm.sdk:word:24.1.0=jmh,jmhRuntimeClasspath -org.graalvm.sdk:word:24.1.1=graal,truffle -org.graalvm.truffle:truffle-api:24.1.0=jmh,jmhRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.1=truffle +org.graalvm.polyglot:polyglot:24.1.1=jmh,jmhRuntimeClasspath,truffle +org.graalvm.sdk:collections:24.1.1=graal,jmh,jmhRuntimeClasspath,truffle +org.graalvm.sdk:graal-sdk:24.1.1=jmh,jmhRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=jmh,jmhRuntimeClasspath,truffle +org.graalvm.sdk:word:24.1.1=graal,jmh,jmhRuntimeClasspath,truffle +org.graalvm.truffle:truffle-api:24.1.1=jmh,jmhRuntimeClasspath,truffle org.graalvm.truffle:truffle-compiler:24.1.1=graal org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/docs/gradle.lockfile b/docs/gradle.lockfile index cad80b1a9..185feccbd 100644 --- a/docs/gradle.lockfile +++ b/docs/gradle.lockfile @@ -7,12 +7,12 @@ net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependen net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-cli/gradle.lockfile b/pkl-cli/gradle.lockfile index 9e8ae06ba..11896ae64 100644 --- a/pkl-cli/gradle.lockfile +++ b/pkl-cli/gradle.lockfile @@ -55,36 +55,24 @@ org.eclipse.jetty:jetty-util:11.0.24=testCompileClasspath,testImplementationDepe org.eclipse.jetty:jetty-webapp:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.eclipse.jetty:jetty-xml:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.fusesource.jansi:jansi:2.4.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.compiler:compiler:24.1.0=compileOnlyDependenciesMetadata -org.graalvm.compiler:compiler:24.1.1=compileClasspath -org.graalvm.nativeimage:native-image-base:24.1.0=compileOnlyDependenciesMetadata -org.graalvm.nativeimage:native-image-base:24.1.1=compileClasspath -org.graalvm.nativeimage:objectfile:24.1.0=compileOnlyDependenciesMetadata -org.graalvm.nativeimage:objectfile:24.1.1=compileClasspath -org.graalvm.nativeimage:pointsto:24.1.0=compileOnlyDependenciesMetadata -org.graalvm.nativeimage:pointsto:24.1.1=compileClasspath -org.graalvm.nativeimage:svm:24.1.0=compileOnlyDependenciesMetadata -org.graalvm.nativeimage:svm:24.1.1=compileClasspath -org.graalvm.nativeimage:truffle-runtime-svm:24.1.0=compileOnlyDependenciesMetadata -org.graalvm.nativeimage:truffle-runtime-svm:24.1.1=compileClasspath -org.graalvm.polyglot:polyglot:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,runtimeClasspath -org.graalvm.sdk:collections:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.1=compileClasspath,runtimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.1=compileClasspath,runtimeClasspath -org.graalvm.sdk:jniutils:24.1.0=compileOnlyDependenciesMetadata -org.graalvm.sdk:jniutils:24.1.1=compileClasspath,runtimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,runtimeClasspath -org.graalvm.sdk:word:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:word:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.compiler:compiler:24.1.1=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.nativeimage:native-image-base:24.1.1=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.nativeimage:objectfile:24.1.1=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.nativeimage:pointsto:24.1.1=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.nativeimage:svm:24.1.1=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.nativeimage:truffle-runtime-svm:24.1.1=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:jniutils:24.1.1=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath org.graalvm.truffle:truffle-api:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,runtimeClasspath org.graalvm.truffle:truffle-compiler:24.1.0=compileOnlyDependenciesMetadata -org.graalvm.truffle:truffle-compiler:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.truffle:truffle-compiler:24.1.1=compileClasspath org.graalvm.truffle:truffle-runtime:24.1.0=compileOnlyDependenciesMetadata -org.graalvm.truffle:truffle-runtime:24.1.1=compileClasspath,runtimeClasspath +org.graalvm.truffle:truffle-runtime:24.1.1=compileClasspath org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-codegen-java/gradle.lockfile b/pkl-codegen-java/gradle.lockfile index 863a2f508..f204b8108 100644 --- a/pkl-codegen-java/gradle.lockfile +++ b/pkl-codegen-java/gradle.lockfile @@ -10,12 +10,12 @@ net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependen net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-codegen-kotlin/gradle.lockfile b/pkl-codegen-kotlin/gradle.lockfile index 42bdb9d8b..c118c12d1 100644 --- a/pkl-codegen-kotlin/gradle.lockfile +++ b/pkl-codegen-kotlin/gradle.lockfile @@ -10,12 +10,12 @@ net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependen net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata diff --git a/pkl-commons-cli/gradle.lockfile b/pkl-commons-cli/gradle.lockfile index ddcc6e448..6c74b1201 100644 --- a/pkl-commons-cli/gradle.lockfile +++ b/pkl-commons-cli/gradle.lockfile @@ -8,12 +8,12 @@ net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependen net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-config-java/gradle.lockfile b/pkl-config-java/gradle.lockfile index 8beb489f3..2857844f5 100644 --- a/pkl-config-java/gradle.lockfile +++ b/pkl-config-java/gradle.lockfile @@ -11,12 +11,12 @@ net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependen net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-config-kotlin/gradle.lockfile b/pkl-config-kotlin/gradle.lockfile index b1eaded21..86ab32337 100644 --- a/pkl-config-kotlin/gradle.lockfile +++ b/pkl-config-kotlin/gradle.lockfile @@ -10,12 +10,12 @@ net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependen net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-core/gradle.lockfile b/pkl-core/gradle.lockfile index b5dcec964..95b6b4a78 100644 --- a/pkl-core/gradle.lockfile +++ b/pkl-core/gradle.lockfile @@ -13,18 +13,12 @@ org.antlr:ST4:4.3=antlr org.antlr:antlr-runtime:3.5.2=antlr org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=generatorImplementationDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=generatorImplementationDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.1=compileClasspath -org.graalvm.sdk:nativeimage:24.1.0=generatorImplementationDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath -org.graalvm.sdk:word:24.1.0=generatorImplementationDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:word:24.1.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=generatorImplementationDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.graalvm.truffle:truffle-dsl-processor:24.1.1=annotationProcessor org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-doc/gradle.lockfile b/pkl-doc/gradle.lockfile index 2c18f7836..d0986bd0b 100644 --- a/pkl-doc/gradle.lockfile +++ b/pkl-doc/gradle.lockfile @@ -37,19 +37,19 @@ org.commonmark:commonmark-ext-gfm-tables:0.24.0=compileClasspath,implementationD org.commonmark:commonmark:0.24.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.eclipse.jetty:jetty-util-ajax:9.4.18.v20190429=validator org.eclipse.jetty:jetty-util:9.4.18.v20190429=validator -org.graalvm.js:js-community:24.1.0=testRuntimeClasspath -org.graalvm.js:js-language:24.1.0=testRuntimeClasspath -org.graalvm.js:js:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.regex:regex:24.1.0=testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:jniutils:24.1.0=testRuntimeClasspath -org.graalvm.sdk:nativebridge:24.1.0=testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.shadowed:icu4j:24.1.0=testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.js:js-community:24.1.1=testRuntimeClasspath +org.graalvm.js:js-language:24.1.1=testRuntimeClasspath +org.graalvm.js:js:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.regex:regex:24.1.1=testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:jniutils:24.1.1=testRuntimeClasspath +org.graalvm.sdk:nativebridge:24.1.1=testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.shadowed:icu4j:24.1.1=testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=runtimeClasspath,testRuntimeClasspath org.graalvm.truffle:truffle-compiler:24.1.0=testRuntimeClasspath org.graalvm.truffle:truffle-enterprise:24.1.0=testRuntimeClasspath org.graalvm.truffle:truffle-runtime:24.1.0=testRuntimeClasspath diff --git a/pkl-executor/gradle.lockfile b/pkl-executor/gradle.lockfile index 86d316f2b..303f2e565 100644 --- a/pkl-executor/gradle.lockfile +++ b/pkl-executor/gradle.lockfile @@ -6,21 +6,21 @@ net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependen net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.compiler:compiler:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.nativeimage:native-image-base:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.nativeimage:objectfile:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.nativeimage:pointsto:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.nativeimage:svm:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.nativeimage:truffle-runtime-svm:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:jniutils:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-compiler:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-runtime:24.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.compiler:compiler:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.nativeimage:native-image-base:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.nativeimage:objectfile:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.nativeimage:pointsto:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.nativeimage:svm:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.nativeimage:truffle-runtime-svm:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:jniutils:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-compiler:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-runtime:24.1.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-server/gradle.lockfile b/pkl-server/gradle.lockfile index 8f2022fd6..df1a61809 100644 --- a/pkl-server/gradle.lockfile +++ b/pkl-server/gradle.lockfile @@ -6,17 +6,12 @@ net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testImplementationDependen net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata org.assertj:assertj-core:3.27.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.1=compileClasspath -org.graalvm.sdk:collections:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.1=compileClasspath -org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.1=compileClasspath -org.graalvm.sdk:word:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.sdk:word:24.1.1=compileClasspath -org.graalvm.truffle:truffle-api:24.1.0=implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.1=compileClasspath +org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath diff --git a/pkl-tools/gradle.lockfile b/pkl-tools/gradle.lockfile index d0f973db2..1e07ef265 100644 --- a/pkl-tools/gradle.lockfile +++ b/pkl-tools/gradle.lockfile @@ -10,12 +10,12 @@ io.leangen.geantyref:geantyref:1.3.16=runtimeClasspath,testRuntimeClasspath org.commonmark:commonmark-ext-gfm-tables:0.24.0=runtimeClasspath,testRuntimeClasspath org.commonmark:commonmark:0.24.0=runtimeClasspath,testRuntimeClasspath org.fusesource.jansi:jansi:2.4.1=runtimeClasspath,testRuntimeClasspath -org.graalvm.polyglot:polyglot:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:graal-sdk:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:nativeimage:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:word:24.1.0=runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=runtimeClasspath,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:graal-sdk:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:nativeimage:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.7.10=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath From 7a1ae8ecfcf2e5368b17b7b223cf5d42c9be5dfe Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:30:43 -0800 Subject: [PATCH 17/40] fixup! lockfile fixes Signed-off-by: Sam Gammon --- pkl-cli/gradle.lockfile | 6 +++--- pkl-doc/gradle.lockfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkl-cli/gradle.lockfile b/pkl-cli/gradle.lockfile index 11896ae64..b09a2a2ab 100644 --- a/pkl-cli/gradle.lockfile +++ b/pkl-cli/gradle.lockfile @@ -67,11 +67,11 @@ org.graalvm.sdk:graal-sdk:24.1.1=compileClasspath,compileOnlyDependenciesMetadat org.graalvm.sdk:jniutils:24.1.1=compileClasspath,compileOnlyDependenciesMetadata org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath org.graalvm.sdk:word:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.0=compileOnlyDependenciesMetadata,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=compileOnlyDependenciesMetadata,testRuntimeClasspath org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,runtimeClasspath -org.graalvm.truffle:truffle-compiler:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.truffle:truffle-compiler:24.1.1=compileOnlyDependenciesMetadata org.graalvm.truffle:truffle-compiler:24.1.1=compileClasspath -org.graalvm.truffle:truffle-runtime:24.1.0=compileOnlyDependenciesMetadata +org.graalvm.truffle:truffle-runtime:24.1.1=compileOnlyDependenciesMetadata org.graalvm.truffle:truffle-runtime:24.1.1=compileClasspath org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/pkl-doc/gradle.lockfile b/pkl-doc/gradle.lockfile index d0986bd0b..795111fb5 100644 --- a/pkl-doc/gradle.lockfile +++ b/pkl-doc/gradle.lockfile @@ -50,9 +50,9 @@ org.graalvm.sdk:nativeimage:24.1.1=runtimeClasspath,testCompileClasspath,testImp org.graalvm.sdk:word:24.1.1=runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.graalvm.shadowed:icu4j:24.1.1=testRuntimeClasspath org.graalvm.truffle:truffle-api:24.1.1=runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-compiler:24.1.0=testRuntimeClasspath -org.graalvm.truffle:truffle-enterprise:24.1.0=testRuntimeClasspath -org.graalvm.truffle:truffle-runtime:24.1.0=testRuntimeClasspath +org.graalvm.truffle:truffle-compiler:24.1.1=testRuntimeClasspath +org.graalvm.truffle:truffle-enterprise:24.1.1=testRuntimeClasspath +org.graalvm.truffle:truffle-runtime:24.1.1=testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath From 48e380e332c8f83687128674335cd7deb2535a49 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:30:54 -0800 Subject: [PATCH 18/40] fixup! cli tests Signed-off-by: Sam Gammon --- pkl-cli/pkl-cli.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkl-cli/pkl-cli.gradle.kts b/pkl-cli/pkl-cli.gradle.kts index 112b2735a..fc8b190cf 100644 --- a/pkl-cli/pkl-cli.gradle.kts +++ b/pkl-cli/pkl-cli.gradle.kts @@ -111,12 +111,18 @@ val javaExecutable by inJar.set(tasks.shadowJar.flatMap { it.archiveFile }) outJar.set(layout.buildDirectory.file("executable/jpkl")) + jvmArgs.addAll("--add-modules=jdk.unsupported") + // uncomment for debugging // jvmArgs.addAll("-ea", "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005") } val testJavaExecutable by tasks.registering(Test::class) { + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.GRAAL_VM + } testClassesDirs = tasks.test.get().testClassesDirs classpath = // compiled test classes From 970a3556ee649422c329781e4d1d489d2178d942 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:31:03 -0800 Subject: [PATCH 19/40] feat: initial transitive native image flag support Signed-off-by: Sam Gammon --- .../META-INF/native-image/org.pkl-lang/native-image.properties | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 pkl-core/src/main/resources/META-INF/native-image/org.pkl-lang/native-image.properties diff --git a/pkl-core/src/main/resources/META-INF/native-image/org.pkl-lang/native-image.properties b/pkl-core/src/main/resources/META-INF/native-image/org.pkl-lang/native-image.properties new file mode 100644 index 000000000..3693f9b41 --- /dev/null +++ b/pkl-core/src/main/resources/META-INF/native-image/org.pkl-lang/native-image.properties @@ -0,0 +1,2 @@ + +Args = --initialize-at-build-time=org.pkl.core From b7bee78633c5466e7fc881b6148d8a5a0335c072 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:32:28 -0800 Subject: [PATCH 20/40] fixup! fmt Signed-off-by: Sam Gammon --- pkl-cli/pkl-cli.gradle.kts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkl-cli/pkl-cli.gradle.kts b/pkl-cli/pkl-cli.gradle.kts index fc8b190cf..4dc7c961a 100644 --- a/pkl-cli/pkl-cli.gradle.kts +++ b/pkl-cli/pkl-cli.gradle.kts @@ -119,10 +119,11 @@ val javaExecutable by val testJavaExecutable by tasks.registering(Test::class) { - javaLauncher = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(21) - vendor = JvmVendorSpec.GRAAL_VM - } + javaLauncher = + javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.GRAAL_VM + } testClassesDirs = tasks.test.get().testClassesDirs classpath = // compiled test classes From 75271355fd0a6d9f3a54edc9d1eb170d091b0dcf Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 19:35:02 -0800 Subject: [PATCH 21/40] fixup! proper hashes for gvm downloads Signed-off-by: Sam Gammon --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c717846d5..4a3d9658d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,11 +12,11 @@ googleJavaFormat = "1.21.0" graalVm = "24.1.1" graalVmJdkVersion = "23.0.1" # slightly hacky but convenient place so we remember to update the checksum -graalVmSha256-macos-x64 = "bad" +graalVmSha256-macos-x64 = "539699d8ff4979623bc7bdf8282ac6f76cd2560f47d14ec5438bada24f136f96" graalVmSha256-macos-aarch64 = "c00a7a62ce453aa026bff65e5a18c63464f725c01e5a71771856226928ba5b0f" graalVmSha256-linux-x64 = "46ec9582ebe114f93470403f2cc123238ac0c7982129c358af7d8e1de52dd663" -graalVmSha256-linux-aarch64 = "bad" -graalVmSha256-windows-x64 = "bad" +graalVmSha256-linux-aarch64 = "1835a98b87c439c8c654d97956c22d409855952e5560a8127f56c50f3f919d7d" +graalVmSha256-windows-x64 = "e758646504cfaf23cf218a22691ad70491f3196448a77d03d78e50dff2145533" ideaExtPlugin = "1.1.9" javaPoet = "0.+" javaxInject = "1" From f1008341fa0509e1a58479c7307eb2481d1b3ef1 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 20:03:21 -0800 Subject: [PATCH 22/40] fixup! truffle runtime dependency Signed-off-by: Sam Gammon --- pkl-cli/pkl-cli.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkl-cli/pkl-cli.gradle.kts b/pkl-cli/pkl-cli.gradle.kts index 4dc7c961a..199045274 100644 --- a/pkl-cli/pkl-cli.gradle.kts +++ b/pkl-cli/pkl-cli.gradle.kts @@ -51,7 +51,7 @@ val stagedWindowsAmd64Executable: Configuration by configurations.creating dependencies { compileOnly(libs.svm) compileOnly(libs.truffleSvm) - compileOnly(libs.truffleRuntime) + implementation(libs.truffleRuntime) // CliEvaluator exposes PClass api(projects.pklCore) From a70c018e57cdf29821dd1c58a5a9bbd1de3d66ca Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 20:04:33 -0800 Subject: [PATCH 23/40] fixup! lockfiles Signed-off-by: Sam Gammon --- pkl-cli/gradle.lockfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkl-cli/gradle.lockfile b/pkl-cli/gradle.lockfile index b09a2a2ab..dfcfe6372 100644 --- a/pkl-cli/gradle.lockfile +++ b/pkl-cli/gradle.lockfile @@ -64,15 +64,12 @@ org.graalvm.nativeimage:truffle-runtime-svm:24.1.1=compileClasspath,compileOnlyD org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath org.graalvm.sdk:collections:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath org.graalvm.sdk:graal-sdk:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:jniutils:24.1.1=compileClasspath,compileOnlyDependenciesMetadata +org.graalvm.sdk:jniutils:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath org.graalvm.sdk:word:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.1=compileOnlyDependenciesMetadata,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,runtimeClasspath -org.graalvm.truffle:truffle-compiler:24.1.1=compileOnlyDependenciesMetadata -org.graalvm.truffle:truffle-compiler:24.1.1=compileClasspath -org.graalvm.truffle:truffle-runtime:24.1.1=compileOnlyDependenciesMetadata -org.graalvm.truffle:truffle-runtime:24.1.1=compileClasspath +org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-compiler:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath +org.graalvm.truffle:truffle-runtime:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath From e58996203e21e4fe3bf44e52896efbd500dffd18 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 20:06:52 -0800 Subject: [PATCH 24/40] fixup! locks for `pkl-tools` Signed-off-by: Sam Gammon --- pkl-tools/gradle.lockfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkl-tools/gradle.lockfile b/pkl-tools/gradle.lockfile index 1e07ef265..f4129437b 100644 --- a/pkl-tools/gradle.lockfile +++ b/pkl-tools/gradle.lockfile @@ -13,9 +13,12 @@ org.fusesource.jansi:jansi:2.4.1=runtimeClasspath,testRuntimeClasspath org.graalvm.polyglot:polyglot:24.1.1=runtimeClasspath,testRuntimeClasspath org.graalvm.sdk:collections:24.1.1=runtimeClasspath,testRuntimeClasspath org.graalvm.sdk:graal-sdk:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.sdk:jniutils:24.1.1=runtimeClasspath org.graalvm.sdk:nativeimage:24.1.1=runtimeClasspath,testRuntimeClasspath org.graalvm.sdk:word:24.1.1=runtimeClasspath,testRuntimeClasspath org.graalvm.truffle:truffle-api:24.1.1=runtimeClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-compiler:24.1.1=runtimeClasspath +org.graalvm.truffle:truffle-runtime:24.1.1=runtimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.7.10=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath From 5ef01b2b75f44d95408c85d98c3e8f722cccb51f Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 20:08:13 -0800 Subject: [PATCH 25/40] fixup! locks for `pkl-cli` tests Signed-off-by: Sam Gammon --- pkl-cli/gradle.lockfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkl-cli/gradle.lockfile b/pkl-cli/gradle.lockfile index dfcfe6372..40f6181fd 100644 --- a/pkl-cli/gradle.lockfile +++ b/pkl-cli/gradle.lockfile @@ -61,15 +61,15 @@ org.graalvm.nativeimage:objectfile:24.1.1=compileClasspath,compileOnlyDependenci org.graalvm.nativeimage:pointsto:24.1.1=compileClasspath,compileOnlyDependenciesMetadata org.graalvm.nativeimage:svm:24.1.1=compileClasspath,compileOnlyDependenciesMetadata org.graalvm.nativeimage:truffle-runtime-svm:24.1.1=compileClasspath,compileOnlyDependenciesMetadata -org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:collections:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath +org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.graalvm.sdk:collections:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.graalvm.sdk:graal-sdk:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:jniutils:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath -org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:word:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-compiler:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath -org.graalvm.truffle:truffle-runtime:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath +org.graalvm.sdk:jniutils:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath +org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.graalvm.sdk:word:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-compiler:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath +org.graalvm.truffle:truffle-runtime:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath From c3f4fba88f27ea8f9dfb037f9af270d127327aeb Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 20:09:55 -0800 Subject: [PATCH 26/40] fixup! locks for `pkl-cli` Signed-off-by: Sam Gammon --- pkl-cli/gradle.lockfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkl-cli/gradle.lockfile b/pkl-cli/gradle.lockfile index 40f6181fd..b0c3bfdab 100644 --- a/pkl-cli/gradle.lockfile +++ b/pkl-cli/gradle.lockfile @@ -64,12 +64,12 @@ org.graalvm.nativeimage:truffle-runtime-svm:24.1.1=compileClasspath,compileOnlyD org.graalvm.polyglot:polyglot:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.graalvm.sdk:collections:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.graalvm.sdk:graal-sdk:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testRuntimeClasspath -org.graalvm.sdk:jniutils:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath +org.graalvm.sdk:jniutils:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.graalvm.sdk:nativeimage:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.graalvm.sdk:word:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.graalvm.truffle:truffle-api:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.graalvm.truffle:truffle-compiler:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath -org.graalvm.truffle:truffle-runtime:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath +org.graalvm.truffle:truffle-compiler:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.graalvm.truffle:truffle-runtime:24.1.1=compileClasspath,compileOnlyDependenciesMetadata,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath From 213614f3b3a0833abf6b2c4cb95380409938bc96 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 20:17:42 -0800 Subject: [PATCH 27/40] fixup! drop internal macro usage for `truffle-svm` Signed-off-by: Sam Gammon --- pkl-cli/pkl-cli.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/pkl-cli/pkl-cli.gradle.kts b/pkl-cli/pkl-cli.gradle.kts index 199045274..82d230161 100644 --- a/pkl-cli/pkl-cli.gradle.kts +++ b/pkl-cli/pkl-cli.gradle.kts @@ -207,7 +207,6 @@ fun Exec.configureExecutable( add("-H:IncludeResources=org/jline/utils/.*") add("-H:IncludeResourceBundles=org.pkl.core.errorMessages") add("-H:IncludeResources=org/pkl/commons/cli/PklCARoots.pem") - add("--macro:truffle-svm") add("-H:Class=org.pkl.cli.Main") add("-o") add(outputFile.get().asFile.name) From bfb5ba7e8d985ad6ef74c37aebb83d1d30525974 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 20:27:46 -0800 Subject: [PATCH 28/40] fixup! gha tests Signed-off-by: Sam Gammon --- .github/workflows/job.build.yml | 2 +- .github/workflows/job.native-build.yml | 2 +- .github/workflows/job.tests.yml | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/job.build.yml b/.github/workflows/job.build.yml index 8a2fb4bb2..8a9fa7f0a 100644 --- a/.github/workflows/job.build.yml +++ b/.github/workflows/job.build.yml @@ -66,7 +66,7 @@ jobs: with: distribution: 'adopt' java-version: '21' - - name: "Setup: GraalVM (Java 21)" + - name: "Setup: GraalVM (Java 23)" uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 with: distribution: "graalvm" diff --git a/.github/workflows/job.native-build.yml b/.github/workflows/job.native-build.yml index 7a3cc9aa1..f22f356b1 100644 --- a/.github/workflows/job.native-build.yml +++ b/.github/workflows/job.native-build.yml @@ -141,7 +141,7 @@ jobs: with: distribution: 'adopt' java-version: '21' - - name: "Setup: GraalVM (Java 21)" + - name: "Setup: GraalVM (Java 23)" uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 if: ${{ matrix.enabled }} with: diff --git a/.github/workflows/job.tests.yml b/.github/workflows/job.tests.yml index 43621aab5..56e5fc08b 100644 --- a/.github/workflows/job.tests.yml +++ b/.github/workflows/job.tests.yml @@ -73,12 +73,14 @@ jobs: ./*/build/klib ./*/build/generated ./*/build/generated-sources - - name: "Setup: Java 21" - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + - name: "Setup: GraalVM (Java 21)" + uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 with: - distribution: 'adopt' + distribution: "graalvm" java-version: '21' - - name: "Setup: GraalVM (Java 21)" + check-for-updates: false + github-token: ${{ secrets.GITHUB_TOKEN }} + - name: "Setup: GraalVM (Java 23)" uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 with: distribution: "graalvm" From c7ff4f86f7d1ec6bc60ee09376dd4dc23067cf3a Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Sun, 5 Jan 2025 20:37:27 -0800 Subject: [PATCH 29/40] fixup! toolchain provisioning Signed-off-by: Sam Gammon --- settings.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5f97fee35..313486276 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -56,6 +56,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} + @Suppress("UnstableApiUsage") dependencyResolutionManagement { repositories { mavenCentral() } } val javaVersion = JavaVersion.current() From 549a6188db643ca132f1db2e050d61fb86b269d5 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 15:07:53 -0800 Subject: [PATCH 30/40] pivot to jvm21 w/managed toolchain Signed-off-by: Sam Gammon --- .../gradle/kotlin/dsl/ToolchainExtensions.kt | 85 +++++++++++++++++++ .../src/main/kotlin/pklJavaLibrary.gradle.kts | 1 + .../main/kotlin/pklJvmToolchain.gradle.kts | 16 ++++ gradle/libs.versions.toml | 12 +-- pkl-cli/pkl-cli.gradle.kts | 15 ++-- pkl-core/pkl-core.gradle.kts | 2 + pkl-doc/pkl-doc.gradle.kts | 8 -- pkl-executor/pkl-executor.gradle.kts | 9 +- 8 files changed, 118 insertions(+), 30 deletions(-) create mode 100644 buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt create mode 100644 buildSrc/src/main/kotlin/pklJvmToolchain.gradle.kts diff --git a/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt b/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt new file mode 100644 index 000000000..9cea897a5 --- /dev/null +++ b/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt @@ -0,0 +1,85 @@ +/* + * Copyright © 2024 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. + */ +package org.gradle.kotlin.dsl + +import org.gradle.accessors.dm.LibrariesForLibs +import org.gradle.api.Project +import org.gradle.api.plugins.JavaPluginExtension +import org.gradle.api.provider.Provider +import org.gradle.api.tasks.JavaExec +import org.gradle.api.tasks.compile.JavaCompile +import org.gradle.jvm.toolchain.* +import org.gradle.kotlin.dsl.support.serviceOf + +private const val oracleGraalvm = true +private val graalvmVendor = if (oracleGraalvm) JvmVendorSpec.ORACLE else JvmVendorSpec.GRAAL_VM + +/** + * Configure a Java toolchain to use a specific version of GraalVM. + * + * @param javaVersion The version of GraalVM to use. + */ +fun JavaToolchainSpec.useGraalvm(javaVersion: JavaLanguageVersion) { + languageVersion = javaVersion + vendor = graalvmVendor +} + +/** + * Resolve a Java compiler and launcher for the pinned version of GraalVM. + * + * @param javaVersion The version of GraalVM to use. + * @return A pair of Java compiler and launcher. + */ +fun Project.graalvmToolchain( + javaVersion: JavaLanguageVersion +): Provider> { + val javaToolchains = serviceOf() + val compiler = javaToolchains.compilerFor { useGraalvm(javaVersion) } + val launcher = javaToolchains.launcherFor { useGraalvm(javaVersion) } + return provider { compiler.get() to launcher.get() } +} + +/** + * Configure a project to use the pinned version of GraalVM; this will apply the Java compiler and + * launcher resolved by [graalvmToolchain] to all Java compile and exec tasks. + */ +fun Project.useGraalvmToolchain(javaVersion: JavaLanguageVersion) { + val (compiler, launcher) = graalvmToolchain(javaVersion).get() + tasks.withType { javaCompiler = compiler } + tasks.withType { javaLauncher = launcher } +} + +/** + * Configure a project and Java toolchain to use the pinned version of GraalVM specified within the + * `libs.versions.toml` file. + */ +fun Project.useGraalVm(javaVersion: JavaLanguageVersion? = null) { + val libs = the() + val gvmVersion = + javaVersion + ?: requireNotNull(libs.versions.graalVmJdkVersion.get().substringBefore('.').toUIntOrNull()) { + "GraalVmMajor version is not valid or not supported on this platform" + } + .let { JavaLanguageVersion.of(it.toInt()) } + + configure { + // assign the Java toolchain to the project + toolchain { useGraalvm(gvmVersion) } + + // assign toolchain for all configured and applicable tasks + useGraalvmToolchain(gvmVersion) + } +} diff --git a/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts b/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts index 36e048c53..1fc46d7dd 100644 --- a/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts +++ b/buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts @@ -20,6 +20,7 @@ import org.gradle.accessors.dm.LibrariesForLibs plugins { `java-library` id("pklKotlinTest") + id("pklJvmToolchain") id("com.diffplug.spotless") } diff --git a/buildSrc/src/main/kotlin/pklJvmToolchain.gradle.kts b/buildSrc/src/main/kotlin/pklJvmToolchain.gradle.kts new file mode 100644 index 000000000..53bbb1b1b --- /dev/null +++ b/buildSrc/src/main/kotlin/pklJvmToolchain.gradle.kts @@ -0,0 +1,16 @@ +/* + * Copyright © 2024 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 { `jvm-toolchains` } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4a3d9658d..e41b3bfb7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,13 +10,13 @@ googleJavaFormat = "1.21.0" # must not use `+` because used in download URL # 23.1.x requires JDK 20+ graalVm = "24.1.1" -graalVmJdkVersion = "23.0.1" +graalVmJdkVersion = "21.0.5" # slightly hacky but convenient place so we remember to update the checksum -graalVmSha256-macos-x64 = "539699d8ff4979623bc7bdf8282ac6f76cd2560f47d14ec5438bada24f136f96" -graalVmSha256-macos-aarch64 = "c00a7a62ce453aa026bff65e5a18c63464f725c01e5a71771856226928ba5b0f" -graalVmSha256-linux-x64 = "46ec9582ebe114f93470403f2cc123238ac0c7982129c358af7d8e1de52dd663" -graalVmSha256-linux-aarch64 = "1835a98b87c439c8c654d97956c22d409855952e5560a8127f56c50f3f919d7d" -graalVmSha256-windows-x64 = "e758646504cfaf23cf218a22691ad70491f3196448a77d03d78e50dff2145533" +graalVmSha256-macos-x64 = "bad" +graalVmSha256-macos-aarch64 = "bad" +graalVmSha256-linux-x64 = "c1960d4f9d278458bde1cd15115ac2f0b3240cb427d51cfeceb79dab91a7f5c9" +graalVmSha256-linux-aarch64 = "bad" +graalVmSha256-windows-x64 = "bad" ideaExtPlugin = "1.1.9" javaPoet = "0.+" javaxInject = "1" diff --git a/pkl-cli/pkl-cli.gradle.kts b/pkl-cli/pkl-cli.gradle.kts index 82d230161..80ac78080 100644 --- a/pkl-cli/pkl-cli.gradle.kts +++ b/pkl-cli/pkl-cli.gradle.kts @@ -119,11 +119,6 @@ val javaExecutable by val testJavaExecutable by tasks.registering(Test::class) { - javaLauncher = - javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(21) - vendor = JvmVendorSpec.GRAAL_VM - } testClassesDirs = tasks.test.get().testClassesDirs classpath = // compiled test classes @@ -221,10 +216,12 @@ fun Exec.configureExecutable( add("-H:-ParseRuntimeOptions") // quick build mode: 40% faster compilation, 20% smaller (but presumably also slower) // executable - if (!buildInfo.isReleaseBuild) { - add("-Ob") - } else { - add("-Os") + when { + // non-releases should optimize for build time + !buildInfo.isReleaseBuild -> add("-Ob") + + // size optimization is only supported at GraalVM JDK 23+ + libs.versions.graalVmJdkVersion.get().split(".").first().toInt() >= 23 -> add("-Os") } if (buildInfo.isNativeArch) { add("-march=native") diff --git a/pkl-core/pkl-core.gradle.kts b/pkl-core/pkl-core.gradle.kts index 869690209..fd7a4e0bc 100644 --- a/pkl-core/pkl-core.gradle.kts +++ b/pkl-core/pkl-core.gradle.kts @@ -29,6 +29,8 @@ val generatorSourceSet = sourceSets.register("generator") sourceSets { main { java { srcDir(file("generated/antlr")) } } } +java { useGraalVm() } + idea { module { // mark src/main/antlr as source dir diff --git a/pkl-doc/pkl-doc.gradle.kts b/pkl-doc/pkl-doc.gradle.kts index c8e9593ff..467d505ea 100644 --- a/pkl-doc/pkl-doc.gradle.kts +++ b/pkl-doc/pkl-doc.gradle.kts @@ -58,11 +58,3 @@ publishing { tasks.jar { manifest { attributes += mapOf("Main-Class" to "org.pkl.doc.Main") } } htmlValidator { sources = files("src/test/files/DocGeneratorTest/output") } - -val testToolchain = - javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(21) - vendor = JvmVendorSpec.GRAAL_VM - } - -tasks.test { javaLauncher = testToolchain } diff --git a/pkl-executor/pkl-executor.gradle.kts b/pkl-executor/pkl-executor.gradle.kts index 086cbc797..9ed9536a5 100644 --- a/pkl-executor/pkl-executor.gradle.kts +++ b/pkl-executor/pkl-executor.gradle.kts @@ -27,6 +27,8 @@ plugins { val pklDistributionCurrent: Configuration by configurations.creating val pklHistoricalDistributions: Configuration by configurations.creating +java { useGraalVm() } + // 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. @@ -103,14 +105,7 @@ val prepareHistoricalDistributions by val prepareTest by tasks.registering { dependsOn(pklDistributionCurrent, prepareHistoricalDistributions) } -val testToolchain = - javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(21) - vendor = JvmVendorSpec.GRAAL_VM - } - tasks.test { - javaLauncher = testToolchain dependsOn(prepareTest) useJUnitPlatform() jvmArgumentProviders.add(CommandLineArgumentProvider { listOf("--add-modules=jdk.unsupported") }) From 29b0eae13ff15801dc048b6b1e9f172987520699 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 15:12:36 -0800 Subject: [PATCH 31/40] fixup! unwind gradle upgrade Signed-off-by: Sam Gammon --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1b837a19..82dd18b20 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From eeedb0ea68afc6424e71a3f847af31fe1079b183 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 15:15:21 -0800 Subject: [PATCH 32/40] fixup! drop toolchain provisioning plugin Signed-off-by: Sam Gammon --- settings.gradle.kts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 313486276..5f97fee35 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -56,10 +56,6 @@ pluginManagement { } } -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") -} - @Suppress("UnstableApiUsage") dependencyResolutionManagement { repositories { mavenCentral() } } val javaVersion = JavaVersion.current() From fbcb14fb55788e89b954f135926b5b13710b9f66 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 15:20:29 -0800 Subject: [PATCH 33/40] fixup! respect oracleGraalvm flag Signed-off-by: Sam Gammon --- .../main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt b/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt index 9cea897a5..3764d8260 100644 --- a/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt +++ b/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt @@ -24,7 +24,7 @@ import org.gradle.api.tasks.compile.JavaCompile import org.gradle.jvm.toolchain.* import org.gradle.kotlin.dsl.support.serviceOf -private const val oracleGraalvm = true +private val oracleGraalvm = java.lang.Boolean.getBoolean("oracleGraalvm") private val graalvmVendor = if (oracleGraalvm) JvmVendorSpec.ORACLE else JvmVendorSpec.GRAAL_VM /** From f3247ad8bb3295cae24b4711814e1fec4acb240f Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 15:20:36 -0800 Subject: [PATCH 34/40] fixup! restore toolchains for testing Signed-off-by: Sam Gammon --- settings.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5f97fee35..313486276 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -56,6 +56,10 @@ pluginManagement { } } +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} + @Suppress("UnstableApiUsage") dependencyResolutionManagement { repositories { mavenCentral() } } val javaVersion = JavaVersion.current() From 2f312026cbc8550e1906378c09447631fbe96f5b Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 15:21:45 -0800 Subject: [PATCH 35/40] fixup! consolidate on jvm21 for ci scaffolding Signed-off-by: Sam Gammon --- .github/workflows/job.build.yml | 9 ++------- .github/workflows/job.native-build.yml | 10 ++-------- .github/workflows/job.tests.yml | 7 ------- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/.github/workflows/job.build.yml b/.github/workflows/job.build.yml index 8a9fa7f0a..55d22f331 100644 --- a/.github/workflows/job.build.yml +++ b/.github/workflows/job.build.yml @@ -61,16 +61,11 @@ jobs: ./*/build/klib ./*/build/generated ./*/build/generated-sources - - name: "Setup: Java 21" - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 - with: - distribution: 'adopt' - java-version: '21' - - name: "Setup: GraalVM (Java 23)" + - name: "Setup: GraalVM (Java 21)" uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 with: distribution: "graalvm" - java-version: '23' + java-version: '21' check-for-updates: false github-token: ${{ secrets.GITHUB_TOKEN }} - name: "🛠️ Build" diff --git a/.github/workflows/job.native-build.yml b/.github/workflows/job.native-build.yml index f22f356b1..2da457bf1 100644 --- a/.github/workflows/job.native-build.yml +++ b/.github/workflows/job.native-build.yml @@ -135,18 +135,12 @@ jobs: ./*/build/klib ./*/build/generated ./*/build/generated-sources - - name: "Setup: Java 21" - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 - if: ${{ matrix.enabled }} - with: - distribution: 'adopt' - java-version: '21' - - name: "Setup: GraalVM (Java 23)" + - name: "Setup: GraalVM (Java 21)" uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 if: ${{ matrix.enabled }} with: distribution: "graalvm" - java-version: '23' + java-version: '21' check-for-updates: false github-token: ${{ secrets.GITHUB_TOKEN }} native-image-job-reports: 'true' diff --git a/.github/workflows/job.tests.yml b/.github/workflows/job.tests.yml index 56e5fc08b..1f44f2ba9 100644 --- a/.github/workflows/job.tests.yml +++ b/.github/workflows/job.tests.yml @@ -80,13 +80,6 @@ jobs: java-version: '21' check-for-updates: false github-token: ${{ secrets.GITHUB_TOKEN }} - - name: "Setup: GraalVM (Java 23)" - uses: graalvm/setup-graalvm@4a200f28cd70d1940b5e33bd00830b7dc71a7e2b # v1.2.6 - with: - distribution: "graalvm" - java-version: '23' - check-for-updates: false - github-token: ${{ secrets.GITHUB_TOKEN }} - name: "🛠️ JVM Testsuite" uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 id: gradlebuild From 4bece726c559d83ec1e28c3d42558f74035eaa9b Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 15:35:08 -0800 Subject: [PATCH 36/40] fixup! clean up toolchain extensions Signed-off-by: Sam Gammon --- .../gradle/kotlin/dsl/ToolchainExtensions.kt | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt b/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt index 3764d8260..aa855bc32 100644 --- a/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt +++ b/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt @@ -32,7 +32,7 @@ private val graalvmVendor = if (oracleGraalvm) JvmVendorSpec.ORACLE else JvmVend * * @param javaVersion The version of GraalVM to use. */ -fun JavaToolchainSpec.useGraalvm(javaVersion: JavaLanguageVersion) { +fun JavaToolchainSpec.graalvmAt(javaVersion: JavaLanguageVersion) { languageVersion = javaVersion vendor = graalvmVendor } @@ -47,8 +47,8 @@ fun Project.graalvmToolchain( javaVersion: JavaLanguageVersion ): Provider> { val javaToolchains = serviceOf() - val compiler = javaToolchains.compilerFor { useGraalvm(javaVersion) } - val launcher = javaToolchains.launcherFor { useGraalvm(javaVersion) } + val compiler = javaToolchains.compilerFor { graalvmAt(javaVersion) } + val launcher = javaToolchains.launcherFor { graalvmAt(javaVersion) } return provider { compiler.get() to launcher.get() } } @@ -56,10 +56,11 @@ fun Project.graalvmToolchain( * Configure a project to use the pinned version of GraalVM; this will apply the Java compiler and * launcher resolved by [graalvmToolchain] to all Java compile and exec tasks. */ -fun Project.useGraalvmToolchain(javaVersion: JavaLanguageVersion) { - val (compiler, launcher) = graalvmToolchain(javaVersion).get() - tasks.withType { javaCompiler = compiler } - tasks.withType { javaLauncher = launcher } +fun Project.useGraalvmToolchainForAllTasks(javaVersion: JavaLanguageVersion) { + graalvmToolchain(javaVersion).get().let { (compiler, launcher) -> + tasks.withType { javaCompiler = compiler } + tasks.withType { javaLauncher = launcher } + } } /** @@ -71,15 +72,13 @@ fun Project.useGraalVm(javaVersion: JavaLanguageVersion? = null) { val gvmVersion = javaVersion ?: requireNotNull(libs.versions.graalVmJdkVersion.get().substringBefore('.').toUIntOrNull()) { - "GraalVmMajor version is not valid or not supported on this platform" + "GraalVM JDK version is not valid or not supported on this platform" } .let { JavaLanguageVersion.of(it.toInt()) } configure { - // assign the Java toolchain to the project - toolchain { useGraalvm(gvmVersion) } - - // assign toolchain for all configured and applicable tasks - useGraalvmToolchain(gvmVersion) + toolchain { graalvmAt(gvmVersion) }.also { + useGraalvmToolchainForAllTasks(gvmVersion) + } } } From 98f96e4dc521830bfb68ea6230750ec234412110 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 15:35:15 -0800 Subject: [PATCH 37/40] fixup! gvm 21 hashes Signed-off-by: Sam Gammon --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e41b3bfb7..4b53d8fc2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,11 +12,11 @@ googleJavaFormat = "1.21.0" graalVm = "24.1.1" graalVmJdkVersion = "21.0.5" # slightly hacky but convenient place so we remember to update the checksum -graalVmSha256-macos-x64 = "bad" -graalVmSha256-macos-aarch64 = "bad" +graalVmSha256-macos-x64 = "2d9b09e28bc1bb6ff219bf62eacc4626c7740b4f1829ede9ea4450f33e9c0826" +graalVmSha256-macos-aarch64 = "cb68cb2c796f42f37a56fcd1385d8b86cca12e0b46c5618a5ed3ec7dd2260f6f" graalVmSha256-linux-x64 = "c1960d4f9d278458bde1cd15115ac2f0b3240cb427d51cfeceb79dab91a7f5c9" -graalVmSha256-linux-aarch64 = "bad" -graalVmSha256-windows-x64 = "bad" +graalVmSha256-linux-aarch64 = "3ad68fbb2d13da528dfa0aea9e9345383245ec9c31094dce3905cefba9aac01e" +graalVmSha256-windows-x64 = "d5784cbdc87f84b5cbd6c9d09c6f1d4611954f139fcfc795005c58dffd7f6b41" ideaExtPlugin = "1.1.9" javaPoet = "0.+" javaxInject = "1" From a5009c7bf64f6f0521eaf2100612c13d6522b9f6 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 15:37:58 -0800 Subject: [PATCH 38/40] fixup! fmt toolchain extensions Signed-off-by: Sam Gammon --- .../main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt b/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt index aa855bc32..6db9fcf91 100644 --- a/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt +++ b/buildSrc/src/main/kotlin/org/gradle/kotlin/dsl/ToolchainExtensions.kt @@ -77,8 +77,6 @@ fun Project.useGraalVm(javaVersion: JavaLanguageVersion? = null) { .let { JavaLanguageVersion.of(it.toInt()) } configure { - toolchain { graalvmAt(gvmVersion) }.also { - useGraalvmToolchainForAllTasks(gvmVersion) - } + toolchain { graalvmAt(gvmVersion) }.also { useGraalvmToolchainForAllTasks(gvmVersion) } } } From db1757f2dd8b250d5973aaa9a86e069c830bb5c8 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 15:38:07 -0800 Subject: [PATCH 39/40] drop! fixup settings fmt Signed-off-by: Sam Gammon --- settings.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 313486276..f764cc18f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -56,9 +56,7 @@ pluginManagement { } } -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") -} +plugins { id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0") } @Suppress("UnstableApiUsage") dependencyResolutionManagement { repositories { mavenCentral() } } From a3002e94cc5337aa3574b9e089b6c3a276be817b Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Mon, 6 Jan 2025 17:00:28 -0800 Subject: [PATCH 40/40] fixup! restore shadow plugin to non-broken version Signed-off-by: Sam Gammon --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4b53d8fc2..c55b197bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -44,7 +44,7 @@ msgpack = "0.9.8" nexusPublishPlugin = "2.0.0" nuValidator = "20.+" paguro = "3.+" -shadowPlugin = "8.3.5" +shadowPlugin = "8.3.1" slf4j = "1.+" snakeYaml = "2.+" spotlessPlugin = "6.25.0"