diff --git a/bench/gradle.lockfile b/bench/gradle.lockfile index 3725f163..484cb31d 100644 --- a/bench/gradle.lockfile +++ b/bench/gradle.lockfile @@ -26,7 +26,6 @@ org.graalvm.truffle:truffle-api:25.0.1=jmh,jmhRuntimeClasspath,truffle org.graalvm.truffle:truffle-compiler:25.0.1=graal org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,jmh,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -49,8 +48,6 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.21=jmh,jmhCompileClasspath,jmhRuntimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -77,4 +74,4 @@ org.opentest4j:opentest4j:1.3.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath,test org.organicdesign:Paguro:3.10.3=jmh,jmhRuntimeClasspath org.ow2.asm:asm:9.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.10=jmh,jmhRuntimeClasspath -empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,jmhAnnotationProcessor,jmhApiDependenciesMetadata,jmhCompileOnlyDependenciesMetadata,jmhImplementationDependenciesMetadata,jmhIntransitiveDependenciesMetadata,jmhKotlinScriptDefExtensions,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions +empty=annotationProcessor,apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,jmhAnnotationProcessor,jmhApiDependenciesMetadata,jmhCompileOnlyDependenciesMetadata,jmhImplementationDependenciesMetadata,jmhIntransitiveDependenciesMetadata,jmhKotlinScriptDefExtensions,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,runtimeClasspath,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions diff --git a/buildSrc/src/main/kotlin/pklKotlinBase.gradle.kts b/buildSrc/src/main/kotlin/pklKotlinBase.gradle.kts index 8d48d6d2..a5611680 100644 --- a/buildSrc/src/main/kotlin/pklKotlinBase.gradle.kts +++ b/buildSrc/src/main/kotlin/pklKotlinBase.gradle.kts @@ -14,6 +14,7 @@ * limitations under the License. */ import org.gradle.accessors.dm.LibrariesForLibs +import org.gradle.api.GradleException import org.gradle.kotlin.dsl.getByType import org.gradle.kotlin.dsl.kotlin import org.gradle.kotlin.dsl.the @@ -30,23 +31,16 @@ val buildInfo = project.extensions.getByType() val libs = the() -dependencies { - // Align versions of Kotlin modules during dependency resolution. - // Do NOT align "api", as this would affect consumers' builds. - implementation(platform(libs.kotlinBom)) - testImplementation(platform(libs.kotlinBom)) -} - kotlin { + jvmToolchain { + languageVersion.set(buildInfo.jdkToolchainVersion) + vendor.set(buildInfo.jdkVendor) + } compilerOptions { val kotlinTarget = KotlinVersion.fromVersion(libs.versions.kotlinTarget.get()) languageVersion.set(kotlinTarget) apiVersion.set(kotlinTarget) jvmTarget = JvmTarget.fromTarget(buildInfo.jvmTarget.toString()) - jvmToolchain { - languageVersion.set(buildInfo.jdkToolchainVersion) - vendor.set(buildInfo.jdkVendor) - } freeCompilerArgs.addAll( "-jvm-default=no-compatibility", // was: -Xjvm-default=all "-Xjdk-release=${buildInfo.jvmTarget}", @@ -65,3 +59,55 @@ spotless { licenseHeaderFile(rootProject.file("buildSrc/src/main/resources/license-header.star-block.txt")) } } + +/** + * Kotlin modules to guard: fail the build if any dependency resolves to a version higher than + * `libs.versions.kotlinTarget`. This includes versions introduced via direct declarations, BOMs, + * version catalogs, or constraints. + */ +val guardedKotlinModules = setOf(libs.kotlinStdLib.get().module, libs.kotlinReflect.get().module) + +/** + * Classpath configurations where the above rule applies. Kept narrow to avoid interfering with + * Gradle/Kotlin plugin internal configurations. + */ +val guardedConfigurations = + setOf( + configurations.compileClasspath, + configurations.runtimeClasspath, + configurations.testCompileClasspath, + configurations.testRuntimeClasspath, + ) + +guardedConfigurations.forEach { configuration -> + configuration.configure { + incoming.afterResolve { + resolutionResult.allComponents.forEach { component -> + val moduleVersion = component.moduleVersion ?: return@forEach + if ( + moduleVersion.module in guardedKotlinModules && + moduleVersion.version.exceedsKotlinTarget() + ) { + throw GradleException( + "Resolved ${moduleVersion.module}:${moduleVersion.version} on configuration $name, " + + "which exceeds the allowed Kotlin version ($kotlinTargetVersion)" + ) + } + } + } + } +} + +// also works for version ranges like: [2.3.0,) +val kotlinVersionRegex = Regex("""(\d+)\.(\d+)(?:\.\d+)?""") +val kotlinTargetVersion = libs.versions.kotlinTarget.get() +val targetMajor = kotlinTargetVersion.substringBefore('.').toInt() +val targetMinor = kotlinTargetVersion.substringAfter('.').toInt() + +fun String.exceedsKotlinTarget(): Boolean { + val version = + kotlinVersionRegex.find(this) ?: throw GradleException("Could not parse Kotlin version: $this") + val major = version.groupValues[1].toInt() + val minor = version.groupValues[2].toInt() + return major > targetMajor || (major == targetMajor && minor > targetMinor) +} diff --git a/docs/gradle.lockfile b/docs/gradle.lockfile index ac2bb013..afd4dd61 100644 --- a/docs/gradle.lockfile +++ b/docs/gradle.lockfile @@ -23,7 +23,6 @@ org.graalvm.sdk:word:25.0.1=testRuntimeClasspath org.graalvm.truffle:truffle-api:25.0.1=testRuntimeClasspath org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -46,8 +45,6 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.21=swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -69,4 +66,4 @@ org.msgpack:msgpack-core:0.9.11=testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.organicdesign:Paguro:3.10.3=testRuntimeClasspath org.snakeyaml:snakeyaml-engine:2.10=testRuntimeClasspath -empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions +empty=annotationProcessor,apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,runtimeClasspath,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ad6c6af0..41db9e6e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,8 @@ [versions] # ordered alphabetically assertj = "3.+" checksumPlugin = "1.4.0" -clikt = "5.+" +# 5.0.3 is the last version compatible with Kotlin 2.2 +clikt = "5.0.3" commonMark = "0.+" downloadTaskPlugin = "5.7.0" errorProne = "2.48.0" @@ -38,16 +39,15 @@ jmhPlugin = "0.7.3" jspecify = "1.0.0" jsr305 = "3.+" junit = "6.+" -kotlinBom = "2.2.21" +# 1.7+ generates much more verbose code +kotlinPoet = "1.6.+" +kotlinStdLib = "2.2.21" #noinspection UnusedVersionCatalogEntry kotlinTarget = "2.2" kotlinToolchain = "2.3.20" -# 1.7+ generates much more verbose code -kotlinPoet = "1.6.+" kotlinxHtml = "0.12.0" -# 1.8.1 is the last version that supports Kotlin 2.1, -# which is the language level currently set in pklKotlinLibrary. -kotlinxSerialization = "1.8.1" +# 1.9.0 is the last version compatible with Kotlin 2.2 +kotlinxSerialization = "1.9.0" kotlinxCoroutines = "1.+" #noinspection UnusedVersionCatalogEntry ktfmt = "0.62" @@ -94,13 +94,12 @@ junitEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", vers junitParams = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" } #noinspection UnusedVersionCatalogEntry junitLauncher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junit" } -#noinspection UnusedVersionCatalogEntry -kotlinBom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlinBom" } kotlinPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlinToolchain" } kotlinPoet = { group = "com.squareup", name = "kotlinpoet", version.ref = "kotlinPoet" } -kotlinReflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlinBom" } -kotlinScripting = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jsr223", version.ref = "kotlinBom" } -kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlinBom" } +kotlinReflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlinStdLib" } +kotlinScripting = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jsr223", version.ref = "kotlinStdLib" } +#noinspection UnusedVersionCatalogEntry +kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlinStdLib" } kotlinxHtml = { group = "org.jetbrains.kotlinx", name = "kotlinx-html-jvm", version.ref = "kotlinxHtml" } kotlinxSerializationJson = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } kotlinxCoroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } diff --git a/pkl-cli/gradle.lockfile b/pkl-cli/gradle.lockfile index 714852ce..aaaf143d 100644 --- a/pkl-cli/gradle.lockfile +++ b/pkl-cli/gradle.lockfile @@ -8,26 +8,30 @@ com.fasterxml.jackson.core:jackson-databind:2.20.1=testCompileClasspath,testRunt com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.1=testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.1=testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.20.1=testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown:5.1.0=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata +com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown:5.0.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata +com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable com.github.jknack:handlebars-helpers:4.3.1=testCompileClasspath,testRuntimeClasspath com.github.jknack:handlebars:4.3.1=testCompileClasspath,testRuntimeClasspath @@ -93,7 +97,6 @@ org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -116,10 +119,9 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,swiftExportClasspathResolvable -org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable diff --git a/pkl-codegen-java/gradle.lockfile b/pkl-codegen-java/gradle.lockfile index cf441c0c..55252d9f 100644 --- a/pkl-codegen-java/gradle.lockfile +++ b/pkl-codegen-java/gradle.lockfile @@ -1,26 +1,30 @@ # 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. -com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown:5.1.0=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata +com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown:5.0.3=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata +com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable com.palantir.javapoet:javapoet:0.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -45,7 +49,6 @@ org.graalvm.sdk:word:25.0.1=runtimeClasspath,testRuntimeClasspath org.graalvm.truffle:truffle-api:25.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -68,10 +71,9 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,swiftExportClasspathResolvable -org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable diff --git a/pkl-codegen-kotlin/gradle.lockfile b/pkl-codegen-kotlin/gradle.lockfile index 37de0d79..9ee5eb32 100644 --- a/pkl-codegen-kotlin/gradle.lockfile +++ b/pkl-codegen-kotlin/gradle.lockfile @@ -1,26 +1,30 @@ # 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. -com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown:5.1.0=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata +com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown:5.0.3=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata +com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable com.squareup:kotlinpoet:1.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -44,7 +48,6 @@ org.graalvm.sdk:word:25.0.1=runtimeClasspath,testRuntimeClasspath org.graalvm.truffle:truffle-api:25.0.1=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -73,10 +76,9 @@ org.jetbrains.kotlin:kotlin-scripting-jsr223:2.2.21=testRuntimeClasspath org.jetbrains.kotlin:kotlin-scripting-jvm-host:2.2.21=testRuntimeClasspath org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.21=testRuntimeClasspath org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,swiftExportClasspathResolvable -org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable diff --git a/pkl-commons-cli/gradle.lockfile b/pkl-commons-cli/gradle.lockfile index 3a665be9..80f8280b 100644 --- a/pkl-commons-cli/gradle.lockfile +++ b/pkl-commons-cli/gradle.lockfile @@ -1,26 +1,30 @@ # 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. -com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata +com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata +com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation @@ -56,7 +60,6 @@ org.graalvm.truffle:truffle-compiler:25.0.1=svmClasspath org.graalvm.truffle:truffle-runtime:25.0.1=svmClasspath org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,svmClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -79,10 +82,9 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,swiftExportClasspathResolvable -org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable diff --git a/pkl-commons-test/gradle.lockfile b/pkl-commons-test/gradle.lockfile index 085e416a..d037ae57 100644 --- a/pkl-commons-test/gradle.lockfile +++ b/pkl-commons-test/gradle.lockfile @@ -16,7 +16,6 @@ org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -39,8 +38,8 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath diff --git a/pkl-commons/gradle.lockfile b/pkl-commons/gradle.lockfile index 629d91b3..434f51f7 100644 --- a/pkl-commons/gradle.lockfile +++ b/pkl-commons/gradle.lockfile @@ -16,7 +16,6 @@ org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -39,8 +38,8 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath diff --git a/pkl-config-java/gradle.lockfile b/pkl-config-java/gradle.lockfile index bd777a2f..c5bb4cf3 100644 --- a/pkl-config-java/gradle.lockfile +++ b/pkl-config-java/gradle.lockfile @@ -1,26 +1,26 @@ # 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. -com.github.ajalt.clikt:clikt-core-jvm:5.1.0=pklCodegenJava -com.github.ajalt.clikt:clikt-core:5.1.0=pklCodegenJava -com.github.ajalt.clikt:clikt-jvm:5.1.0=pklCodegenJava -com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=pklCodegenJava -com.github.ajalt.clikt:clikt-markdown:5.1.0=pklCodegenJava -com.github.ajalt.clikt:clikt:5.1.0=pklCodegenJava +com.github.ajalt.clikt:clikt-core-jvm:5.0.3=pklCodegenJava +com.github.ajalt.clikt:clikt-core:5.0.3=pklCodegenJava +com.github.ajalt.clikt:clikt-jvm:5.0.3=pklCodegenJava +com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=pklCodegenJava +com.github.ajalt.clikt:clikt-markdown:5.0.3=pklCodegenJava +com.github.ajalt.clikt:clikt:5.0.3=pklCodegenJava com.github.ajalt.colormath:colormath-jvm:3.6.0=pklCodegenJava com.github.ajalt.colormath:colormath:3.6.0=pklCodegenJava -com.github.ajalt.mordant:mordant-core-jvm:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant-core:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant-jvm:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant-markdown:3.0.2=pklCodegenJava -com.github.ajalt.mordant:mordant:3.0.2=pklCodegenJava +com.github.ajalt.mordant:mordant-core-jvm:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant-core:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant-jvm:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant-markdown:3.0.1=pklCodegenJava +com.github.ajalt.mordant:mordant:3.0.1=pklCodegenJava com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable com.palantir.javapoet:javapoet:0.14.0=pklCodegenJava @@ -46,7 +46,6 @@ org.graalvm.sdk:word:25.0.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath org.graalvm.truffle:truffle-api:25.0.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,pklCodegenJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -69,10 +68,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=pklCodegenJava,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=pklCodegenJava,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.2.21=swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.3.0=pklCodegenJava +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=pklCodegenJava,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable diff --git a/pkl-config-kotlin/gradle.lockfile b/pkl-config-kotlin/gradle.lockfile index 399b2e9d..d143c6b2 100644 --- a/pkl-config-kotlin/gradle.lockfile +++ b/pkl-config-kotlin/gradle.lockfile @@ -1,26 +1,26 @@ # 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. -com.github.ajalt.clikt:clikt-core-jvm:5.1.0=pklCodegenKotlin -com.github.ajalt.clikt:clikt-core:5.1.0=pklCodegenKotlin -com.github.ajalt.clikt:clikt-jvm:5.1.0=pklCodegenKotlin -com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=pklCodegenKotlin -com.github.ajalt.clikt:clikt-markdown:5.1.0=pklCodegenKotlin -com.github.ajalt.clikt:clikt:5.1.0=pklCodegenKotlin +com.github.ajalt.clikt:clikt-core-jvm:5.0.3=pklCodegenKotlin +com.github.ajalt.clikt:clikt-core:5.0.3=pklCodegenKotlin +com.github.ajalt.clikt:clikt-jvm:5.0.3=pklCodegenKotlin +com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=pklCodegenKotlin +com.github.ajalt.clikt:clikt-markdown:5.0.3=pklCodegenKotlin +com.github.ajalt.clikt:clikt:5.0.3=pklCodegenKotlin com.github.ajalt.colormath:colormath-jvm:3.6.0=pklCodegenKotlin com.github.ajalt.colormath:colormath:3.6.0=pklCodegenKotlin -com.github.ajalt.mordant:mordant-core-jvm:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant-core:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant-jvm:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant-markdown:3.0.2=pklCodegenKotlin -com.github.ajalt.mordant:mordant:3.0.2=pklCodegenKotlin +com.github.ajalt.mordant:mordant-core-jvm:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant-core:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant-jvm:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant-markdown:3.0.1=pklCodegenKotlin +com.github.ajalt.mordant:mordant:3.0.1=pklCodegenKotlin com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable com.squareup:kotlinpoet:1.6.0=pklCodegenKotlin @@ -45,7 +45,6 @@ org.graalvm.sdk:word:25.0.1=pklCodegenKotlin,testRuntimeClasspath org.graalvm.truffle:truffle-api:25.0.1=pklCodegenKotlin,testRuntimeClasspath org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -68,10 +67,9 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.3.0=pklCodegenKotlin +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,pklCodegenKotlin,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable diff --git a/pkl-core/gradle.lockfile b/pkl-core/gradle.lockfile index 76f8a24a..cb1a8b0c 100644 --- a/pkl-core/gradle.lockfile +++ b/pkl-core/gradle.lockfile @@ -25,7 +25,6 @@ org.graalvm.truffle:truffle-api:25.0.1=compileClasspath,generatorCompileClasspat org.graalvm.truffle:truffle-dsl-processor:25.0.1=annotationProcessor org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -48,9 +47,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=generatorCompileClasspath,generatorRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=generatorCompileClasspath,generatorRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.2.21=generatorCompileClasspath,generatorRuntimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable @@ -58,7 +55,7 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClass org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable -org.jetbrains:annotations:13.0=generatorCompileClasspath,generatorRuntimeClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath +org.jetbrains:annotations:13.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:6.0.3=testCompileClasspath,testRuntimeClasspath diff --git a/pkl-core/pkl-core.gradle.kts b/pkl-core/pkl-core.gradle.kts index 00537730..5df896b7 100644 --- a/pkl-core/pkl-core.gradle.kts +++ b/pkl-core/pkl-core.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved. + * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,6 @@ dependencies { add("generatorImplementation", libs.javaPoet) add("generatorImplementation", libs.truffleApi) - add("generatorImplementation", libs.kotlinStdLib) javaExecutableConfiguration(project(":pkl-cli", "javaExecutable")) } @@ -72,7 +71,7 @@ publishing { Core implementation of the Pkl configuration language. Includes Java APIs for embedding the language into JVM applications, and for building libraries and tools on top of the language. - """ + """ .trimIndent() ) } diff --git a/pkl-core/src/generator/java/org/pkl/core/generator/MemberRegistryGenerator.java b/pkl-core/src/generator/java/org/pkl/core/generator/MemberRegistryGenerator.java new file mode 100644 index 00000000..bb7e5a66 --- /dev/null +++ b/pkl-core/src/generator/java/org/pkl/core/generator/MemberRegistryGenerator.java @@ -0,0 +1,272 @@ +/* + * Copyright © 2026 Apple Inc. and the Pkl project authors. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.pkl.core.generator; + +import com.oracle.truffle.api.dsl.GeneratedBy; +import com.palantir.javapoet.ClassName; +import com.palantir.javapoet.JavaFile; +import com.palantir.javapoet.MethodSpec; +import com.palantir.javapoet.TypeSpec; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.PackageElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeMirror; + +/** + * Generates a subclass of {@code org.pkl.core.stdlib.registry.ExternalMemberRegistry} for each + * stdlib module and a factory to instantiate them. Generated classes are written to {@code + * generated/truffle/org/pkl/core/stdlib/registry}. + * + *

Inputs: + * + *

+ */ +public final class MemberRegistryGenerator extends AbstractProcessor { + private static final String TRUFFLE_NODE_CLASS_SUFFIX = "NodeGen"; + private static final String TRUFFLE_NODE_FACTORY_SUFFIX = "NodesFactory"; + private static final String STDLIB_PACKAGE_NAME = "org.pkl.core.stdlib"; + private static final String REGISTRY_PACKAGE_NAME = STDLIB_PACKAGE_NAME + ".registry"; + private static final String MODULE_PACKAGE_NAME = "org.pkl.core.module"; + + private static final ClassName EXTERNAL_MEMBER_REGISTRY_CLASS_NAME = + ClassName.get(REGISTRY_PACKAGE_NAME, "ExternalMemberRegistry"); + private static final ClassName EMPTY_MEMBER_REGISTRY_CLASS_NAME = + ClassName.get(REGISTRY_PACKAGE_NAME, "EmptyMemberRegistry"); + private static final ClassName MEMBER_REGISTRY_FACTORY_CLASS_NAME = + ClassName.get(REGISTRY_PACKAGE_NAME, "MemberRegistryFactory"); + private static final ClassName MODULE_KEY_CLASS_NAME = + ClassName.get(MODULE_PACKAGE_NAME, "ModuleKey"); + private static final ClassName MODULE_KEYS_CLASS_NAME = + ClassName.get(MODULE_PACKAGE_NAME, "ModuleKeys"); + + @Override + public Set getSupportedAnnotationTypes() { + return Set.of(GeneratedBy.class.getName()); + } + + @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.RELEASE_17; + } + + @Override + public boolean process(Set annotations, RoundEnvironment roundEnv) { + if (annotations.isEmpty()) { + return true; + } + + var nodeClassesByPackage = collectNodeClasses(roundEnv); + generateRegistryClasses(nodeClassesByPackage); + generateRegistryFactoryClass(nodeClassesByPackage.keySet()); + return true; + } + + private Map> collectNodeClasses(RoundEnvironment roundEnv) { + var nodeClasses = new ArrayList(); + + for (var element : roundEnv.getElementsAnnotatedWith(GeneratedBy.class)) { + if (!(element instanceof TypeElement typeElement)) { + continue; + } + if (!typeElement.getQualifiedName().toString().startsWith(STDLIB_PACKAGE_NAME)) { + continue; + } + if (!typeElement.getSimpleName().toString().endsWith(TRUFFLE_NODE_CLASS_SUFFIX)) { + continue; + } + nodeClasses.add(typeElement); + } + + nodeClasses.sort( + Comparator.comparing( + (TypeElement element) -> { + var enclosingElement = element.getEnclosingElement(); + return enclosingElement.getKind() == ElementKind.PACKAGE + ? "" + : enclosingElement.getSimpleName().toString(); + }) + .thenComparing(element -> element.getSimpleName().toString())); + + var result = new LinkedHashMap>(); + for (var nodeClass : nodeClasses) { + var pkg = processingEnv.getElementUtils().getPackageOf(nodeClass); + result.computeIfAbsent(pkg, ignored -> new ArrayList<>()).add(nodeClass); + } + return result; + } + + private void generateRegistryClasses( + Map> nodeClassesByPackage) { + for (var entry : nodeClassesByPackage.entrySet()) { + generateRegistryClass(entry.getKey(), entry.getValue()); + } + } + + private void generateRegistryClass(PackageElement pkg, List nodeClasses) { + var pklModuleName = getAnnotatedPklName(pkg); + if (pklModuleName == null) { + pklModuleName = pkg.getSimpleName().toString(); + } + + var pklModuleNameCapitalized = capitalize(pklModuleName); + var registryClassName = + ClassName.get(REGISTRY_PACKAGE_NAME, pklModuleNameCapitalized + "MemberRegistry"); + + TypeSpec.Builder registryClass = + TypeSpec.classBuilder(registryClassName) + .addJavadoc("Generated by {@link $L}.\n", getClass().getName()) + .addModifiers(Modifier.FINAL) + .superclass(EXTERNAL_MEMBER_REGISTRY_CLASS_NAME); + + var constructor = MethodSpec.constructorBuilder(); + + for (var nodeClass : nodeClasses) { + var enclosingClass = nodeClass.getEnclosingElement(); + + var pklClassName = getAnnotatedPklName(enclosingClass); + if (pklClassName == null) { + pklClassName = + stripSuffix(enclosingClass.getSimpleName().toString(), TRUFFLE_NODE_FACTORY_SUFFIX); + } + + var pklMemberName = getAnnotatedPklName(nodeClass); + if (pklMemberName == null) { + pklMemberName = + stripSuffix(nodeClass.getSimpleName().toString(), TRUFFLE_NODE_CLASS_SUFFIX); + } + + String pklMemberNameQualified; + if (pklClassName.equals(pklModuleNameCapitalized)) { + pklMemberNameQualified = "pkl." + pklModuleName + "#" + pklMemberName; + } else { + pklMemberNameQualified = "pkl." + pklModuleName + "#" + pklClassName + "." + pklMemberName; + } + + registryClass.addOriginatingElement(nodeClass); + constructor.addStatement("register($S, $T::create)", pklMemberNameQualified, nodeClass); + } + + registryClass.addMethod(constructor.build()); + writeJavaFile(REGISTRY_PACKAGE_NAME, registryClass.build()); + } + + private void generateRegistryFactoryClass(Collection packages) { + var registryFactoryClass = + TypeSpec.classBuilder(MEMBER_REGISTRY_FACTORY_CLASS_NAME) + .addJavadoc("Generated by {@link $L}.\n", getClass().getName()) + .addModifiers(Modifier.PUBLIC, Modifier.FINAL); + + registryFactoryClass.addMethod( + MethodSpec.constructorBuilder().addModifiers(Modifier.PRIVATE).build()); + + MethodSpec.Builder getMethod = + MethodSpec.methodBuilder("get") + .addModifiers(Modifier.PUBLIC, Modifier.STATIC) + .addParameter(MODULE_KEY_CLASS_NAME, "moduleKey") + .returns(EXTERNAL_MEMBER_REGISTRY_CLASS_NAME) + .beginControlFlow("if (!$T.isStdLibModule(moduleKey))", MODULE_KEYS_CLASS_NAME) + .addStatement("return $T.INSTANCE", EMPTY_MEMBER_REGISTRY_CLASS_NAME) + .endControlFlow() + .beginControlFlow("switch (moduleKey.getUri().getSchemeSpecificPart())"); + + for (var pkg : packages) { + var pklModuleName = getAnnotatedPklName(pkg); + if (pklModuleName == null) { + pklModuleName = pkg.getSimpleName().toString(); + } + + var pklModuleNameCapitalized = capitalize(pklModuleName); + var registryClassName = + ClassName.get(REGISTRY_PACKAGE_NAME, pklModuleNameCapitalized + "MemberRegistry"); + + registryFactoryClass.addOriginatingElement(pkg); + getMethod.addCode("case $S:\n", pklModuleName); + getMethod.addStatement(" return new $T()", registryClassName); + } + + getMethod + .addCode("default:\n") + .addStatement(" return $T.INSTANCE", EMPTY_MEMBER_REGISTRY_CLASS_NAME) + .endControlFlow(); + + registryFactoryClass.addMethod(getMethod.build()); + writeJavaFile(REGISTRY_PACKAGE_NAME, registryFactoryClass.build()); + } + + private String getAnnotatedPklName(Element element) { + for (var annotation : element.getAnnotationMirrors()) { + var annotationName = annotation.getAnnotationType().asElement().getSimpleName().toString(); + + if (annotationName.equals("PklName")) { + return firstAnnotationValue(annotation).getValue().toString(); + } + + if (annotationName.equals("GeneratedBy")) { + var value = firstAnnotationValue(annotation).getValue(); + if (value instanceof TypeMirror typeMirror) { + var generatedByElement = processingEnv.getTypeUtils().asElement(typeMirror); + if (generatedByElement != null) { + return getAnnotatedPklName(generatedByElement); + } + } + } + } + return null; + } + + private static AnnotationValue firstAnnotationValue(AnnotationMirror annotation) { + return annotation.getElementValues().values().iterator().next(); + } + + private void writeJavaFile(String packageName, TypeSpec typeSpec) { + try { + JavaFile.builder(packageName, typeSpec).build().writeTo(processingEnv.getFiler()); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + private static String stripSuffix(String value, String suffix) { + return value.endsWith(suffix) ? value.substring(0, value.length() - suffix.length()) : value; + } + + private static String capitalize(String value) { + if (value.isEmpty()) { + return value; + } + return Character.toUpperCase(value.charAt(0)) + value.substring(1); + } +} diff --git a/pkl-core/src/generator/kotlin/org/pkl/core/generator/MemberRegistryGenerator.kt b/pkl-core/src/generator/kotlin/org/pkl/core/generator/MemberRegistryGenerator.kt deleted file mode 100644 index 01d969e9..00000000 --- a/pkl-core/src/generator/kotlin/org/pkl/core/generator/MemberRegistryGenerator.kt +++ /dev/null @@ -1,191 +0,0 @@ -/* - * Copyright © 2024-2025 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.pkl.core.generator - -import com.oracle.truffle.api.dsl.GeneratedBy -import com.palantir.javapoet.ClassName -import com.palantir.javapoet.JavaFile -import com.palantir.javapoet.MethodSpec -import com.palantir.javapoet.TypeSpec -import javax.annotation.processing.AbstractProcessor -import javax.annotation.processing.RoundEnvironment -import javax.lang.model.SourceVersion -import javax.lang.model.element.* -import javax.lang.model.type.TypeMirror - -/** - * Generates a subclass of `org.pkl.core.stdlib.registry.ExternalMemberRegistry` for each stdlib - * module and a factory to instantiate them. Generated classes are written to - * `generated/truffle/org/pkl/core/stdlib/registry`. - * - * Inputs: - * - Generated Truffle node classes for stdlib members. These classes are located in subpackages of - * `org.pkl.core.stdlib` and identified via their `@GeneratedBy` annotations. - * - `@PklName` annotations on handwritten node classes from which Truffle node classes are - * generated. - */ -class MemberRegistryGenerator : AbstractProcessor() { - private val truffleNodeClassSuffix = "NodeGen" - private val truffleNodeFactorySuffix = "NodesFactory" - private val stdLibPackageName: String = "org.pkl.core.stdlib" - private val registryPackageName: String = "$stdLibPackageName.registry" - private val modulePackageName: String = "org.pkl.core.module" - - private val externalMemberRegistryClassName: ClassName = - ClassName.get(registryPackageName, "ExternalMemberRegistry") - private val emptyMemberRegistryClassName: ClassName = - ClassName.get(registryPackageName, "EmptyMemberRegistry") - private val memberRegistryFactoryClassName: ClassName = - ClassName.get(registryPackageName, "MemberRegistryFactory") - private val moduleKeyClassName: ClassName = ClassName.get(modulePackageName, "ModuleKey") - private val moduleKeysClassName: ClassName = ClassName.get(modulePackageName, "ModuleKeys") - - override fun getSupportedAnnotationTypes(): Set = setOf(GeneratedBy::class.java.name) - - override fun getSupportedSourceVersion(): SourceVersion = SourceVersion.RELEASE_17 - - override fun process(annotations: Set, roundEnv: RoundEnvironment): Boolean { - if (annotations.isEmpty()) return true - - val nodeClassesByPackage = collectNodeClasses(roundEnv) - generateRegistryClasses(nodeClassesByPackage) - generateRegistryFactoryClass(nodeClassesByPackage.keys) - - return true - } - - private fun collectNodeClasses(roundEnv: RoundEnvironment) = - roundEnv - .getElementsAnnotatedWith(GeneratedBy::class.java) - .asSequence() - .filterIsInstance() - .filter { it.qualifiedName.toString().startsWith(stdLibPackageName) } - .filter { it.simpleName.toString().endsWith(truffleNodeClassSuffix) } - .sortedWith( - compareBy( - { - if (it.enclosingElement.kind == ElementKind.PACKAGE) "" - else it.enclosingElement.simpleName.toString() - }, - { it.simpleName.toString() }, - ) - ) - .groupBy { processingEnv.elementUtils.getPackageOf(it) } - - private fun generateRegistryClasses( - nodeClassesByPackage: Map> - ) { - for ((pkg, nodeClasses) in nodeClassesByPackage) { - generateRegistryClass(pkg, nodeClasses) - } - } - - private fun generateRegistryClass(pkg: PackageElement, nodeClasses: List) { - val pklModuleName = getAnnotatedPklName(pkg) ?: pkg.simpleName.toString() - val pklModuleNameCapitalized = pklModuleName.capitalize() - val registryClassName = - ClassName.get(registryPackageName, "${pklModuleNameCapitalized}MemberRegistry") - - val registryClass = - TypeSpec.classBuilder(registryClassName) - .addJavadoc("Generated by {@link ${this::class.qualifiedName}}.") - .addModifiers(Modifier.FINAL) - .superclass(externalMemberRegistryClassName) - val registryClassConstructor = MethodSpec.constructorBuilder() - - for (nodeClass in nodeClasses) { - val enclosingClass = nodeClass.enclosingElement - val pklClassName = - getAnnotatedPklName(enclosingClass) - ?: enclosingClass.simpleName.toString().removeSuffix(truffleNodeFactorySuffix) - val pklMemberName = - getAnnotatedPklName(nodeClass) - ?: nodeClass.simpleName.toString().removeSuffix(truffleNodeClassSuffix) - val pklMemberNameQualified = - when (pklClassName) { - // By convention, the top-level class containing node classes - // for *module* members is named `Nodes`. - // Example: `BaseNodes` for pkl.base - pklModuleNameCapitalized -> "pkl.$pklModuleName#$pklMemberName" - else -> "pkl.$pklModuleName#$pklClassName.$pklMemberName" - } - registryClass.addOriginatingElement(nodeClass) - registryClassConstructor.addStatement( - "register(\$S, \$T::create)", - pklMemberNameQualified, - nodeClass, - ) - } - - registryClass.addMethod(registryClassConstructor.build()) - val javaFile = JavaFile.builder(registryPackageName, registryClass.build()).build() - javaFile.writeTo(processingEnv.filer) - } - - private fun generateRegistryFactoryClass(packages: Collection) { - val registryFactoryClass = - TypeSpec.classBuilder(memberRegistryFactoryClassName) - .addJavadoc("Generated by {@link ${this::class.qualifiedName}}.") - .addModifiers(Modifier.PUBLIC, Modifier.FINAL) - val registryFactoryConstructor = MethodSpec.constructorBuilder().addModifiers(Modifier.PRIVATE) - registryFactoryClass.addMethod(registryFactoryConstructor.build()) - val registryFactoryGetMethod = - MethodSpec.methodBuilder("get") - .addModifiers(Modifier.PUBLIC, Modifier.STATIC) - .addParameter(moduleKeyClassName, "moduleKey") - .returns(externalMemberRegistryClassName) - .beginControlFlow("if (!\$T.isStdLibModule(moduleKey))", moduleKeysClassName) - .addStatement("return \$T.INSTANCE", emptyMemberRegistryClassName) - .endControlFlow() - .beginControlFlow("switch (moduleKey.getUri().getSchemeSpecificPart())") - - for (pkg in packages) { - val pklModuleName = getAnnotatedPklName(pkg) ?: pkg.simpleName.toString() - val pklModuleNameCapitalized = pklModuleName.capitalize() - val registryClassName = - ClassName.get(registryPackageName, "${pklModuleNameCapitalized}MemberRegistry") - - // declare dependency on package-info.java (for `@PklName`) - registryFactoryClass.addOriginatingElement(pkg) - registryFactoryGetMethod - .addCode("case \$S:\n", pklModuleName) - .addStatement(" return new \$T()", registryClassName) - } - - registryFactoryGetMethod - .addCode("default:\n") - .addStatement(" return \$T.INSTANCE", emptyMemberRegistryClassName) - .endControlFlow() - registryFactoryClass.addMethod(registryFactoryGetMethod.build()) - val javaFile = JavaFile.builder(registryPackageName, registryFactoryClass.build()).build() - javaFile.writeTo(processingEnv.filer) - } - - private fun getAnnotatedPklName(element: Element): String? { - for (annotation in element.annotationMirrors) { - when (annotation.annotationType.asElement().simpleName.toString()) { - "PklName" -> return annotation.elementValues.values.iterator().next().value.toString() - "GeneratedBy" -> { - val annotationValue = annotation.elementValues.values.first().value as TypeMirror - return getAnnotatedPklName(processingEnv.typeUtils.asElement(annotationValue)) - } - } - } - return null - } - - private fun String.capitalize(): String = replaceFirstChar { it.titlecaseChar() } -} diff --git a/pkl-doc/gradle.lockfile b/pkl-doc/gradle.lockfile index 71adbcea..bd32cb35 100644 --- a/pkl-doc/gradle.lockfile +++ b/pkl-doc/gradle.lockfile @@ -1,26 +1,26 @@ # 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. -com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-core:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown:5.1.0=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown:5.0.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.colormath:colormath:3.6.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable com.google.errorprone:error_prone_annotations:2.36.0=testCompileClasspath,testRuntimeClasspath @@ -75,7 +75,6 @@ org.graalvm.truffle:truffle-runtime:25.0.1=nativeImageClasspath,testRuntimeClass org.htmlunit:htmlunit-csp:4.22.0=validator org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -99,10 +98,9 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerP org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-serialization-compiler-plugin-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,swiftExportClasspathResolvable -org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable @@ -112,13 +110,13 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClass org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-html-jvm:0.12.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable -org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.8.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.9.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable -org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.8.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.9.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.9.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable org.jetbrains:annotations:23.0.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains:markdown-jvm:0.7.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath diff --git a/pkl-executor/gradle.lockfile b/pkl-executor/gradle.lockfile index 15e0a6d1..fb250002 100644 --- a/pkl-executor/gradle.lockfile +++ b/pkl-executor/gradle.lockfile @@ -22,7 +22,6 @@ org.graalvm.sdk:word:25.0.1=testRuntimeClasspath org.graalvm.truffle:truffle-api:25.0.1=testRuntimeClasspath org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -45,8 +44,6 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.21=swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath diff --git a/pkl-formatter/gradle.lockfile b/pkl-formatter/gradle.lockfile index 657b6adf..df37313b 100644 --- a/pkl-formatter/gradle.lockfile +++ b/pkl-formatter/gradle.lockfile @@ -16,7 +16,6 @@ org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -38,8 +37,6 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.21=swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath diff --git a/pkl-gradle/gradle.lockfile b/pkl-gradle/gradle.lockfile index 236e130c..3d1cfbeb 100644 --- a/pkl-gradle/gradle.lockfile +++ b/pkl-gradle/gradle.lockfile @@ -1,16 +1,20 @@ # 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. -com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath -com.github.ajalt.clikt:clikt-core:5.1.0=compileClasspath,compileOnlyDependenciesMetadata -com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath -com.github.ajalt.clikt:clikt:5.1.0=compileClasspath,compileOnlyDependenciesMetadata +com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath +com.github.ajalt.clikt:clikt-core:5.0.3=compileClasspath +com.github.ajalt.clikt:clikt-core:5.1.0=compileOnlyDependenciesMetadata +com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath +com.github.ajalt.clikt:clikt:5.0.3=compileClasspath +com.github.ajalt.clikt:clikt:5.1.0=compileOnlyDependenciesMetadata com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath com.github.ajalt.colormath:colormath:3.6.0=compileClasspath,compileOnlyDependenciesMetadata -com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath -com.github.ajalt.mordant:mordant-core:3.0.2=compileClasspath,compileOnlyDependenciesMetadata -com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath -com.github.ajalt.mordant:mordant:3.0.2=compileClasspath,compileOnlyDependenciesMetadata +com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath +com.github.ajalt.mordant:mordant-core:3.0.1=compileClasspath +com.github.ajalt.mordant:mordant-core:3.0.2=compileOnlyDependenciesMetadata +com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath +com.github.ajalt.mordant:mordant:3.0.1=compileClasspath +com.github.ajalt.mordant:mordant:3.0.2=compileOnlyDependenciesMetadata com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation @@ -26,7 +30,6 @@ org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -49,10 +52,9 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=compileClasspath,compileOnlyDependenciesMetadata,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=compileClasspath,compileOnlyDependenciesMetadata,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.2.21=compileOnlyDependenciesMetadata,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=compileOnlyDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=compileOnlyDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=compileClasspath,compileOnlyDependenciesMetadata,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable @@ -71,4 +73,4 @@ org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.11=testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath -empty=annotationProcessor,apiDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions +empty=annotationProcessor,apiDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,runtimeClasspath,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions diff --git a/pkl-parser/gradle.lockfile b/pkl-parser/gradle.lockfile index e8d1a992..b4a291ae 100644 --- a/pkl-parser/gradle.lockfile +++ b/pkl-parser/gradle.lockfile @@ -37,7 +37,6 @@ org.checkerframework:checker-qual:3.53.0=annotationProcessor,testAnnotationProce org.checkerframework:dataflow-nullaway:3.53.0=annotationProcessor,testAnnotationProcessor org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -60,8 +59,6 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.2.21=swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath diff --git a/pkl-server/gradle.lockfile b/pkl-server/gradle.lockfile index 8b632c98..c30dde11 100644 --- a/pkl-server/gradle.lockfile +++ b/pkl-server/gradle.lockfile @@ -22,7 +22,6 @@ org.graalvm.sdk:word:25.0.1=compileClasspath,runtimeClasspath,testCompileClasspa org.graalvm.truffle:truffle-api:25.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath @@ -45,8 +44,8 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspat org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath diff --git a/pkl-tools/gradle.lockfile b/pkl-tools/gradle.lockfile index ae06bb8e..8afc367f 100644 --- a/pkl-tools/gradle.lockfile +++ b/pkl-tools/gradle.lockfile @@ -1,26 +1,26 @@ # 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. -com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-core:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt-markdown:5.1.0=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.clikt:clikt:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-core:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt-markdown:5.0.3=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.clikt:clikt:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.ajalt.colormath:colormath:3.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-core:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant-markdown:3.0.2=runtimeClasspath,testRuntimeClasspath -com.github.ajalt.mordant:mordant:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-core:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant-markdown:3.0.1=runtimeClasspath,testRuntimeClasspath +com.github.ajalt.mordant:mordant:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.palantir.javapoet:javapoet:0.14.0=runtimeClasspath,testRuntimeClasspath com.squareup:kotlinpoet:1.6.0=runtimeClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=runtimeClasspath,testRuntimeClasspath @@ -36,20 +36,17 @@ org.graalvm.sdk:word:25.0.1=runtimeClasspath,testRuntimeClasspath org.graalvm.truffle:truffle-api:25.0.1=runtimeClasspath,testRuntimeClasspath org.graalvm.truffle:truffle-compiler:25.0.1=runtimeClasspath,testRuntimeClasspath org.graalvm.truffle:truffle-runtime:25.0.1=runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-bom:2.2.21=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-reflect:2.2.21=runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlinx:kotlinx-html-jvm:0.12.0=runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.1=runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.8.1=runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.1=runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.8.1=runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1=runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0=runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.9.0=runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.9.0=runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.9.0=runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0=runtimeClasspath,testRuntimeClasspath org.jetbrains:annotations:13.0=compileClasspath,testCompileClasspath org.jetbrains:annotations:23.0.0=runtimeClasspath,testRuntimeClasspath org.jetbrains:markdown-jvm:0.7.3=runtimeClasspath,testRuntimeClasspath diff --git a/stdlib/gradle.lockfile b/stdlib/gradle.lockfile index d9cca301..bfcfbbf4 100644 --- a/stdlib/gradle.lockfile +++ b/stdlib/gradle.lockfile @@ -1,6 +1,5 @@ # 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. -org.jetbrains.kotlin:kotlin-bom:2.2.21=pklFormatter org.jspecify:jspecify:1.0.0=pklFormatter empty=signatures