mirror of
https://github.com/apple/pkl.git
synced 2026-07-11 23:52:39 +02:00
Drop java 11, bump GraalVM to 23.0 (#439)
* Remove unnecessary strictfp modifier * Add annotations to address Truffle DSL warnings (@Idempotent, @Exclusive) * Adjust build logic to allow building cross-arch on macOS * Add warning suppression for specialization limit (left this one as a TODO)
This commit is contained in:
Daniel Chao
+1
-22
@@ -21,9 +21,7 @@ import "jobs/GradleCheckJob.pkl"
|
|||||||
import "jobs/DeployJob.pkl"
|
import "jobs/DeployJob.pkl"
|
||||||
import "jobs/SimpleGradleJob.pkl"
|
import "jobs/SimpleGradleJob.pkl"
|
||||||
|
|
||||||
local prbJobs: Listing<String> = (gradleCheckJobs.keys.toListing()) {
|
local prbJobs: Listing<String> = gradleCheckJobs.keys.toListing()
|
||||||
"check-patch-file"
|
|
||||||
}
|
|
||||||
|
|
||||||
local buildAndTestJobs = (prbJobs) {
|
local buildAndTestJobs = (prbJobs) {
|
||||||
"bench"
|
"bench"
|
||||||
@@ -140,10 +138,6 @@ local buildNativeJobs: Mapping<String, BuildNativeJob> = new {
|
|||||||
}
|
}
|
||||||
|
|
||||||
local gradleCheckJobs: Mapping<String, GradleCheckJob> = new {
|
local gradleCheckJobs: Mapping<String, GradleCheckJob> = new {
|
||||||
["gradle-check-jdk11"] {
|
|
||||||
javaVersion = "11.0"
|
|
||||||
isRelease = false
|
|
||||||
}
|
|
||||||
["gradle-check-jdk17"] {
|
["gradle-check-jdk17"] {
|
||||||
javaVersion = "17.0"
|
javaVersion = "17.0"
|
||||||
isRelease = false
|
isRelease = false
|
||||||
@@ -197,19 +191,4 @@ jobs {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
["check-patch-file"] {
|
|
||||||
docker {
|
|
||||||
new { image = "cimg/base:current" }
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
"checkout"
|
|
||||||
new RunStep {
|
|
||||||
// language=bash
|
|
||||||
command = #"""
|
|
||||||
git apply --reject patches/graalVm23.patch
|
|
||||||
"""#
|
|
||||||
}
|
|
||||||
}
|
|
||||||
resource_class = "small"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-70
@@ -30,7 +30,7 @@ jobs:
|
|||||||
LANG: en_US.UTF-8
|
LANG: en_US.UTF-8
|
||||||
resource_class: macos.m1.large.gen1
|
resource_class: macos.m1.large.gen1
|
||||||
macos:
|
macos:
|
||||||
xcode: 15.2.0
|
xcode: 15.3.0
|
||||||
pkl-cli-linux-amd64-release:
|
pkl-cli-linux-amd64-release:
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
@@ -46,7 +46,7 @@ jobs:
|
|||||||
|
|
||||||
# install jdk
|
# install jdk
|
||||||
curl -L \
|
curl -L \
|
||||||
https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.20.1_1.tar.gz -o /tmp/jdk.tar.gz
|
https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz
|
||||||
|
|
||||||
mkdir /jdk \
|
mkdir /jdk \
|
||||||
&& cd /jdk \
|
&& cd /jdk \
|
||||||
@@ -117,8 +117,6 @@ jobs:
|
|||||||
pkl-cli-macOS-aarch64-release:
|
pkl-cli-macOS-aarch64-release:
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run:
|
|
||||||
command: git apply patches/graalVm23.patch
|
|
||||||
- run:
|
- run:
|
||||||
command: |-
|
command: |-
|
||||||
export PATH=~/staticdeps/bin:$PATH
|
export PATH=~/staticdeps/bin:$PATH
|
||||||
@@ -140,7 +138,7 @@ jobs:
|
|||||||
LANG: en_US.UTF-8
|
LANG: en_US.UTF-8
|
||||||
resource_class: macos.m1.large.gen1
|
resource_class: macos.m1.large.gen1
|
||||||
macos:
|
macos:
|
||||||
xcode: 15.2.0
|
xcode: 15.3.0
|
||||||
pkl-cli-linux-aarch64-release:
|
pkl-cli-linux-aarch64-release:
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
@@ -156,7 +154,7 @@ jobs:
|
|||||||
|
|
||||||
# install jdk
|
# install jdk
|
||||||
curl -L \
|
curl -L \
|
||||||
https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.20.1_1.tar.gz -o /tmp/jdk.tar.gz
|
https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz
|
||||||
|
|
||||||
mkdir /jdk \
|
mkdir /jdk \
|
||||||
&& cd /jdk \
|
&& cd /jdk \
|
||||||
@@ -223,7 +221,7 @@ jobs:
|
|||||||
|
|
||||||
# install jdk
|
# install jdk
|
||||||
curl -L \
|
curl -L \
|
||||||
https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.20.1_1.tar.gz -o /tmp/jdk.tar.gz
|
https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz
|
||||||
|
|
||||||
mkdir /jdk \
|
mkdir /jdk \
|
||||||
&& cd /jdk \
|
&& cd /jdk \
|
||||||
@@ -318,7 +316,7 @@ jobs:
|
|||||||
LANG: en_US.UTF-8
|
LANG: en_US.UTF-8
|
||||||
resource_class: macos.m1.large.gen1
|
resource_class: macos.m1.large.gen1
|
||||||
macos:
|
macos:
|
||||||
xcode: 15.2.0
|
xcode: 15.3.0
|
||||||
pkl-cli-linux-amd64-snapshot:
|
pkl-cli-linux-amd64-snapshot:
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
@@ -334,7 +332,7 @@ jobs:
|
|||||||
|
|
||||||
# install jdk
|
# install jdk
|
||||||
curl -L \
|
curl -L \
|
||||||
https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.20.1_1.tar.gz -o /tmp/jdk.tar.gz
|
https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz
|
||||||
|
|
||||||
mkdir /jdk \
|
mkdir /jdk \
|
||||||
&& cd /jdk \
|
&& cd /jdk \
|
||||||
@@ -405,8 +403,6 @@ jobs:
|
|||||||
pkl-cli-macOS-aarch64-snapshot:
|
pkl-cli-macOS-aarch64-snapshot:
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run:
|
|
||||||
command: git apply patches/graalVm23.patch
|
|
||||||
- run:
|
- run:
|
||||||
command: |-
|
command: |-
|
||||||
export PATH=~/staticdeps/bin:$PATH
|
export PATH=~/staticdeps/bin:$PATH
|
||||||
@@ -428,7 +424,7 @@ jobs:
|
|||||||
LANG: en_US.UTF-8
|
LANG: en_US.UTF-8
|
||||||
resource_class: macos.m1.large.gen1
|
resource_class: macos.m1.large.gen1
|
||||||
macos:
|
macos:
|
||||||
xcode: 15.2.0
|
xcode: 15.3.0
|
||||||
pkl-cli-linux-aarch64-snapshot:
|
pkl-cli-linux-aarch64-snapshot:
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
@@ -444,7 +440,7 @@ jobs:
|
|||||||
|
|
||||||
# install jdk
|
# install jdk
|
||||||
curl -L \
|
curl -L \
|
||||||
https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.20.1_1.tar.gz -o /tmp/jdk.tar.gz
|
https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz
|
||||||
|
|
||||||
mkdir /jdk \
|
mkdir /jdk \
|
||||||
&& cd /jdk \
|
&& cd /jdk \
|
||||||
@@ -511,7 +507,7 @@ jobs:
|
|||||||
|
|
||||||
# install jdk
|
# install jdk
|
||||||
curl -L \
|
curl -L \
|
||||||
https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.20.1_1.tar.gz -o /tmp/jdk.tar.gz
|
https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz -o /tmp/jdk.tar.gz
|
||||||
|
|
||||||
mkdir /jdk \
|
mkdir /jdk \
|
||||||
&& cd /jdk \
|
&& cd /jdk \
|
||||||
@@ -579,24 +575,6 @@ jobs:
|
|||||||
resource_class: xlarge
|
resource_class: xlarge
|
||||||
docker:
|
docker:
|
||||||
- image: oraclelinux:8-slim
|
- image: oraclelinux:8-slim
|
||||||
gradle-check-jdk11:
|
|
||||||
steps:
|
|
||||||
- checkout
|
|
||||||
- run:
|
|
||||||
command: ./gradlew --info --stacktrace check
|
|
||||||
name: gradle check
|
|
||||||
- run:
|
|
||||||
command: |-
|
|
||||||
mkdir ~/test-results/
|
|
||||||
find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/ \;
|
|
||||||
name: Gather test results
|
|
||||||
when: always
|
|
||||||
- store_test_results:
|
|
||||||
path: ~/test-results
|
|
||||||
environment:
|
|
||||||
LANG: en_US.UTF-8
|
|
||||||
docker:
|
|
||||||
- image: cimg/openjdk:11.0
|
|
||||||
gradle-check-jdk17:
|
gradle-check-jdk17:
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
@@ -736,14 +714,6 @@ jobs:
|
|||||||
name: Publish release on GitHub
|
name: Publish release on GitHub
|
||||||
docker:
|
docker:
|
||||||
- image: maniator/gh:v2.40.1
|
- image: maniator/gh:v2.40.1
|
||||||
check-patch-file:
|
|
||||||
steps:
|
|
||||||
- checkout
|
|
||||||
- run:
|
|
||||||
command: git apply --reject patches/graalVm23.patch
|
|
||||||
resource_class: small
|
|
||||||
docker:
|
|
||||||
- image: cimg/base:current
|
|
||||||
trigger-docsite-build:
|
trigger-docsite-build:
|
||||||
steps:
|
steps:
|
||||||
- run:
|
- run:
|
||||||
@@ -777,28 +747,20 @@ workflows:
|
|||||||
type: approval
|
type: approval
|
||||||
- pr-approval/authenticate:
|
- pr-approval/authenticate:
|
||||||
context: pkl-pr-approval
|
context: pkl-pr-approval
|
||||||
- gradle-check-jdk11:
|
|
||||||
requires:
|
|
||||||
- hold
|
|
||||||
- gradle-check-jdk17:
|
- gradle-check-jdk17:
|
||||||
requires:
|
requires:
|
||||||
- hold
|
- hold
|
||||||
- gradle-check-jdk21:
|
- gradle-check-jdk21:
|
||||||
requires:
|
requires:
|
||||||
- hold
|
- hold
|
||||||
- check-patch-file:
|
|
||||||
requires:
|
|
||||||
- hold
|
|
||||||
when:
|
when:
|
||||||
matches:
|
matches:
|
||||||
value: << pipeline.git.branch >>
|
value: << pipeline.git.branch >>
|
||||||
pattern: ^pull/\d+(/head)?$
|
pattern: ^pull/\d+(/head)?$
|
||||||
main:
|
main:
|
||||||
jobs:
|
jobs:
|
||||||
- gradle-check-jdk11
|
|
||||||
- gradle-check-jdk17
|
- gradle-check-jdk17
|
||||||
- gradle-check-jdk21
|
- gradle-check-jdk21
|
||||||
- check-patch-file
|
|
||||||
- bench
|
- bench
|
||||||
- gradle-compatibility
|
- gradle-compatibility
|
||||||
- pkl-cli-macOS-amd64-snapshot
|
- pkl-cli-macOS-amd64-snapshot
|
||||||
@@ -808,10 +770,8 @@ workflows:
|
|||||||
- pkl-cli-linux-alpine-amd64-snapshot
|
- pkl-cli-linux-alpine-amd64-snapshot
|
||||||
- deploy-snapshot:
|
- deploy-snapshot:
|
||||||
requires:
|
requires:
|
||||||
- gradle-check-jdk11
|
|
||||||
- gradle-check-jdk17
|
- gradle-check-jdk17
|
||||||
- gradle-check-jdk21
|
- gradle-check-jdk21
|
||||||
- check-patch-file
|
|
||||||
- bench
|
- bench
|
||||||
- gradle-compatibility
|
- gradle-compatibility
|
||||||
- pkl-cli-macOS-amd64-snapshot
|
- pkl-cli-macOS-amd64-snapshot
|
||||||
@@ -831,12 +791,6 @@ workflows:
|
|||||||
- << pipeline.git.branch >>
|
- << pipeline.git.branch >>
|
||||||
release:
|
release:
|
||||||
jobs:
|
jobs:
|
||||||
- gradle-check-jdk11:
|
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
ignore: /.*/
|
|
||||||
tags:
|
|
||||||
only: /^v?\d+\.\d+\.\d+$/
|
|
||||||
- gradle-check-jdk17:
|
- gradle-check-jdk17:
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
@@ -849,12 +803,6 @@ workflows:
|
|||||||
ignore: /.*/
|
ignore: /.*/
|
||||||
tags:
|
tags:
|
||||||
only: /^v?\d+\.\d+\.\d+$/
|
only: /^v?\d+\.\d+\.\d+$/
|
||||||
- check-patch-file:
|
|
||||||
filters:
|
|
||||||
branches:
|
|
||||||
ignore: /.*/
|
|
||||||
tags:
|
|
||||||
only: /^v?\d+\.\d+\.\d+$/
|
|
||||||
- bench:
|
- bench:
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
@@ -899,10 +847,8 @@ workflows:
|
|||||||
only: /^v?\d+\.\d+\.\d+$/
|
only: /^v?\d+\.\d+\.\d+$/
|
||||||
- github-release:
|
- github-release:
|
||||||
requires:
|
requires:
|
||||||
- gradle-check-jdk11
|
|
||||||
- gradle-check-jdk17
|
- gradle-check-jdk17
|
||||||
- gradle-check-jdk21
|
- gradle-check-jdk21
|
||||||
- check-patch-file
|
|
||||||
- bench
|
- bench
|
||||||
- gradle-compatibility
|
- gradle-compatibility
|
||||||
- pkl-cli-macOS-amd64-release
|
- pkl-cli-macOS-amd64-release
|
||||||
@@ -941,18 +887,12 @@ workflows:
|
|||||||
type: approval
|
type: approval
|
||||||
- pr-approval/authenticate:
|
- pr-approval/authenticate:
|
||||||
context: pkl-pr-approval
|
context: pkl-pr-approval
|
||||||
- gradle-check-jdk11:
|
|
||||||
requires:
|
|
||||||
- hold
|
|
||||||
- gradle-check-jdk17:
|
- gradle-check-jdk17:
|
||||||
requires:
|
requires:
|
||||||
- hold
|
- hold
|
||||||
- gradle-check-jdk21:
|
- gradle-check-jdk21:
|
||||||
requires:
|
requires:
|
||||||
- hold
|
- hold
|
||||||
- check-patch-file:
|
|
||||||
requires:
|
|
||||||
- hold
|
|
||||||
- bench:
|
- bench:
|
||||||
requires:
|
requires:
|
||||||
- hold
|
- hold
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ arch: "amd64"|"aarch64"
|
|||||||
musl: Boolean = false
|
musl: Boolean = false
|
||||||
|
|
||||||
local setupLinuxEnvironment: Config.RunStep =
|
local setupLinuxEnvironment: Config.RunStep =
|
||||||
let (jdkVersion = "11.0.20.1+1")
|
let (jdkVersion = "17.0.9+9")
|
||||||
let (muslVersion = "1.2.2")
|
let (muslVersion = "1.2.2")
|
||||||
let (zlibVersion = "1.2.13")
|
let (zlibVersion = "1.2.13")
|
||||||
let (jdkVersionEncoded = URI.encodeComponent(jdkVersion))
|
let (jdkVersionEncoded = URI.encodeComponent(jdkVersion))
|
||||||
@@ -116,14 +116,6 @@ steps {
|
|||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If building macOS/aarch64, we need to use GraalVM 23.
|
|
||||||
// We can't use GraalVM 23 for any other build because we need to support Java 11, which was
|
|
||||||
// dropped in GraalVM 23.
|
|
||||||
when (os == "macOS" && arch == "aarch64") {
|
|
||||||
new Config.RunStep {
|
|
||||||
command = "git apply patches/graalVm23.patch"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
new Config.RunStep {
|
new Config.RunStep {
|
||||||
name = "gradle buildNative"
|
name = "gradle buildNative"
|
||||||
local _os =
|
local _os =
|
||||||
@@ -147,10 +139,8 @@ steps {
|
|||||||
job {
|
job {
|
||||||
when (os == "macOS") {
|
when (os == "macOS") {
|
||||||
macos {
|
macos {
|
||||||
xcode = "15.2.0"
|
xcode = "15.3.0"
|
||||||
}
|
}
|
||||||
// Use M1 for all architectures. We build amd64/aarch64 based on the GraalVM version,
|
|
||||||
// which gets patched in via `git apply patches/graalVm23.patch`.
|
|
||||||
resource_class = "macos.m1.large.gen1"
|
resource_class = "macos.m1.large.gen1"
|
||||||
} else {
|
} else {
|
||||||
docker {
|
docker {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ jmh {
|
|||||||
// jvmArgsAppend = "-Dgraal.TruffleCompilationExceptionsAreFatal=true " +
|
// jvmArgsAppend = "-Dgraal.TruffleCompilationExceptionsAreFatal=true " +
|
||||||
// "-Dgraal.Dump=Truffle,TruffleTree -Dgraal.TraceTruffleCompilation=true " +
|
// "-Dgraal.Dump=Truffle,TruffleTree -Dgraal.TraceTruffleCompilation=true " +
|
||||||
// "-Dgraal.TruffleFunctionInlining=false"
|
// "-Dgraal.TruffleFunctionInlining=false"
|
||||||
jvm.set("${buildInfo.graalVm.baseDir}/bin/java")
|
jvm.set("${buildInfo.graalVmAmd64.baseDir}/bin/java")
|
||||||
// see: https://docs.oracle.com/en/graalvm/enterprise/20/docs/graalvm-as-a-platform/implement-language/#disable-class-path-separation
|
// see: https://docs.oracle.com/en/graalvm/enterprise/20/docs/graalvm-as-a-platform/implement-language/#disable-class-path-separation
|
||||||
jvmArgs.set(
|
jvmArgs.set(
|
||||||
listOf(
|
listOf(
|
||||||
@@ -38,7 +38,7 @@ jmh {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.named("jmh") {
|
tasks.named("jmh") {
|
||||||
dependsOn(":installGraalVm")
|
dependsOn(":installGraalVmAmd64")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prevent this error which occurs when building in IntelliJ:
|
// Prevent this error which occurs when building in IntelliJ:
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhImplementationDe
|
|||||||
org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
|
org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.compiler:compiler:22.3.3=graal
|
org.graalvm.compiler:compiler:23.0.2=graal
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=graal,jmh,jmhRuntimeClasspath,truffle
|
org.graalvm.sdk:graal-sdk:23.0.2=graal,jmh,jmhRuntimeClasspath,truffle
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=graal,jmh,jmhRuntimeClasspath,truffle
|
org.graalvm.truffle:truffle-api:23.0.2=graal,jmh,jmhRuntimeClasspath,truffle
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
@@ -18,15 +18,15 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_11
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
target {
|
target {
|
||||||
compilations.configureEach {
|
compilations.configureEach {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "11"
|
jvmTarget = "17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,9 +9,7 @@ import org.gradle.kotlin.dsl.getByType
|
|||||||
// `buildInfo` in main build scripts
|
// `buildInfo` in main build scripts
|
||||||
// `project.extensions.getByType<BuildInfo>()` in precompiled script plugins
|
// `project.extensions.getByType<BuildInfo>()` in precompiled script plugins
|
||||||
open class BuildInfo(project: Project) {
|
open class BuildInfo(project: Project) {
|
||||||
val self = this
|
inner class GraalVm(val arch: String) {
|
||||||
|
|
||||||
inner class GraalVm {
|
|
||||||
val homeDir: String by lazy {
|
val homeDir: String by lazy {
|
||||||
System.getenv("GRAALVM_HOME") ?: "${System.getProperty("user.home")}/.graalvm"
|
System.getenv("GRAALVM_HOME") ?: "${System.getProperty("user.home")}/.graalvm"
|
||||||
}
|
}
|
||||||
@@ -20,21 +18,12 @@ open class BuildInfo(project: Project) {
|
|||||||
libs.findVersion("graalVm").get().toString()
|
libs.findVersion("graalVm").get().toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
val isGraal22: Boolean by lazy {
|
val graalVmJdkVersion: String by lazy {
|
||||||
version.startsWith("22")
|
libs.findVersion("graalVmJdkVersion").get().toString()
|
||||||
}
|
|
||||||
|
|
||||||
val arch by lazy {
|
|
||||||
if (os.isMacOsX && isGraal22) {
|
|
||||||
"amd64"
|
|
||||||
} else {
|
|
||||||
self.arch
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val osName: String by lazy {
|
val osName: String by lazy {
|
||||||
when {
|
when {
|
||||||
os.isMacOsX && isGraal22 -> "darwin"
|
|
||||||
os.isMacOsX -> "macos"
|
os.isMacOsX -> "macos"
|
||||||
os.isLinux -> "linux"
|
os.isLinux -> "linux"
|
||||||
else -> throw RuntimeException("${os.familyName} is not supported.")
|
else -> throw RuntimeException("${os.familyName} is not supported.")
|
||||||
@@ -42,25 +31,12 @@ open class BuildInfo(project: Project) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val baseName: String by lazy {
|
val baseName: String by lazy {
|
||||||
if (graalVm.isGraal22) {
|
"graalvm-jdk-${graalVmJdkVersion}_${osName}-${arch}_bin"
|
||||||
"graalvm-ce-java11-${osName}-${arch}-${version}"
|
|
||||||
} else {
|
|
||||||
"graalvm-jdk-${graalVM23JdkVersion}_${osName}-${arch}_bin"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val graalVM23JdkVersion: String by lazy {
|
|
||||||
libs.findVersion("graalVM23JdkVersion").get().requiredVersion
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val downloadUrl: String by lazy {
|
val downloadUrl: String by lazy {
|
||||||
if (isGraal22) {
|
val jdkMajor = graalVmJdkVersion.takeWhile { it != '.' }
|
||||||
"https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-" +
|
"https://download.oracle.com/graalvm/$jdkMajor/archive/$baseName.tar.gz"
|
||||||
"${version}/$baseName.tar.gz"
|
|
||||||
} else {
|
|
||||||
val jdkMajor = graalVM23JdkVersion.takeWhile { it != '.' }
|
|
||||||
"https://download.oracle.com/graalvm/$jdkMajor/archive/$baseName.tar.gz"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val installDir: File by lazy {
|
val installDir: File by lazy {
|
||||||
@@ -84,7 +60,9 @@ open class BuildInfo(project: Project) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val graalVm: GraalVm = GraalVm()
|
val graalVmAarch64: GraalVm = GraalVm("aarch64")
|
||||||
|
|
||||||
|
val graalVmAmd64: GraalVm = GraalVm("x64")
|
||||||
|
|
||||||
val isCiBuild: Boolean by lazy {
|
val isCiBuild: Boolean by lazy {
|
||||||
System.getenv("CI") != null
|
System.getenv("CI") != null
|
||||||
|
|||||||
@@ -24,13 +24,13 @@ configurations {
|
|||||||
|
|
||||||
plugins.withType(JavaPlugin::class).configureEach {
|
plugins.withType(JavaPlugin::class).configureEach {
|
||||||
val java = project.extensions.getByType<JavaPluginExtension>()
|
val java = project.extensions.getByType<JavaPluginExtension>()
|
||||||
java.sourceCompatibility = JavaVersion.VERSION_11
|
java.sourceCompatibility = JavaVersion.VERSION_17
|
||||||
java.targetCompatibility = JavaVersion.VERSION_11
|
java.targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<KotlinCompile>().configureEach {
|
tasks.withType<KotlinCompile>().configureEach {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "11"
|
jvmTarget = "17"
|
||||||
freeCompilerArgs = freeCompilerArgs + listOf("-Xjsr305=strict", "-Xjvm-default=all")
|
freeCompilerArgs = freeCompilerArgs + listOf("-Xjsr305=strict", "-Xjvm-default=all")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,55 +9,80 @@ plugins {
|
|||||||
|
|
||||||
val buildInfo = project.extensions.getByType<BuildInfo>()
|
val buildInfo = project.extensions.getByType<BuildInfo>()
|
||||||
|
|
||||||
val homeDir = buildInfo.graalVm.homeDir
|
val BuildInfo.GraalVm.downloadFile get() = file(homeDir).resolve("${baseName}.tar.gz")
|
||||||
val baseName = buildInfo.graalVm.baseName
|
|
||||||
val installDir = buildInfo.graalVm.installDir
|
|
||||||
val downloadUrl = buildInfo.graalVm.downloadUrl
|
|
||||||
val downloadFile = file(homeDir).resolve("$baseName.tar.gz")
|
|
||||||
|
|
||||||
// tries to minimize chance of corruption by download-to-temp-file-and-move
|
// tries to minimize chance of corruption by download-to-temp-file-and-move
|
||||||
val downloadGraalVm by tasks.registering(Download::class) {
|
val downloadGraalVmAarch64 by tasks.registering(Download::class) {
|
||||||
|
configureDownloadGraalVm(buildInfo.graalVmAarch64)
|
||||||
|
}
|
||||||
|
|
||||||
|
val downloadGraalVmAmd64 by tasks.registering(Download::class) {
|
||||||
|
configureDownloadGraalVm(buildInfo.graalVmAmd64)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Download.configureDownloadGraalVm(graalvm: BuildInfo.GraalVm) {
|
||||||
onlyIf {
|
onlyIf {
|
||||||
!installDir.exists()
|
!graalvm.installDir.exists()
|
||||||
|
}
|
||||||
|
doLast {
|
||||||
|
println("Downloaded GraalVm to ${graalvm.downloadFile}")
|
||||||
}
|
}
|
||||||
|
|
||||||
src(downloadUrl)
|
src(graalvm.downloadUrl)
|
||||||
dest(downloadFile)
|
dest(graalvm.downloadFile)
|
||||||
overwrite(false)
|
overwrite(false)
|
||||||
tempAndMove(true)
|
tempAndMove(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
val verifyGraalVm by tasks.registering(Verify::class) {
|
val verifyGraalVmAarch64 by tasks.registering(Verify::class) {
|
||||||
|
configureVerifyGraalVm(buildInfo.graalVmAarch64)
|
||||||
|
dependsOn(downloadGraalVmAarch64)
|
||||||
|
}
|
||||||
|
|
||||||
|
val verifyGraalVmAmd64 by tasks.registering(Verify::class) {
|
||||||
|
configureVerifyGraalVm(buildInfo.graalVmAmd64)
|
||||||
|
dependsOn(downloadGraalVmAmd64)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Verify.configureVerifyGraalVm(graalvm: BuildInfo.GraalVm) {
|
||||||
onlyIf {
|
onlyIf {
|
||||||
!installDir.exists()
|
!graalvm.installDir.exists()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependsOn(downloadGraalVm)
|
src(graalvm.downloadFile)
|
||||||
src(downloadFile)
|
checksum(buildInfo.libs.findVersion("graalVmSha256-${graalvm.osName}-${graalvm.arch}").get().toString())
|
||||||
checksum(buildInfo.libs.findVersion("graalVmSha256-${buildInfo.graalVm.osName}-${buildInfo.graalVm.arch}").get().toString())
|
|
||||||
algorithm("SHA-256")
|
algorithm("SHA-256")
|
||||||
}
|
}
|
||||||
|
|
||||||
// minimize chance of corruption by extract-to-random-dir-and-flip-symlink
|
// minimize chance of corruption by extract-to-random-dir-and-flip-symlink
|
||||||
val installGraalVm by tasks.registering {
|
val installGraalVmAarch64 by tasks.registering {
|
||||||
dependsOn(verifyGraalVm)
|
dependsOn(verifyGraalVmAarch64)
|
||||||
|
configureInstallGraalVm(buildInfo.graalVmAarch64)
|
||||||
|
}
|
||||||
|
|
||||||
|
// minimize chance of corruption by extract-to-random-dir-and-flip-symlink
|
||||||
|
val installGraalVmAmd64 by tasks.registering {
|
||||||
|
dependsOn(verifyGraalVmAmd64)
|
||||||
|
configureInstallGraalVm(buildInfo.graalVmAmd64)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Task.configureInstallGraalVm(graalVm: BuildInfo.GraalVm) {
|
||||||
onlyIf {
|
onlyIf {
|
||||||
!installDir.exists()
|
!graalVm.installDir.exists()
|
||||||
}
|
}
|
||||||
|
|
||||||
doLast {
|
doLast {
|
||||||
val distroDir = "$homeDir/${UUID.randomUUID()}"
|
val distroDir = "${graalVm.homeDir}/${UUID.randomUUID()}"
|
||||||
|
|
||||||
try {
|
try {
|
||||||
mkdir(distroDir)
|
mkdir(distroDir)
|
||||||
|
|
||||||
println("Extracting $downloadFile into $distroDir")
|
println("Extracting ${graalVm.downloadFile} into $distroDir")
|
||||||
// faster and more reliable than Gradle's `copy { from tarTree() }`
|
// faster and more reliable than Gradle's `copy { from tarTree() }`
|
||||||
exec {
|
exec {
|
||||||
workingDir = file(distroDir)
|
workingDir = file(distroDir)
|
||||||
executable = "tar"
|
executable = "tar"
|
||||||
args("--strip-components=1", "-xzf", downloadFile)
|
args("--strip-components=1", "-xzf", graalVm.downloadFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
val distroBinDir = if (buildInfo.os.isMacOsX) "$distroDir/Contents/Home/bin" else "$distroDir/bin"
|
val distroBinDir = if (buildInfo.os.isMacOsX) "$distroDir/Contents/Home/bin" else "$distroDir/bin"
|
||||||
@@ -68,11 +93,11 @@ val installGraalVm by tasks.registering {
|
|||||||
args("install", "--no-progress", "native-image")
|
args("install", "--no-progress", "native-image")
|
||||||
}
|
}
|
||||||
|
|
||||||
println("Creating symlink $installDir for $distroDir")
|
println("Creating symlink ${graalVm.installDir} for $distroDir")
|
||||||
val tempLink = Paths.get("$homeDir/${UUID.randomUUID()}")
|
val tempLink = Paths.get("${graalVm.homeDir}/${UUID.randomUUID()}")
|
||||||
Files.createSymbolicLink(tempLink, Paths.get(distroDir))
|
Files.createSymbolicLink(tempLink, Paths.get(distroDir))
|
||||||
try {
|
try {
|
||||||
Files.move(tempLink, installDir.toPath(), StandardCopyOption.ATOMIC_MOVE)
|
Files.move(tempLink, graalVm.installDir.toPath(), StandardCopyOption.ATOMIC_MOVE)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
try { delete(tempLink.toFile()) } catch (ignored: Exception) {}
|
try { delete(tempLink.toFile()) } catch (ignored: Exception) {}
|
||||||
throw e
|
throw e
|
||||||
|
|||||||
@@ -61,4 +61,7 @@ val workAroundKotlinGradlePluginBug by tasks.registering {
|
|||||||
|
|
||||||
tasks.compileJava {
|
tasks.compileJava {
|
||||||
dependsOn(workAroundKotlinGradlePluginBug)
|
dependsOn(workAroundKotlinGradlePluginBug)
|
||||||
|
// TODO: determine correct limits for Truffle specializations
|
||||||
|
// (see https://graalvm.slack.com/archives/CNQSB2DHD/p1712380902746829)
|
||||||
|
options.compilerArgs.add("-Atruffle.dsl.SuppressWarnings=truffle-limit")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependen
|
|||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=testRuntimeClasspath
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
@@ -4,17 +4,17 @@ assertj = "3.+"
|
|||||||
checksumPlugin = "1.2.0"
|
checksumPlugin = "1.2.0"
|
||||||
clikt = "3.5.1"
|
clikt = "3.5.1"
|
||||||
commonMark = "0.+"
|
commonMark = "0.+"
|
||||||
downloadTaskPlugin = "4.1.2"
|
downloadTaskPlugin = "5.6.0"
|
||||||
geantyref = "1.+"
|
geantyref = "1.+"
|
||||||
googleJavaFormat = "1.21.0"
|
googleJavaFormat = "1.21.0"
|
||||||
# must not use `+` because used in download URL
|
# must not use `+` because used in download URL
|
||||||
graalVm = "22.3.3"
|
graalVm = "23.0.2"
|
||||||
# intentionally empty; replaced by patch file when building pkl-cli macos/aarch64
|
graalVmJdkVersion = "17.0.10"
|
||||||
graalVM23JdkVersion = "replace-me"
|
|
||||||
# slightly hacky but convenient place so we remember to update the checksum
|
# slightly hacky but convenient place so we remember to update the checksum
|
||||||
graalVmSha256-darwin-amd64 = "cab6a1436626adc28ec0f72791772315678e7c758e2fbae2cb6758a38f27c56a"
|
graalVmSha256-macos-x64 = "14f4bd6417809905f86e786c779d0fc2feb840d7dac35ae3503eb25af0530da0"
|
||||||
graalVmSha256-linux-amd64 = "959154e1248108dcd6eb279032cecdd2a6076bdebb345de9532681185231d255"
|
graalVmSha256-macos-aarch64 = "e944c5ce5da56e683fc8f1a57191b46d9cb702930b1688bda064fcf467d876b8"
|
||||||
graalVmSha256-linux-aarch64 = "177d682f3455d00fa2491246e809d9c9b743187a82115ad3f578998b4935d5a1"
|
graalVmSha256-linux-x64 = "112dc9b92d81a946f1b5b334646151b790785c813e76fcf13527a319003d7e2c"
|
||||||
|
graalVmSha256-linux-aarch64 = "c95ac550d070f06666cf8c1023a098380dd565be00866473caf6ff1b7cdf680c"
|
||||||
ideaExtPlugin = "1.1"
|
ideaExtPlugin = "1.1"
|
||||||
javaPoet = "1.+"
|
javaPoet = "1.+"
|
||||||
javaxInject = "1"
|
javaxInject = "1"
|
||||||
|
|||||||
@@ -1,683 +0,0 @@
|
|||||||
diff --git a/bench/gradle.lockfile b/bench/gradle.lockfile
|
|
||||||
index 919f7a9..536ff5c 100644
|
|
||||||
--- a/bench/gradle.lockfile
|
|
||||||
+++ b/bench/gradle.lockfile
|
|
||||||
@@ -8,9 +8,9 @@ net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhImplementationDe
|
|
||||||
org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.compiler:compiler:22.3.3=graal
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=graal,jmh,jmhRuntimeClasspath,truffle
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=graal,jmh,jmhRuntimeClasspath,truffle
|
|
||||||
+org.graalvm.compiler:compiler:23.0.2=graal
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=graal,jmh,jmhRuntimeClasspath,truffle
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=graal,jmh,jmhRuntimeClasspath,truffle
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
|
|
||||||
index e8bf117..770845b 100644
|
|
||||||
--- a/buildSrc/build.gradle.kts
|
|
||||||
+++ b/buildSrc/build.gradle.kts
|
|
||||||
@@ -18,15 +18,15 @@ dependencies {
|
|
||||||
}
|
|
||||||
|
|
||||||
java {
|
|
||||||
- sourceCompatibility = JavaVersion.VERSION_11
|
|
||||||
- targetCompatibility = JavaVersion.VERSION_11
|
|
||||||
+ sourceCompatibility = JavaVersion.VERSION_17
|
|
||||||
+ targetCompatibility = JavaVersion.VERSION_17
|
|
||||||
}
|
|
||||||
|
|
||||||
kotlin {
|
|
||||||
target {
|
|
||||||
compilations.configureEach {
|
|
||||||
kotlinOptions {
|
|
||||||
- jvmTarget = "11"
|
|
||||||
+ jvmTarget = "17"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
diff --git a/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts b/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts
|
|
||||||
index 4daf287..6ef0256 100644
|
|
||||||
--- a/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts
|
|
||||||
+++ b/buildSrc/src/main/kotlin/pklAllProjects.gradle.kts
|
|
||||||
@@ -24,13 +24,13 @@ configurations {
|
|
||||||
|
|
||||||
plugins.withType(JavaPlugin::class).configureEach {
|
|
||||||
val java = project.extensions.getByType<JavaPluginExtension>()
|
|
||||||
- java.sourceCompatibility = JavaVersion.VERSION_11
|
|
||||||
- java.targetCompatibility = JavaVersion.VERSION_11
|
|
||||||
+ java.sourceCompatibility = JavaVersion.VERSION_17
|
|
||||||
+ java.targetCompatibility = JavaVersion.VERSION_17
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType<KotlinCompile>().configureEach {
|
|
||||||
kotlinOptions {
|
|
||||||
- jvmTarget = "11"
|
|
||||||
+ jvmTarget = "17"
|
|
||||||
freeCompilerArgs = freeCompilerArgs + listOf("-Xjsr305=strict", "-Xjvm-default=all")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
diff --git a/docs/gradle.lockfile b/docs/gradle.lockfile
|
|
||||||
index 5ad9ae3..87b4fd4 100644
|
|
||||||
--- a/docs/gradle.lockfile
|
|
||||||
+++ b/docs/gradle.lockfile
|
|
||||||
@@ -2,13 +2,13 @@
|
|
||||||
# Manual edits can break the build and are not advised.
|
|
||||||
# This file is expected to be part of source control.
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-io.leangen.geantyref:geantyref:1.3.15=testRuntimeClasspath
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+io.leangen.geantyref:geantyref:1.3.14=testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=testRuntimeClasspath
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
@@ -24,13 +24,13 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=testCompileClasspath,testImplemen
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit:junit-bom:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-engine:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit:junit-bom:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.organicdesign:Paguro:3.10.3=testRuntimeClasspath
|
|
||||||
org.snakeyaml:snakeyaml-engine:2.5=testRuntimeClasspath
|
|
||||||
empty=annotationProcessor,apiDependenciesMetadata,archives,compile,compileClasspath,compileOnly,compileOnlyDependenciesMetadata,default,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeClasspath,runtimeOnlyDependenciesMetadata,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
|
|
||||||
index f242210..e2e8ee8 100644
|
|
||||||
--- a/gradle/libs.versions.toml
|
|
||||||
+++ b/gradle/libs.versions.toml
|
|
||||||
@@ -8,11 +8,11 @@ downloadTaskPlugin = "4.1.2"
|
|
||||||
geantyref = "1.+"
|
|
||||||
googleJavaFormat = "1.21.0"
|
|
||||||
# must not use `+` because used in download URL
|
|
||||||
-graalVm = "22.3.3"
|
|
||||||
-# intentionally empty; replaced by patch file when building pkl-cli macos/aarch64
|
|
||||||
-graalVM23JdkVersion = "replace-me"
|
|
||||||
+graalVm = "23.0.2"
|
|
||||||
+graalVM23JdkVersion = "17.0.9"
|
|
||||||
# slightly hacky but convenient place so we remember to update the checksum
|
|
||||||
graalVmSha256-darwin-amd64 = "cab6a1436626adc28ec0f72791772315678e7c758e2fbae2cb6758a38f27c56a"
|
|
||||||
+graalVmSha256-macos-aarch64 = "2214b6ecb32faacc84dffcbfae930450abe77c31730c4b6310e22d8f743959a5"
|
|
||||||
graalVmSha256-linux-amd64 = "959154e1248108dcd6eb279032cecdd2a6076bdebb345de9532681185231d255"
|
|
||||||
graalVmSha256-linux-aarch64 = "177d682f3455d00fa2491246e809d9c9b743187a82115ad3f578998b4935d5a1"
|
|
||||||
ideaExtPlugin = "1.1"
|
|
||||||
diff --git a/pkl-cli/gradle.lockfile b/pkl-cli/gradle.lockfile
|
|
||||||
index 37d4832..cad3066 100644
|
|
||||||
--- a/pkl-cli/gradle.lockfile
|
|
||||||
+++ b/pkl-cli/gradle.lockfile
|
|
||||||
@@ -4,19 +4,19 @@
|
|
||||||
com.github.ajalt.clikt:clikt-jvm:3.5.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
com.github.ajalt.clikt:clikt:3.5.1=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.fusesource.jansi:jansi:2.4.0=default
|
|
||||||
org.fusesource.jansi:jansi:2.4.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.compiler:compiler:22.3.3=compileClasspath,compileOnlyDependenciesMetadata
|
|
||||||
-org.graalvm.nativeimage:native-image-base:22.3.3=compileClasspath,compileOnlyDependenciesMetadata
|
|
||||||
-org.graalvm.nativeimage:objectfile:22.3.3=compileClasspath,compileOnlyDependenciesMetadata
|
|
||||||
-org.graalvm.nativeimage:pointsto:22.3.3=compileClasspath,compileOnlyDependenciesMetadata
|
|
||||||
-org.graalvm.nativeimage:svm:22.3.3=compileClasspath,compileOnlyDependenciesMetadata
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=compileClasspath,compileOnlyDependenciesMetadata,default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=compileClasspath,compileOnlyDependenciesMetadata,default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.compiler:compiler:23.0.2=compileClasspath,compileOnlyDependenciesMetadata
|
|
||||||
+org.graalvm.nativeimage:native-image-base:23.0.2=compileClasspath,compileOnlyDependenciesMetadata
|
|
||||||
+org.graalvm.nativeimage:objectfile:23.0.2=compileClasspath,compileOnlyDependenciesMetadata
|
|
||||||
+org.graalvm.nativeimage:pointsto:23.0.2=compileClasspath,compileOnlyDependenciesMetadata
|
|
||||||
+org.graalvm.nativeimage:svm:23.0.2=compileClasspath,compileOnlyDependenciesMetadata
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=compileClasspath,compileOnlyDependenciesMetadata,default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=compileClasspath,compileOnlyDependenciesMetadata,default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
@@ -32,22 +32,18 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.jline:jline-native:3.23.0=default
|
|
||||||
-org.jline:jline-native:3.23.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.jline:jline-reader:3.23.0=default
|
|
||||||
-org.jline:jline-reader:3.23.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.jline:jline-terminal-jansi:3.23.0=default
|
|
||||||
-org.jline:jline-terminal-jansi:3.23.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.jline:jline-terminal:3.23.0=default
|
|
||||||
-org.jline:jline-terminal:3.23.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit:junit-bom:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.jline:jline-native:3.23.0=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.jline:jline-reader:3.23.0=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.jline:jline-terminal-jansi:3.23.0=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.jline:jline-terminal:3.23.0=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-engine:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit:junit-bom:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.msgpack:msgpack-core:0.9.0=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.organicdesign:Paguro:3.10.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.snakeyaml:snakeyaml-engine:2.5=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-empty=annotationProcessor,archives,compile,intransitiveDependenciesMetadata,javaExecutable,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,shadow,signatures,sourcesJar,stagedAlpineLinuxAmd64Executable,stagedLinuxAarch64Executable,stagedLinuxAmd64Executable,stagedMacAarch64Executable,stagedMacAmd64Executable,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
+empty=annotationProcessor,archives,compile,intransitiveDependenciesMetadata,javaExecutable,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,shadow,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
diff --git a/pkl-codegen-java/gradle.lockfile b/pkl-codegen-java/gradle.lockfile
|
|
||||||
index 603b973..689b7ec 100644
|
|
||||||
--- a/pkl-codegen-java/gradle.lockfile
|
|
||||||
+++ b/pkl-codegen-java/gradle.lockfile
|
|
||||||
@@ -5,13 +5,13 @@ com.github.ajalt.clikt:clikt-jvm:3.5.1=compileClasspath,default,runtimeClasspath
|
|
||||||
com.github.ajalt.clikt:clikt:3.5.1=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
com.squareup:javapoet:1.13.0=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-io.leangen.geantyref:geantyref:1.3.15=testRuntimeClasspath
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+io.leangen.geantyref:geantyref:1.3.14=testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
@@ -27,13 +27,13 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit:junit-bom:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-engine:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit:junit-bom:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.organicdesign:Paguro:3.10.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.snakeyaml:snakeyaml-engine:2.5=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-empty=annotationProcessor,archives,compile,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
+empty=annotationProcessor,archives,compile,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
diff --git a/pkl-codegen-kotlin/gradle.lockfile b/pkl-codegen-kotlin/gradle.lockfile
|
|
||||||
index 51b61e8..c937a3c 100644
|
|
||||||
--- a/pkl-codegen-kotlin/gradle.lockfile
|
|
||||||
+++ b/pkl-codegen-kotlin/gradle.lockfile
|
|
||||||
@@ -5,13 +5,13 @@ com.github.ajalt.clikt:clikt-jvm:3.5.1=compileClasspath,default,runtimeClasspath
|
|
||||||
com.github.ajalt.clikt:clikt:3.5.1=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
com.squareup:kotlinpoet:1.6.0=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-io.leangen.geantyref:geantyref:1.3.15=testRuntimeClasspath
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+io.leangen.geantyref:geantyref:1.3.14=testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testRuntimeClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
@@ -30,13 +30,13 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileCl
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit:junit-bom:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-engine:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit:junit-bom:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.organicdesign:Paguro:3.10.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.snakeyaml:snakeyaml-engine:2.5=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-empty=annotationProcessor,archives,compile,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
+empty=annotationProcessor,archives,compile,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
diff --git a/pkl-commons-cli/gradle.lockfile b/pkl-commons-cli/gradle.lockfile
|
|
||||||
index 14599d5..aef9cd5 100644
|
|
||||||
--- a/pkl-commons-cli/gradle.lockfile
|
|
||||||
+++ b/pkl-commons-cli/gradle.lockfile
|
|
||||||
@@ -4,12 +4,12 @@
|
|
||||||
com.github.ajalt.clikt:clikt-jvm:3.5.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
com.github.ajalt.clikt:clikt:3.5.1=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
@@ -25,13 +25,13 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit:junit-bom:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-engine:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit:junit-bom:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.organicdesign:Paguro:3.10.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.snakeyaml:snakeyaml-engine:2.5=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-empty=annotationProcessor,archives,compile,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
+empty=annotationProcessor,archives,compile,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
diff --git a/pkl-commons/gradle.lockfile b/pkl-commons/gradle.lockfile
|
|
||||||
index 1fc8ca3..d58f791 100644
|
|
||||||
--- a/pkl-commons/gradle.lockfile
|
|
||||||
+++ b/pkl-commons/gradle.lockfile
|
|
||||||
@@ -1,10 +1,10 @@
|
|
||||||
# This is a Gradle generated file for dependency locking.
|
|
||||||
# Manual edits can break the build and are not advised.
|
|
||||||
# This file is expected to be part of source control.
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.assertj:assertj-core:3.24.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
diff --git a/pkl-config-java/gradle.lockfile b/pkl-config-java/gradle.lockfile
|
|
||||||
index ef84ee1..5ea22c1 100644
|
|
||||||
--- a/pkl-config-java/gradle.lockfile
|
|
||||||
+++ b/pkl-config-java/gradle.lockfile
|
|
||||||
@@ -5,15 +5,14 @@ com.github.ajalt.clikt:clikt-jvm:3.5.1=pklCodegenJava
|
|
||||||
com.github.ajalt.clikt:clikt:3.5.1=pklCodegenJava
|
|
||||||
com.squareup:javapoet:1.13.0=pklCodegenJava
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-io.leangen.geantyref:geantyref:1.3.14=default
|
|
||||||
-io.leangen.geantyref:geantyref:1.3.15=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+io.leangen.geantyref:geantyref:1.3.14=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
javax.inject:javax.inject:1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
@@ -29,13 +28,13 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=pklCodegenJava,testCompileClasspa
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=pklCodegenJava,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,pklCodegenJava,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,pklCodegenJava,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.platform:junit-platform-engine:1.10.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit:junit-bom:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-engine:5.9.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.platform:junit-platform-engine:1.9.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit:junit-bom:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.organicdesign:Paguro:3.10.3=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.snakeyaml:snakeyaml-engine:2.5=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-empty=annotationProcessor,apiDependenciesMetadata,archives,compile,compileOnly,compileOnlyDependenciesMetadata,fatJar,firstPartySourcesJars,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,pklCoreSourcesJar,runtime,runtimeOnlyDependenciesMetadata,shadow,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
+empty=annotationProcessor,apiDependenciesMetadata,archives,compile,compileOnly,compileOnlyDependenciesMetadata,fatJar,firstPartySourcesJars,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,pklCoreSourcesJar,runtime,runtimeOnlyDependenciesMetadata,shadow,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
diff --git a/pkl-config-kotlin/gradle.lockfile b/pkl-config-kotlin/gradle.lockfile
|
|
||||||
index 45cf49c..7e0b127 100644
|
|
||||||
--- a/pkl-config-kotlin/gradle.lockfile
|
|
||||||
+++ b/pkl-config-kotlin/gradle.lockfile
|
|
||||||
@@ -5,14 +5,13 @@ com.github.ajalt.clikt:clikt-jvm:3.5.1=pklCodegenKotlin
|
|
||||||
com.github.ajalt.clikt:clikt:3.5.1=pklCodegenKotlin
|
|
||||||
com.squareup:kotlinpoet:1.6.0=pklCodegenKotlin
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-io.leangen.geantyref:geantyref:1.3.14=default
|
|
||||||
-io.leangen.geantyref:geantyref:1.3.15=pklConfigJava,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+io.leangen.geantyref:geantyref:1.3.14=default,pklConfigJava,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
@@ -28,13 +27,13 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.platform:junit-platform-engine:1.10.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit:junit-bom:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-engine:5.9.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.platform:junit-platform-engine:1.9.3=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit:junit-bom:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.organicdesign:Paguro:3.10.3=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.snakeyaml:snakeyaml-engine:2.5=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-empty=annotationProcessor,archives,compile,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,pklConfigJavaAll,runtime,runtimeOnlyDependenciesMetadata,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
+empty=annotationProcessor,archives,compile,compileOnly,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,pklConfigJavaAll,runtime,runtimeOnlyDependenciesMetadata,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
diff --git a/pkl-core/gradle.lockfile b/pkl-core/gradle.lockfile
|
|
||||||
index 3da41e5..ff14a75 100644
|
|
||||||
--- a/pkl-core/gradle.lockfile
|
|
||||||
+++ b/pkl-core/gradle.lockfile
|
|
||||||
@@ -6,16 +6,16 @@ com.squareup:javapoet:1.13.0=generatorCompileClasspath,generatorImplementationDe
|
|
||||||
com.tunnelvisionlabs:antlr4-annotations:4.9.0=antlr
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=antlr,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
com.tunnelvisionlabs:antlr4:4.9.0=antlr
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.abego.treelayout:org.abego.treelayout.core:1.0.1=antlr
|
|
||||||
org.antlr:ST4:4.3=antlr
|
|
||||||
org.antlr:antlr-runtime:3.5.2=antlr
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=compileClasspath,default,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=compileClasspath,default,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-dsl-processor:22.3.3=annotationProcessor
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=compileClasspath,default,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=compileClasspath,default,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-dsl-processor:23.0.2=annotationProcessor
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
@@ -31,14 +31,14 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=generatorCompileClasspath,generat
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains:annotations:13.0=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit:junit-bom:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-engine:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit:junit-bom:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.organicdesign:Paguro:3.10.3=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.slf4j:slf4j-api:1.7.32=compileOnly
|
|
||||||
org.snakeyaml:snakeyaml-engine:2.5=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-empty=apiDependenciesMetadata,archives,compile,generatorAnnotationProcessor,generatorApiDependenciesMetadata,generatorCompileOnly,generatorCompileOnlyDependenciesMetadata,generatorIntransitiveDependenciesMetadata,generatorKotlinScriptDef,generatorKotlinScriptDefExtensions,generatorRuntimeOnlyDependenciesMetadata,intransitiveDependenciesMetadata,javaExecutable,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
+empty=apiDependenciesMetadata,archives,compile,generatorAnnotationProcessor,generatorApiDependenciesMetadata,generatorCompileOnly,generatorCompileOnlyDependenciesMetadata,generatorIntransitiveDependenciesMetadata,generatorKotlinScriptDef,generatorKotlinScriptDefExtensions,generatorRuntimeOnlyDependenciesMetadata,intransitiveDependenciesMetadata,javaExecutable,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime
|
|
||||||
diff --git a/pkl-doc/gradle.lockfile b/pkl-doc/gradle.lockfile
|
|
||||||
index 5674e5a..a11e97a 100644
|
|
||||||
--- a/pkl-doc/gradle.lockfile
|
|
||||||
+++ b/pkl-doc/gradle.lockfile
|
|
||||||
@@ -11,7 +11,7 @@ com.google.guava:guava:32.1.1-jre=testCompileClasspath,testImplementationDepende
|
|
||||||
com.google.j2objc:j2objc-annotations:2.8=testCompileClasspath,testImplementationDependenciesMetadata
|
|
||||||
com.google.jimfs:jimfs:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
com.ibm.icu:icu4j:58.2=validator
|
|
||||||
-com.ibm.icu:icu4j:71.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+com.ibm.icu:icu4j:72.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
com.shapesecurity:salvation:2.7.2=validator
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
commons-codec:commons-codec:1.10=validator
|
|
||||||
@@ -40,10 +40,10 @@ org.commonmark:commonmark:0.21.0=default
|
|
||||||
org.commonmark:commonmark:0.22.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.eclipse.jetty:jetty-util-ajax:9.4.18.v20190429=validator
|
|
||||||
org.eclipse.jetty:jetty-util:9.4.18.v20190429=validator
|
|
||||||
-org.graalvm.js:js:22.3.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.regex:regex:22.3.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=default,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=default,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.graalvm.js:js:23.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.graalvm.regex:regex:23.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=default,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=default,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
@@ -58,10 +58,14 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerP
|
|
||||||
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
|
|
||||||
org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
|
|
||||||
org.jetbrains.kotlin:kotlin-serialization:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testImplementationDependenciesMetadata
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,implementationDependenciesMetadata,testImplementationDependenciesMetadata
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,implementationDependenciesMetadata,testImplementationDependenciesMetadata
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testImplementationDependenciesMetadata
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib:1.8.21=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
|
|
||||||
org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
|
|
||||||
org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
diff --git a/pkl-executor/gradle.lockfile b/pkl-executor/gradle.lockfile
|
|
||||||
index dfe2e4d..e3680b6 100644
|
|
||||||
--- a/pkl-executor/gradle.lockfile
|
|
||||||
+++ b/pkl-executor/gradle.lockfile
|
|
||||||
@@ -2,12 +2,12 @@
|
|
||||||
# Manual edits can break the build and are not advised.
|
|
||||||
# This file is expected to be part of source control.
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=testRuntimeClasspath
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=testRuntimeClasspath
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
@@ -23,15 +23,14 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=testCompileClasspath,testImplemen
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains:annotations:13.0=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit:junit-bom:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-engine:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit:junit-bom:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.organicdesign:Paguro:3.10.3=testRuntimeClasspath
|
|
||||||
-org.pkl-lang:pkl-config-java-all:0.25.0=pklHistoricalDistributions
|
|
||||||
org.slf4j:slf4j-api:1.7.36=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.slf4j:slf4j-simple:1.7.36=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.snakeyaml:snakeyaml-engine:2.5=testRuntimeClasspath
|
|
||||||
diff --git a/pkl-gradle/gradle.lockfile b/pkl-gradle/gradle.lockfile
|
|
||||||
index 7ca45f9..b5b76e9 100644
|
|
||||||
--- a/pkl-gradle/gradle.lockfile
|
|
||||||
+++ b/pkl-gradle/gradle.lockfile
|
|
||||||
@@ -17,10 +17,14 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspat
|
|
||||||
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
|
|
||||||
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
|
|
||||||
org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,compileOnlyDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileOnlyDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.21=compileClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileOnlyDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21=compileClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileOnlyDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21=compileClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileOnlyDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib:1.7.21=compileClasspath
|
|
||||||
org.jetbrains:annotations:13.0=compileClasspath,compileOnlyDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
diff --git a/pkl-server/gradle.lockfile b/pkl-server/gradle.lockfile
|
|
||||||
index e8703af..c3e9abe 100644
|
|
||||||
--- a/pkl-server/gradle.lockfile
|
|
||||||
+++ b/pkl-server/gradle.lockfile
|
|
||||||
@@ -2,12 +2,12 @@
|
|
||||||
# Manual edits can break the build and are not advised.
|
|
||||||
# This file is expected to be part of source control.
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
|
||||||
@@ -23,14 +23,14 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=apiDependenciesMetadata,compileCl
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
org.jetbrains:annotations:13.0=apiDependenciesMetadata,compileClasspath,default,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-engine:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
-org.junit:junit-bom:5.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-engine:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
+org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.junit:junit-bom:5.9.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.msgpack:msgpack-core:0.9.0=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
|
||||||
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
+org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
|
||||||
org.organicdesign:Paguro:3.10.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.snakeyaml:snakeyaml-engine:2.5=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
empty=annotationProcessor,archives,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions
|
|
||||||
diff --git a/pkl-tools/gradle.lockfile b/pkl-tools/gradle.lockfile
|
|
||||||
index da818fc..4907682 100644
|
|
||||||
--- a/pkl-tools/gradle.lockfile
|
|
||||||
+++ b/pkl-tools/gradle.lockfile
|
|
||||||
@@ -14,13 +14,15 @@ org.commonmark:commonmark:0.21.0=default
|
|
||||||
org.commonmark:commonmark:0.22.0=runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.fusesource.jansi:jansi:2.4.0=default
|
|
||||||
org.fusesource.jansi:jansi:2.4.1=runtimeClasspath,testRuntimeClasspath
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlin:kotlin-reflect:1.7.10=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.21=compileClasspath,testCompileClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib:1.7.21=compileClasspath,testCompileClasspath
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib:1.8.21=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.5.1=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.5.1=default,runtimeClasspath,testRuntimeClasspath
|
|
||||||
diff --git a/stdlib/gradle.lockfile b/stdlib/gradle.lockfile
|
|
||||||
index a7f919c..5e9b256 100644
|
|
||||||
--- a/stdlib/gradle.lockfile
|
|
||||||
+++ b/stdlib/gradle.lockfile
|
|
||||||
@@ -6,12 +6,12 @@ com.github.ajalt.clikt:clikt:3.5.1=pkldoc
|
|
||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=pkldoc
|
|
||||||
org.commonmark:commonmark-ext-gfm-tables:0.21.0=pkldoc
|
|
||||||
org.commonmark:commonmark:0.21.0=pkldoc
|
|
||||||
-org.graalvm.sdk:graal-sdk:22.3.3=pkldoc
|
|
||||||
-org.graalvm.truffle:truffle-api:22.3.3=pkldoc
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=pkldoc
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=pkldoc
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=pkldoc
|
|
||||||
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=pkldoc
|
|
||||||
+org.graalvm.sdk:graal-sdk:23.0.2=pkldoc
|
|
||||||
+org.graalvm.truffle:truffle-api:23.0.2=pkldoc
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21=pkldoc
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21=pkldoc
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21=pkldoc
|
|
||||||
+org.jetbrains.kotlin:kotlin-stdlib:1.8.21=pkldoc
|
|
||||||
org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1=pkldoc
|
|
||||||
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.5.1=pkldoc
|
|
||||||
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.5.1=pkldoc
|
|
||||||
--
|
|
||||||
2.44.0
|
|
||||||
|
|
||||||
@@ -10,13 +10,13 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDep
|
|||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.fusesource.jansi:jansi:2.4.0=default
|
org.fusesource.jansi:jansi:2.4.0=default
|
||||||
org.fusesource.jansi:jansi:2.4.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.fusesource.jansi:jansi:2.4.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.compiler:compiler:22.3.3=compileClasspath,compileOnlyDependenciesMetadata
|
org.graalvm.compiler:compiler:23.0.2=compileClasspath,compileOnlyDependenciesMetadata
|
||||||
org.graalvm.nativeimage:native-image-base:22.3.3=compileClasspath,compileOnlyDependenciesMetadata
|
org.graalvm.nativeimage:native-image-base:23.0.2=compileClasspath,compileOnlyDependenciesMetadata
|
||||||
org.graalvm.nativeimage:objectfile:22.3.3=compileClasspath,compileOnlyDependenciesMetadata
|
org.graalvm.nativeimage:objectfile:23.0.2=compileClasspath,compileOnlyDependenciesMetadata
|
||||||
org.graalvm.nativeimage:pointsto:22.3.3=compileClasspath,compileOnlyDependenciesMetadata
|
org.graalvm.nativeimage:pointsto:23.0.2=compileClasspath,compileOnlyDependenciesMetadata
|
||||||
org.graalvm.nativeimage:svm:22.3.3=compileClasspath,compileOnlyDependenciesMetadata
|
org.graalvm.nativeimage:svm:23.0.2=compileClasspath,compileOnlyDependenciesMetadata
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=compileClasspath,compileOnlyDependenciesMetadata,default,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=compileClasspath,compileOnlyDependenciesMetadata,default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=compileClasspath,compileOnlyDependenciesMetadata,default,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=compileClasspath,compileOnlyDependenciesMetadata,default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
+43
-23
@@ -134,29 +134,34 @@ tasks.check {
|
|||||||
dependsOn(testStartJavaExecutable)
|
dependsOn(testStartJavaExecutable)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun Exec.configureExecutable(isEnabled: Boolean, outputFile: Provider<RegularFile>, extraArgs: List<String> = listOf()) {
|
fun Exec.configureExecutable(
|
||||||
|
isEnabled: Boolean,
|
||||||
|
graalVm: BuildInfo.GraalVm,
|
||||||
|
outputFile: Provider<RegularFile>,
|
||||||
|
extraArgs: List<String> = listOf()
|
||||||
|
) {
|
||||||
enabled = isEnabled
|
enabled = isEnabled
|
||||||
dependsOn(":installGraalVm")
|
|
||||||
|
|
||||||
inputs.files(sourceSets.main.map { it.output }).withPropertyName("mainSourceSets").withPathSensitivity(PathSensitivity.RELATIVE)
|
inputs.files(sourceSets.main.map { it.output }).withPropertyName("mainSourceSets").withPathSensitivity(PathSensitivity.RELATIVE)
|
||||||
inputs.files(configurations.runtimeClasspath).withPropertyName("runtimeClasspath").withNormalizer(ClasspathNormalizer::class)
|
inputs.files(configurations.runtimeClasspath).withPropertyName("runtimeClasspath").withNormalizer(ClasspathNormalizer::class)
|
||||||
inputs.files(file(buildInfo.graalVm.baseDir).resolve("bin/native-image")).withPropertyName("graalVmNativeImage").withPathSensitivity(PathSensitivity.ABSOLUTE)
|
inputs.files(file(graalVm.baseDir).resolve("bin/native-image")).withPropertyName("graalVmNativeImage").withPathSensitivity(PathSensitivity.ABSOLUTE)
|
||||||
outputs.file(outputFile)
|
outputs.file(outputFile)
|
||||||
outputs.cacheIf { true }
|
outputs.cacheIf { true }
|
||||||
|
|
||||||
workingDir(outputFile.map { it.asFile.parentFile })
|
workingDir(outputFile.map { it.asFile.parentFile })
|
||||||
executable = "${buildInfo.graalVm.baseDir}/bin/native-image"
|
executable = "${graalVm.baseDir}/bin/native-image"
|
||||||
|
|
||||||
// JARs to exclude from the class path for the native-image build.
|
// JARs to exclude from the class path for the native-image build.
|
||||||
val exclusions =
|
val exclusions = listOf(libs.truffleApi, libs.graalSdk).map { it.get().module.name }
|
||||||
if (buildInfo.graalVm.isGraal22) emptyList()
|
|
||||||
else listOf(libs.truffleApi, libs.graalSdk).map { it.get().module.name }
|
|
||||||
// https://www.graalvm.org/22.0/reference-manual/native-image/Options/
|
// https://www.graalvm.org/22.0/reference-manual/native-image/Options/
|
||||||
argumentProviders.add(CommandLineArgumentProvider {
|
argumentProviders.add(CommandLineArgumentProvider {
|
||||||
listOf(
|
listOf(
|
||||||
// currently gives a deprecation warning, but we've been told
|
// currently gives a deprecation warning, but we've been told
|
||||||
// that the "initialize everything at build time" *CLI* option is likely here to stay
|
// that the "initialize everything at build time" *CLI* option is likely here to stay
|
||||||
"--initialize-at-build-time="
|
"--initialize-at-build-time="
|
||||||
|
// needed for messagepack-java (see https://github.com/msgpack/msgpack-java/issues/600)
|
||||||
|
,"--add-opens=java.base/java.nio=ALL-UNNAMED"
|
||||||
|
,"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED"
|
||||||
,"--no-fallback"
|
,"--no-fallback"
|
||||||
,"-H:IncludeResources=org/pkl/core/stdlib/.*\\.pkl"
|
,"-H:IncludeResources=org/pkl/core/stdlib/.*\\.pkl"
|
||||||
,"-H:IncludeResources=org/jline/utils/.*"
|
,"-H:IncludeResources=org/jline/utils/.*"
|
||||||
@@ -213,21 +218,24 @@ inputs.files(file(buildInfo.graalVm.baseDir).resolve("bin/native-image")).withPr
|
|||||||
* Builds the pkl CLI for macOS/amd64.
|
* Builds the pkl CLI for macOS/amd64.
|
||||||
*/
|
*/
|
||||||
val macExecutableAmd64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
val macExecutableAmd64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
||||||
configureExecutable(buildInfo.os.isMacOsX && buildInfo.graalVm.isGraal22, layout.buildDirectory.file("executable/pkl-macos-amd64"))
|
dependsOn(":installGraalVmAmd64")
|
||||||
|
configureExecutable(
|
||||||
|
buildInfo.os.isMacOsX,
|
||||||
|
buildInfo.graalVmAmd64,
|
||||||
|
layout.buildDirectory.file("executable/pkl-macos-amd64")
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Builds the pkl CLI for macOS/aarch64.
|
* Builds the pkl CLI for macOS/aarch64.
|
||||||
*
|
|
||||||
* This requires that GraalVM be set to version 23.0 or greater, because 22.x does not support this
|
|
||||||
* os/arch pair.
|
|
||||||
*/
|
*/
|
||||||
val macExecutableAarch64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
val macExecutableAarch64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
||||||
|
dependsOn(":installGraalVmAarch64")
|
||||||
configureExecutable(
|
configureExecutable(
|
||||||
buildInfo.os.isMacOsX && !buildInfo.graalVm.isGraal22,
|
buildInfo.os.isMacOsX,
|
||||||
|
buildInfo.graalVmAarch64,
|
||||||
layout.buildDirectory.file("executable/pkl-macos-aarch64"),
|
layout.buildDirectory.file("executable/pkl-macos-aarch64"),
|
||||||
listOf(
|
listOf(
|
||||||
"--initialize-at-run-time=org.msgpack.core.buffer.DirectBufferAccess",
|
|
||||||
"-H:+AllowDeprecatedBuilderClassesOnImageClasspath"
|
"-H:+AllowDeprecatedBuilderClassesOnImageClasspath"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -237,7 +245,12 @@ val macExecutableAarch64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
|||||||
* Builds the pkl CLI for linux/amd64.
|
* Builds the pkl CLI for linux/amd64.
|
||||||
*/
|
*/
|
||||||
val linuxExecutableAmd64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
val linuxExecutableAmd64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
||||||
configureExecutable(buildInfo.os.isLinux && buildInfo.arch == "amd64", layout.buildDirectory.file("executable/pkl-linux-amd64"))
|
dependsOn(":installGraalVmAmd64")
|
||||||
|
configureExecutable(
|
||||||
|
buildInfo.os.isLinux && buildInfo.arch == "amd64",
|
||||||
|
buildInfo.graalVmAmd64,
|
||||||
|
layout.buildDirectory.file("executable/pkl-linux-amd64")
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -247,7 +260,12 @@ val linuxExecutableAmd64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
|||||||
* ARM instances.
|
* ARM instances.
|
||||||
*/
|
*/
|
||||||
val linuxExecutableAarch64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
val linuxExecutableAarch64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
||||||
configureExecutable(buildInfo.os.isLinux && buildInfo.arch == "aarch64", layout.buildDirectory.file("executable/pkl-linux-aarch64"))
|
dependsOn(":installGraalVmAarch64")
|
||||||
|
configureExecutable(
|
||||||
|
buildInfo.os.isLinux && buildInfo.arch == "aarch64",
|
||||||
|
buildInfo.graalVmAarch64,
|
||||||
|
layout.buildDirectory.file("executable/pkl-linux-aarch64")
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -257,15 +275,17 @@ val linuxExecutableAarch64: TaskProvider<Exec> by tasks.registering(Exec::class)
|
|||||||
* Details: https://www.graalvm.org/22.0/reference-manual/native-image/ARM64/
|
* Details: https://www.graalvm.org/22.0/reference-manual/native-image/ARM64/
|
||||||
*/
|
*/
|
||||||
val alpineExecutableAmd64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
val alpineExecutableAmd64: TaskProvider<Exec> by tasks.registering(Exec::class) {
|
||||||
|
dependsOn(":installGraalVmAmd64")
|
||||||
configureExecutable(
|
configureExecutable(
|
||||||
buildInfo.os.isLinux && buildInfo.arch == "amd64" && buildInfo.hasMuslToolchain,
|
buildInfo.os.isLinux && buildInfo.arch == "amd64" && buildInfo.hasMuslToolchain,
|
||||||
layout.buildDirectory.file("executable/pkl-alpine-linux-amd64"),
|
buildInfo.graalVmAmd64,
|
||||||
listOf(
|
layout.buildDirectory.file("executable/pkl-alpine-linux-amd64"),
|
||||||
"--static",
|
listOf(
|
||||||
"--libc=musl",
|
"--static",
|
||||||
"-H:CCompilerOption=-Wl,-z,stack-size=10485760",
|
"--libc=musl",
|
||||||
"-Dorg.pkl.compat=alpine"
|
"-H:CCompilerOption=-Wl,-z,stack-size=10485760",
|
||||||
)
|
"-Dorg.pkl.compat=alpine"
|
||||||
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependen
|
|||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependen
|
|||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testRuntimeClasspath
|
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testRuntimeClasspath
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependen
|
|||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependen
|
|||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=default,pklCodegenJava,runtimeClasspath,testRuntimeClasspath
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependen
|
|||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=default,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testRuntimeClasspath
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
@@ -13,9 +13,9 @@ org.antlr:ST4:4.3=antlr
|
|||||||
org.antlr:antlr-runtime:3.5.2=antlr
|
org.antlr:antlr-runtime:3.5.2=antlr
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=compileClasspath,default,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=compileClasspath,default,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=compileClasspath,default,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=compileClasspath,default,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-dsl-processor:22.3.3=annotationProcessor
|
org.graalvm.truffle:truffle-dsl-processor:23.0.2=annotationProcessor
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ tasks.check {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val testMacExecutableAmd64 by tasks.registering(Test::class) {
|
val testMacExecutableAmd64 by tasks.registering(Test::class) {
|
||||||
enabled = buildInfo.os.isMacOsX && buildInfo.graalVm.isGraal22
|
enabled = buildInfo.os.isMacOsX
|
||||||
dependsOn(":pkl-cli:macExecutableAmd64")
|
dependsOn(":pkl-cli:macExecutableAmd64")
|
||||||
|
|
||||||
inputs.dir("src/test/files/LanguageSnippetTests/input").withPropertyName("languageSnippetTestsInput").withPathSensitivity(PathSensitivity.RELATIVE)
|
inputs.dir("src/test/files/LanguageSnippetTests/input").withPropertyName("languageSnippetTestsInput").withPathSensitivity(PathSensitivity.RELATIVE)
|
||||||
@@ -209,7 +209,7 @@ val testMacExecutableAmd64 by tasks.registering(Test::class) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val testMacExecutableAarch64 by tasks.registering(Test::class) {
|
val testMacExecutableAarch64 by tasks.registering(Test::class) {
|
||||||
enabled = buildInfo.os.isMacOsX && !buildInfo.graalVm.isGraal22
|
enabled = buildInfo.os.isMacOsX
|
||||||
dependsOn(":pkl-cli:macExecutableAarch64")
|
dependsOn(":pkl-cli:macExecutableAarch64")
|
||||||
|
|
||||||
inputs.dir("src/test/files/LanguageSnippetTests/input")
|
inputs.dir("src/test/files/LanguageSnippetTests/input")
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ class MemberRegistryGenerator : AbstractProcessor() {
|
|||||||
|
|
||||||
override fun getSupportedAnnotationTypes(): Set<String> = setOf(GeneratedBy::class.java.name)
|
override fun getSupportedAnnotationTypes(): Set<String> = setOf(GeneratedBy::class.java.name)
|
||||||
|
|
||||||
override fun getSupportedSourceVersion(): SourceVersion = SourceVersion.RELEASE_11
|
override fun getSupportedSourceVersion(): SourceVersion = SourceVersion.RELEASE_17
|
||||||
|
|
||||||
override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
|
override fun process(annotations: Set<TypeElement>, roundEnv: RoundEnvironment): Boolean {
|
||||||
if (annotations.isEmpty()) return true
|
if (annotations.isEmpty()) return true
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import org.pkl.core.util.MathUtils;
|
|||||||
import org.pkl.core.util.Nullable;
|
import org.pkl.core.util.Nullable;
|
||||||
|
|
||||||
/** Java representation of a {@code pkl.base#DataSize} value. */
|
/** Java representation of a {@code pkl.base#DataSize} value. */
|
||||||
public final strictfp class DataSize implements Value {
|
public final class DataSize implements Value {
|
||||||
private static final long serialVersionUID = 0L;
|
private static final long serialVersionUID = 0L;
|
||||||
|
|
||||||
private final double value;
|
private final double value;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import org.pkl.core.util.Nullable;
|
|||||||
* The unit of a {@link DataSize}. In Pkl, data size units are represented as String {@link
|
* The unit of a {@link DataSize}. In Pkl, data size units are represented as String {@link
|
||||||
* #getSymbol() symbols}.
|
* #getSymbol() symbols}.
|
||||||
*/
|
*/
|
||||||
public strictfp enum DataSizeUnit {
|
public enum DataSizeUnit {
|
||||||
BYTES(1, "b"),
|
BYTES(1, "b"),
|
||||||
KILOBYTES(1000, "kb"),
|
KILOBYTES(1000, "kb"),
|
||||||
KIBIBYTES(1024, "kib"),
|
KIBIBYTES(1024, "kib"),
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import org.pkl.core.util.DurationUtils;
|
|||||||
import org.pkl.core.util.Nullable;
|
import org.pkl.core.util.Nullable;
|
||||||
|
|
||||||
/** Java representation of a {@code pkl.base#Duration} value. */
|
/** Java representation of a {@code pkl.base#Duration} value. */
|
||||||
public final strictfp class Duration implements Value {
|
public final class Duration implements Value {
|
||||||
private static final long serialVersionUID = 0L;
|
private static final long serialVersionUID = 0L;
|
||||||
|
|
||||||
private final double value;
|
private final double value;
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ package org.pkl.core.ast.expression.binary;
|
|||||||
import com.oracle.truffle.api.CompilerDirectives;
|
import com.oracle.truffle.api.CompilerDirectives;
|
||||||
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
||||||
import com.oracle.truffle.api.dsl.Cached;
|
import com.oracle.truffle.api.dsl.Cached;
|
||||||
|
import com.oracle.truffle.api.dsl.Cached.Exclusive;
|
||||||
import com.oracle.truffle.api.dsl.Specialization;
|
import com.oracle.truffle.api.dsl.Specialization;
|
||||||
import com.oracle.truffle.api.nodes.IndirectCallNode;
|
import com.oracle.truffle.api.nodes.IndirectCallNode;
|
||||||
import com.oracle.truffle.api.nodes.NodeInfo;
|
import com.oracle.truffle.api.nodes.NodeInfo;
|
||||||
@@ -72,7 +73,7 @@ public abstract class SubscriptNode extends BinaryExpressionNode {
|
|||||||
|
|
||||||
@Specialization
|
@Specialization
|
||||||
protected Object eval(
|
protected Object eval(
|
||||||
VmListing listing, long index, @Cached("create()") IndirectCallNode callNode) {
|
VmListing listing, long index, @Exclusive @Cached("create()") IndirectCallNode callNode) {
|
||||||
|
|
||||||
var result = VmUtils.readMemberOrNull(listing, index, callNode);
|
var result = VmUtils.readMemberOrNull(listing, index, callNode);
|
||||||
if (result != null) return result;
|
if (result != null) return result;
|
||||||
@@ -85,14 +86,14 @@ public abstract class SubscriptNode extends BinaryExpressionNode {
|
|||||||
|
|
||||||
@Specialization
|
@Specialization
|
||||||
protected Object eval(
|
protected Object eval(
|
||||||
VmMapping mapping, Object key, @Cached("create()") IndirectCallNode callNode) {
|
VmMapping mapping, Object key, @Exclusive @Cached("create()") IndirectCallNode callNode) {
|
||||||
|
|
||||||
return readMember(mapping, key, callNode);
|
return readMember(mapping, key, callNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Specialization
|
@Specialization
|
||||||
protected Object eval(
|
protected Object eval(
|
||||||
VmDynamic dynamic, Object key, @Cached("create()") IndirectCallNode callNode) {
|
VmDynamic dynamic, Object key, @Exclusive @Cached("create()") IndirectCallNode callNode) {
|
||||||
|
|
||||||
return readMember(dynamic, key, callNode);
|
return readMember(dynamic, key, callNode);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ package org.pkl.core.ast.expression.generator;
|
|||||||
import com.oracle.truffle.api.CompilerDirectives;
|
import com.oracle.truffle.api.CompilerDirectives;
|
||||||
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
||||||
import com.oracle.truffle.api.CompilerDirectives.ValueType;
|
import com.oracle.truffle.api.CompilerDirectives.ValueType;
|
||||||
|
import com.oracle.truffle.api.dsl.Idempotent;
|
||||||
import com.oracle.truffle.api.frame.VirtualFrame;
|
import com.oracle.truffle.api.frame.VirtualFrame;
|
||||||
import com.oracle.truffle.api.source.SourceSection;
|
import com.oracle.truffle.api.source.SourceSection;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@@ -46,11 +47,13 @@ public abstract class GeneratorMemberNode extends PklNode {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
protected static boolean isTypedObjectClass(VmClass clazz) {
|
protected static boolean isTypedObjectClass(VmClass clazz) {
|
||||||
assert clazz.isInstantiable();
|
assert clazz.isInstantiable();
|
||||||
return !(clazz.isListingClass() || clazz.isMappingClass() || clazz.isDynamicClass());
|
return !(clazz.isListingClass() || clazz.isMappingClass() || clazz.isDynamicClass());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
protected boolean checkIsValidTypedProperty(VmClass clazz, ObjectMember member) {
|
protected boolean checkIsValidTypedProperty(VmClass clazz, ObjectMember member) {
|
||||||
if (member.isLocal() || clazz.hasProperty(member.getName())) return true;
|
if (member.isLocal() || clazz.hasProperty(member.getName())) return true;
|
||||||
|
|
||||||
|
|||||||
+6
-1
@@ -19,6 +19,7 @@ import com.oracle.truffle.api.CompilerDirectives;
|
|||||||
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
||||||
import com.oracle.truffle.api.dsl.Cached;
|
import com.oracle.truffle.api.dsl.Cached;
|
||||||
import com.oracle.truffle.api.dsl.Fallback;
|
import com.oracle.truffle.api.dsl.Fallback;
|
||||||
|
import com.oracle.truffle.api.dsl.Idempotent;
|
||||||
import com.oracle.truffle.api.dsl.ImportStatic;
|
import com.oracle.truffle.api.dsl.ImportStatic;
|
||||||
import com.oracle.truffle.api.dsl.Specialization;
|
import com.oracle.truffle.api.dsl.Specialization;
|
||||||
import com.oracle.truffle.api.frame.FrameDescriptor;
|
import com.oracle.truffle.api.frame.FrameDescriptor;
|
||||||
@@ -112,7 +113,8 @@ public abstract class GeneratorObjectLiteralNode extends ObjectLiteralNode {
|
|||||||
protected Object evalFunction(
|
protected Object evalFunction(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
VmFunction parent,
|
VmFunction parent,
|
||||||
@Cached("createAmendFunctionNode(frame)") AmendFunctionNode amendFunctionNode) {
|
@Cached(value = "createAmendFunctionNode(frame)", neverDefault = true)
|
||||||
|
AmendFunctionNode amendFunctionNode) {
|
||||||
|
|
||||||
return amendFunctionNode.execute(frame, parent);
|
return amendFunctionNode.execute(frame, parent);
|
||||||
}
|
}
|
||||||
@@ -164,6 +166,7 @@ public abstract class GeneratorObjectLiteralNode extends ObjectLiteralNode {
|
|||||||
throw exceptionBuilder().unreachableCode().build();
|
throw exceptionBuilder().unreachableCode().build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
protected boolean checkObjectCannotHaveParameters() {
|
protected boolean checkObjectCannotHaveParameters() {
|
||||||
if (parametersDescriptor == null) return true;
|
if (parametersDescriptor == null) return true;
|
||||||
|
|
||||||
@@ -174,6 +177,7 @@ public abstract class GeneratorObjectLiteralNode extends ObjectLiteralNode {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
protected boolean checkListingCannotHaveParameters() {
|
protected boolean checkListingCannotHaveParameters() {
|
||||||
if (parametersDescriptor == null) return true;
|
if (parametersDescriptor == null) return true;
|
||||||
|
|
||||||
@@ -184,6 +188,7 @@ public abstract class GeneratorObjectLiteralNode extends ObjectLiteralNode {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
protected boolean checkMappingCannotHaveParameters() {
|
protected boolean checkMappingCannotHaveParameters() {
|
||||||
if (parametersDescriptor == null) return true;
|
if (parametersDescriptor == null) return true;
|
||||||
|
|
||||||
|
|||||||
+3
@@ -17,6 +17,7 @@ package org.pkl.core.ast.expression.generator;
|
|||||||
|
|
||||||
import com.oracle.truffle.api.CompilerDirectives;
|
import com.oracle.truffle.api.CompilerDirectives;
|
||||||
import com.oracle.truffle.api.dsl.Fallback;
|
import com.oracle.truffle.api.dsl.Fallback;
|
||||||
|
import com.oracle.truffle.api.dsl.Idempotent;
|
||||||
import com.oracle.truffle.api.dsl.ImportStatic;
|
import com.oracle.truffle.api.dsl.ImportStatic;
|
||||||
import com.oracle.truffle.api.dsl.Specialization;
|
import com.oracle.truffle.api.dsl.Specialization;
|
||||||
import org.pkl.core.ast.member.ObjectMember;
|
import org.pkl.core.ast.member.ObjectMember;
|
||||||
@@ -94,6 +95,7 @@ public abstract class GeneratorPropertyNode extends GeneratorMemberNode {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
protected boolean checkIsValidListingProperty() {
|
protected boolean checkIsValidListingProperty() {
|
||||||
if (member.isLocal() || member.getName() == Identifier.DEFAULT) return true;
|
if (member.isLocal() || member.getName() == Identifier.DEFAULT) return true;
|
||||||
|
|
||||||
@@ -104,6 +106,7 @@ public abstract class GeneratorPropertyNode extends GeneratorMemberNode {
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
protected boolean checkIsValidMappingProperty() {
|
protected boolean checkIsValidMappingProperty() {
|
||||||
if (member.isLocal() || member.getName() == Identifier.DEFAULT) return true;
|
if (member.isLocal() || member.getName() == Identifier.DEFAULT) return true;
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -94,7 +94,8 @@ public abstract class ConstantEntriesLiteralNode extends SpecializedObjectLitera
|
|||||||
protected VmFunction evalFunction(
|
protected VmFunction evalFunction(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
VmFunction parent,
|
VmFunction parent,
|
||||||
@Cached("createAmendFunctionNode(frame)") AmendFunctionNode amendFunctionNode) {
|
@Cached(value = "createAmendFunctionNode(frame)", neverDefault = true)
|
||||||
|
AmendFunctionNode amendFunctionNode) {
|
||||||
|
|
||||||
return amendFunctionNode.execute(frame, parent);
|
return amendFunctionNode.execute(frame, parent);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -114,7 +114,8 @@ public abstract class ElementsEntriesLiteralNode extends SpecializedObjectLitera
|
|||||||
protected VmFunction evalFunction(
|
protected VmFunction evalFunction(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
VmFunction parent,
|
VmFunction parent,
|
||||||
@Cached("createAmendFunctionNode(frame)") AmendFunctionNode amendFunctionNode) {
|
@Cached(value = "createAmendFunctionNode(frame)", neverDefault = true)
|
||||||
|
AmendFunctionNode amendFunctionNode) {
|
||||||
|
|
||||||
return amendFunctionNode.execute(frame, parent);
|
return amendFunctionNode.execute(frame, parent);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,7 +104,8 @@ public abstract class ElementsLiteralNode extends SpecializedObjectLiteralNode {
|
|||||||
protected VmFunction evalFunction(
|
protected VmFunction evalFunction(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
VmFunction parent,
|
VmFunction parent,
|
||||||
@Cached("createAmendFunctionNode(frame)") AmendFunctionNode amendFunctionNode) {
|
@Cached(value = "createAmendFunctionNode(frame)", neverDefault = true)
|
||||||
|
AmendFunctionNode amendFunctionNode) {
|
||||||
|
|
||||||
return amendFunctionNode.execute(frame, parent);
|
return amendFunctionNode.execute(frame, parent);
|
||||||
}
|
}
|
||||||
@@ -118,7 +119,8 @@ public abstract class ElementsLiteralNode extends SpecializedObjectLiteralNode {
|
|||||||
protected VmListing evalListingClass(
|
protected VmListing evalListingClass(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
@SuppressWarnings("unused") VmClass parent,
|
@SuppressWarnings("unused") VmClass parent,
|
||||||
@Cached("createMembers(0)") UnmodifiableEconomicMap<Object, ObjectMember> members) {
|
@Cached(value = "createMembers(0)", neverDefault = true)
|
||||||
|
UnmodifiableEconomicMap<Object, ObjectMember> members) {
|
||||||
|
|
||||||
return new VmListing(
|
return new VmListing(
|
||||||
frame.materialize(), BaseModule.getListingClass().getPrototype(), members, elements.length);
|
frame.materialize(), BaseModule.getListingClass().getPrototype(), members, elements.length);
|
||||||
@@ -128,7 +130,8 @@ public abstract class ElementsLiteralNode extends SpecializedObjectLiteralNode {
|
|||||||
protected VmDynamic evalDynamicClass(
|
protected VmDynamic evalDynamicClass(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
@SuppressWarnings("unused") VmClass parent,
|
@SuppressWarnings("unused") VmClass parent,
|
||||||
@Cached("createMembers(0)") UnmodifiableEconomicMap<Object, ObjectMember> members) {
|
@Cached(value = "createMembers(0)", neverDefault = true)
|
||||||
|
UnmodifiableEconomicMap<Object, ObjectMember> members) {
|
||||||
return new VmDynamic(
|
return new VmDynamic(
|
||||||
frame.materialize(), BaseModule.getDynamicClass().getPrototype(), members, elements.length);
|
frame.materialize(), BaseModule.getDynamicClass().getPrototype(), members, elements.length);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -116,7 +116,8 @@ public abstract class EntriesLiteralNode extends SpecializedObjectLiteralNode {
|
|||||||
protected VmFunction evalFunction(
|
protected VmFunction evalFunction(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
VmFunction parent,
|
VmFunction parent,
|
||||||
@Cached("createAmendFunctionNode(frame)") AmendFunctionNode amendFunctionNode) {
|
@Cached(value = "createAmendFunctionNode(frame)", neverDefault = true)
|
||||||
|
AmendFunctionNode amendFunctionNode) {
|
||||||
|
|
||||||
return amendFunctionNode.execute(frame, parent);
|
return amendFunctionNode.execute(frame, parent);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
package org.pkl.core.ast.expression.literal;
|
package org.pkl.core.ast.expression.literal;
|
||||||
|
|
||||||
import com.oracle.truffle.api.CompilerDirectives;
|
import com.oracle.truffle.api.CompilerDirectives;
|
||||||
|
import com.oracle.truffle.api.dsl.Idempotent;
|
||||||
import com.oracle.truffle.api.dsl.NodeChild;
|
import com.oracle.truffle.api.dsl.NodeChild;
|
||||||
import com.oracle.truffle.api.frame.FrameDescriptor;
|
import com.oracle.truffle.api.frame.FrameDescriptor;
|
||||||
import com.oracle.truffle.api.frame.VirtualFrame;
|
import com.oracle.truffle.api.frame.VirtualFrame;
|
||||||
@@ -68,6 +69,7 @@ public abstract class ObjectLiteralNode extends ExpressionNode {
|
|||||||
return new AmendFunctionNode(this, resolvedParameterTypes, frame.getFrameDescriptor());
|
return new AmendFunctionNode(this, resolvedParameterTypes, frame.getFrameDescriptor());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
protected static boolean isTypedObjectClass(VmClass clazz) {
|
protected static boolean isTypedObjectClass(VmClass clazz) {
|
||||||
return !(clazz.isListingClass() || clazz.isMappingClass() || clazz.isDynamicClass());
|
return !(clazz.isListingClass() || clazz.isMappingClass() || clazz.isDynamicClass());
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -115,7 +115,8 @@ public abstract class PropertiesLiteralNode extends SpecializedObjectLiteralNode
|
|||||||
protected VmFunction evalFunction(
|
protected VmFunction evalFunction(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
VmFunction parent,
|
VmFunction parent,
|
||||||
@Cached("createAmendFunctionNode(frame)") AmendFunctionNode amendFunctionNode) {
|
@Cached(value = "createAmendFunctionNode(frame)", neverDefault = true)
|
||||||
|
AmendFunctionNode amendFunctionNode) {
|
||||||
|
|
||||||
return amendFunctionNode.execute(frame, parent);
|
return amendFunctionNode.execute(frame, parent);
|
||||||
}
|
}
|
||||||
|
|||||||
+7
@@ -18,6 +18,7 @@ package org.pkl.core.ast.expression.literal;
|
|||||||
import com.oracle.truffle.api.CompilerDirectives;
|
import com.oracle.truffle.api.CompilerDirectives;
|
||||||
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
|
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
|
||||||
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
||||||
|
import com.oracle.truffle.api.dsl.Idempotent;
|
||||||
import com.oracle.truffle.api.frame.FrameDescriptor;
|
import com.oracle.truffle.api.frame.FrameDescriptor;
|
||||||
import com.oracle.truffle.api.frame.VirtualFrame;
|
import com.oracle.truffle.api.frame.VirtualFrame;
|
||||||
import com.oracle.truffle.api.nodes.ExplodeLoop;
|
import com.oracle.truffle.api.nodes.ExplodeLoop;
|
||||||
@@ -67,6 +68,7 @@ public abstract class SpecializedObjectLiteralNode extends ObjectLiteralNode {
|
|||||||
// only runs once per VmClass (which often means once per PropertiesLiteralNode)
|
// only runs once per VmClass (which often means once per PropertiesLiteralNode)
|
||||||
// unless an XYZUncached specialization is active
|
// unless an XYZUncached specialization is active
|
||||||
@TruffleBoundary
|
@TruffleBoundary
|
||||||
|
@Idempotent
|
||||||
protected boolean checkIsValidTypedAmendment(Object parent) {
|
protected boolean checkIsValidTypedAmendment(Object parent) {
|
||||||
var parentClass = parent instanceof VmClass ? (VmClass) parent : VmUtils.getClass(parent);
|
var parentClass = parent instanceof VmClass ? (VmClass) parent : VmUtils.getClass(parent);
|
||||||
VmUtils.checkIsInstantiable(parentClass, getParentNode());
|
VmUtils.checkIsInstantiable(parentClass, getParentNode());
|
||||||
@@ -110,7 +112,9 @@ public abstract class SpecializedObjectLiteralNode extends ObjectLiteralNode {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("SameReturnValue")
|
||||||
@TruffleBoundary
|
@TruffleBoundary
|
||||||
|
@Idempotent
|
||||||
protected final boolean checkIsValidListingAmendment() {
|
protected final boolean checkIsValidListingAmendment() {
|
||||||
if (maxListingMemberIndex != Long.MIN_VALUE) return true;
|
if (maxListingMemberIndex != Long.MIN_VALUE) return true;
|
||||||
|
|
||||||
@@ -161,7 +165,9 @@ public abstract class SpecializedObjectLiteralNode extends ObjectLiteralNode {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("SameReturnValue")
|
||||||
@TruffleBoundary
|
@TruffleBoundary
|
||||||
|
@Idempotent
|
||||||
protected final boolean checkIsValidMappingAmendment() {
|
protected final boolean checkIsValidMappingAmendment() {
|
||||||
if (checkedIsValidMappingAmendment) return true;
|
if (checkedIsValidMappingAmendment) return true;
|
||||||
|
|
||||||
@@ -190,6 +196,7 @@ public abstract class SpecializedObjectLiteralNode extends ObjectLiteralNode {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
protected final boolean checkMaxListingMemberIndex(int parentLength) {
|
protected final boolean checkMaxListingMemberIndex(int parentLength) {
|
||||||
assert maxListingMemberIndex != Long.MIN_VALUE;
|
assert maxListingMemberIndex != Long.MIN_VALUE;
|
||||||
if (maxListingMemberIndex < parentLength) return true;
|
if (maxListingMemberIndex < parentLength) return true;
|
||||||
|
|||||||
+3
-2
@@ -18,6 +18,7 @@ package org.pkl.core.ast.expression.member;
|
|||||||
import com.oracle.truffle.api.CompilerDirectives;
|
import com.oracle.truffle.api.CompilerDirectives;
|
||||||
import com.oracle.truffle.api.RootCallTarget;
|
import com.oracle.truffle.api.RootCallTarget;
|
||||||
import com.oracle.truffle.api.dsl.Cached;
|
import com.oracle.truffle.api.dsl.Cached;
|
||||||
|
import com.oracle.truffle.api.dsl.Cached.Exclusive;
|
||||||
import com.oracle.truffle.api.dsl.ImportStatic;
|
import com.oracle.truffle.api.dsl.ImportStatic;
|
||||||
import com.oracle.truffle.api.dsl.NodeChild;
|
import com.oracle.truffle.api.dsl.NodeChild;
|
||||||
import com.oracle.truffle.api.dsl.Specialization;
|
import com.oracle.truffle.api.dsl.Specialization;
|
||||||
@@ -100,7 +101,7 @@ public abstract class InvokeMethodVirtualNode extends ExpressionNode {
|
|||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
VmFunction receiver,
|
VmFunction receiver,
|
||||||
@SuppressWarnings("unused") VmClass receiverClass,
|
@SuppressWarnings("unused") VmClass receiverClass,
|
||||||
@Cached("create()") IndirectCallNode callNode) {
|
@Exclusive @Cached("create()") IndirectCallNode callNode) {
|
||||||
|
|
||||||
var args = new Object[2 + argumentNodes.length];
|
var args = new Object[2 + argumentNodes.length];
|
||||||
args[0] = receiver.getThisValue();
|
args[0] = receiver.getThisValue();
|
||||||
@@ -138,7 +139,7 @@ public abstract class InvokeMethodVirtualNode extends ExpressionNode {
|
|||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
Object receiver,
|
Object receiver,
|
||||||
VmClass receiverClass,
|
VmClass receiverClass,
|
||||||
@Cached("create()") IndirectCallNode callNode) {
|
@Exclusive @Cached("create()") IndirectCallNode callNode) {
|
||||||
|
|
||||||
var method = resolveMethod(receiverClass);
|
var method = resolveMethod(receiverClass);
|
||||||
var args = new Object[2 + argumentNodes.length];
|
var args = new Object[2 + argumentNodes.length];
|
||||||
|
|||||||
+1
-1
@@ -51,7 +51,7 @@ public abstract class InvokeSuperMethodNode extends ExpressionNode {
|
|||||||
@Specialization
|
@Specialization
|
||||||
protected Object eval(
|
protected Object eval(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
@Cached("findSupermethod(frame)") ClassMethod supermethod,
|
@Cached(value = "findSupermethod(frame)", neverDefault = true) ClassMethod supermethod,
|
||||||
@Cached("create(supermethod.getCallTarget(sourceSection))") DirectCallNode callNode) {
|
@Cached("create(supermethod.getCallTarget(sourceSection))") DirectCallNode callNode) {
|
||||||
|
|
||||||
var args = new Object[2 + argumentNodes.length];
|
var args = new Object[2 + argumentNodes.length];
|
||||||
|
|||||||
@@ -60,7 +60,8 @@ public abstract class ToStringNode extends UnaryExpressionNode {
|
|||||||
protected String evalTyped(
|
protected String evalTyped(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
VmTyped value,
|
VmTyped value,
|
||||||
@Cached("createInvokeNode()") InvokeMethodVirtualNode invokeNode) {
|
@Cached(value = "createInvokeNode()", neverDefault = true)
|
||||||
|
InvokeMethodVirtualNode invokeNode) {
|
||||||
|
|
||||||
return (String) invokeNode.executeWith(frame, value, value.getVmClass());
|
return (String) invokeNode.executeWith(frame, value, value.getVmClass());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ public abstract class TypeConstraintNode extends PklNode {
|
|||||||
protected void eval(
|
protected void eval(
|
||||||
VirtualFrame frame,
|
VirtualFrame frame,
|
||||||
VmFunction function,
|
VmFunction function,
|
||||||
@Cached("createApplyNode()") ApplyVmFunction1Node applyNode) {
|
@Cached(value = "createApplyNode()", neverDefault = true) ApplyVmFunction1Node applyNode) {
|
||||||
initConstraintSlot(frame);
|
initConstraintSlot(frame);
|
||||||
|
|
||||||
var value = frame.getAuxiliarySlot(customThisSlot);
|
var value = frame.getAuxiliarySlot(customThisSlot);
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ package org.pkl.core.runtime;
|
|||||||
|
|
||||||
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
|
import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
|
||||||
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
||||||
|
import com.oracle.truffle.api.dsl.Idempotent;
|
||||||
import com.oracle.truffle.api.frame.FrameDescriptor;
|
import com.oracle.truffle.api.frame.FrameDescriptor;
|
||||||
import com.oracle.truffle.api.source.SourceSection;
|
import com.oracle.truffle.api.source.SourceSection;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -343,79 +344,98 @@ public final class VmClass extends VmValue {
|
|||||||
return prototype;
|
return prototype;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isAbstract() {
|
public boolean isAbstract() {
|
||||||
return VmModifier.isAbstract(modifiers);
|
return VmModifier.isAbstract(modifiers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isExternal() {
|
public boolean isExternal() {
|
||||||
return VmModifier.isExternal(modifiers);
|
return VmModifier.isExternal(modifiers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isOpen() {
|
public boolean isOpen() {
|
||||||
return VmModifier.isOpen(modifiers);
|
return VmModifier.isOpen(modifiers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isClosed() {
|
public boolean isClosed() {
|
||||||
return VmModifier.isClosed(modifiers);
|
return VmModifier.isClosed(modifiers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isInstantiable() {
|
public boolean isInstantiable() {
|
||||||
return VmModifier.isInstantiable(modifiers);
|
return VmModifier.isInstantiable(modifiers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isNullClass() {
|
public boolean isNullClass() {
|
||||||
return isClass(BaseModule.getNullClass(), "pkl.base#Null");
|
return isClass(BaseModule.getNullClass(), "pkl.base#Null");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isCollectionClass() {
|
public boolean isCollectionClass() {
|
||||||
return isClass(BaseModule.getCollectionClass(), "pkl.base#Collection");
|
return isClass(BaseModule.getCollectionClass(), "pkl.base#Collection");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isListClass() {
|
public boolean isListClass() {
|
||||||
return isClass(BaseModule.getListClass(), "pkl.base#List");
|
return isClass(BaseModule.getListClass(), "pkl.base#List");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isSetClass() {
|
public boolean isSetClass() {
|
||||||
return isClass(BaseModule.getSetClass(), "pkl.base#Set");
|
return isClass(BaseModule.getSetClass(), "pkl.base#Set");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isMapClass() {
|
public boolean isMapClass() {
|
||||||
return isClass(BaseModule.getMapClass(), "pkl.base#Map");
|
return isClass(BaseModule.getMapClass(), "pkl.base#Map");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isListingClass() {
|
public boolean isListingClass() {
|
||||||
return isClass(BaseModule.getListingClass(), "pkl.base#Listing");
|
return isClass(BaseModule.getListingClass(), "pkl.base#Listing");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isMappingClass() {
|
public boolean isMappingClass() {
|
||||||
return isClass(BaseModule.getMappingClass(), "pkl.base#Mapping");
|
return isClass(BaseModule.getMappingClass(), "pkl.base#Mapping");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isDynamicClass() {
|
public boolean isDynamicClass() {
|
||||||
return isClass(BaseModule.getDynamicClass(), "pkl.base#Dynamic");
|
return isClass(BaseModule.getDynamicClass(), "pkl.base#Dynamic");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isPairClass() {
|
public boolean isPairClass() {
|
||||||
return isClass(BaseModule.getPairClass(), "pkl.base#Pair");
|
return isClass(BaseModule.getPairClass(), "pkl.base#Pair");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isFunctionClass() {
|
public boolean isFunctionClass() {
|
||||||
return isClass(BaseModule.getFunctionClass(), "pkl.base#Function");
|
return isClass(BaseModule.getFunctionClass(), "pkl.base#Function");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isFunctionNClass() {
|
public boolean isFunctionNClass() {
|
||||||
return superclass != null
|
return superclass != null
|
||||||
&& superclass.isClass(BaseModule.getFunctionClass(), "pkl.base#Function");
|
&& superclass.isClass(BaseModule.getFunctionClass(), "pkl.base#Function");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isModuleClass() {
|
public boolean isModuleClass() {
|
||||||
return isClass(BaseModule.getModuleClass(), "pkl.base#Module");
|
return isClass(BaseModule.getModuleClass(), "pkl.base#Module");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isClassClass() {
|
public boolean isClassClass() {
|
||||||
return isClass(BaseModule.getClassClass(), "pkl.base#Class");
|
return isClass(BaseModule.getClassClass(), "pkl.base#Class");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Idempotent
|
||||||
public boolean isVarArgsClass() {
|
public boolean isVarArgsClass() {
|
||||||
return isClass(BaseModule.getVarArgsClass(), "pkl.base#VarArgs");
|
return isClass(BaseModule.getVarArgsClass(), "pkl.base#VarArgs");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import org.pkl.core.util.MathUtils;
|
|||||||
import org.pkl.core.util.Nullable;
|
import org.pkl.core.util.Nullable;
|
||||||
|
|
||||||
@ValueType
|
@ValueType
|
||||||
public final strictfp class VmDataSize extends VmValue implements Comparable<VmDataSize> {
|
public final class VmDataSize extends VmValue implements Comparable<VmDataSize> {
|
||||||
private static final Map<Identifier, DataSizeUnit> UNITS =
|
private static final Map<Identifier, DataSizeUnit> UNITS =
|
||||||
Map.ofEntries(
|
Map.ofEntries(
|
||||||
entry(Identifier.B, DataSizeUnit.BYTES),
|
entry(Identifier.B, DataSizeUnit.BYTES),
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import org.pkl.core.util.DurationUtils;
|
|||||||
import org.pkl.core.util.Nullable;
|
import org.pkl.core.util.Nullable;
|
||||||
|
|
||||||
@ValueType
|
@ValueType
|
||||||
public final strictfp class VmDuration extends VmValue implements Comparable<VmDuration> {
|
public final class VmDuration extends VmValue implements Comparable<VmDuration> {
|
||||||
private static final Map<Identifier, DurationUnit> UNITS =
|
private static final Map<Identifier, DurationUnit> UNITS =
|
||||||
Map.of(
|
Map.of(
|
||||||
Identifier.NS, DurationUnit.NANOS,
|
Identifier.NS, DurationUnit.NANOS,
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import org.pkl.core.util.MathUtils;
|
|||||||
* optimization by Graal. To control error messages in a single place (namely here),
|
* optimization by Graal. To control error messages in a single place (namely here),
|
||||||
* [ArithmeticException]s thrown by [java.lang.StrictMath] are caught and rethrown.
|
* [ArithmeticException]s thrown by [java.lang.StrictMath] are caught and rethrown.
|
||||||
*/
|
*/
|
||||||
public final strictfp class VmSafeMath {
|
public final class VmSafeMath {
|
||||||
private VmSafeMath() {}
|
private VmSafeMath() {}
|
||||||
|
|
||||||
public static long negate(long x) {
|
public static long negate(long x) {
|
||||||
|
|||||||
@@ -215,7 +215,7 @@ public final class IntNodes {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract static strictfp class toFloat extends ExternalMethod0Node {
|
public abstract static class toFloat extends ExternalMethod0Node {
|
||||||
@Specialization
|
@Specialization
|
||||||
protected double eval(long self) {
|
protected double eval(long self) {
|
||||||
return self;
|
return self;
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import org.pkl.core.stdlib.ExternalPropertyNode;
|
|||||||
import org.pkl.core.util.MathUtils;
|
import org.pkl.core.util.MathUtils;
|
||||||
|
|
||||||
// implementation notes:
|
// implementation notes:
|
||||||
// make sure to use strictfp for all fp operations
|
|
||||||
// according to graal folks, it shouldn't be necessary to put
|
// according to graal folks, it shouldn't be necessary to put
|
||||||
// java.lang.Math calls behind a @TruffleBoundary, and doing so
|
// java.lang.Math calls behind a @TruffleBoundary, and doing so
|
||||||
// could prevent Graal from applying its java.lang.Math intrinsics
|
// could prevent Graal from applying its java.lang.Math intrinsics
|
||||||
@@ -202,7 +201,7 @@ public final class MathNodes {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract static strictfp class log2 extends ExternalMethod1Node {
|
public abstract static class log2 extends ExternalMethod1Node {
|
||||||
@Specialization
|
@Specialization
|
||||||
protected double eval(VmTyped self, long x) {
|
protected double eval(VmTyped self, long x) {
|
||||||
// based on com.google.common.math.DoubleMath.log2, but uses StrictMath
|
// based on com.google.common.math.DoubleMath.log2, but uses StrictMath
|
||||||
@@ -311,7 +310,7 @@ public final class MathNodes {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract static strictfp class lcm extends ExternalMethod2Node {
|
public abstract static class lcm extends ExternalMethod2Node {
|
||||||
@TruffleBoundary
|
@TruffleBoundary
|
||||||
@Specialization
|
@Specialization
|
||||||
protected long eval(VmTyped self, long x, long y) {
|
protected long eval(VmTyped self, long x, long y) {
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ package org.pkl.core.util;
|
|||||||
|
|
||||||
import org.pkl.core.DurationUnit;
|
import org.pkl.core.DurationUnit;
|
||||||
|
|
||||||
public final strictfp class DurationUtils {
|
public final class DurationUtils {
|
||||||
private DurationUtils() {}
|
private DurationUtils() {}
|
||||||
|
|
||||||
public static String toPklString(double value, DurationUnit unit) {
|
public static String toPklString(double value, DurationUnit unit) {
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ package org.pkl.core.util;
|
|||||||
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
|
||||||
import java.math.RoundingMode;
|
import java.math.RoundingMode;
|
||||||
|
|
||||||
public final strictfp class MathUtils {
|
public final class MathUtils {
|
||||||
private static final long FLOOR_SQRT_MAX_LONG = 3037000499L;
|
private static final long FLOOR_SQRT_MAX_LONG = 3037000499L;
|
||||||
|
|
||||||
// The mask for the significand, according to the {@link
|
// The mask for the significand, according to the {@link
|
||||||
|
|||||||
@@ -40,10 +40,10 @@ org.commonmark:commonmark:0.21.0=default
|
|||||||
org.commonmark:commonmark:0.22.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.commonmark:commonmark:0.22.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.eclipse.jetty:jetty-util-ajax:9.4.18.v20190429=validator
|
org.eclipse.jetty:jetty-util-ajax:9.4.18.v20190429=validator
|
||||||
org.eclipse.jetty:jetty-util:9.4.18.v20190429=validator
|
org.eclipse.jetty:jetty-util:9.4.18.v20190429=validator
|
||||||
org.graalvm.js:js:22.3.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.graalvm.js:js:23.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.regex:regex:22.3.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.graalvm.regex:regex:23.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=default,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=default,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=default,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=default,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ plugins {
|
|||||||
alias(libs.plugins.kotlinxSerialization)
|
alias(libs.plugins.kotlinxSerialization)
|
||||||
}
|
}
|
||||||
|
|
||||||
val graalVmBaseDir = buildInfo.graalVm.baseDir
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(projects.pklCore)
|
implementation(projects.pklCore)
|
||||||
implementation(projects.pklCommonsCli)
|
implementation(projects.pklCommonsCli)
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependen
|
|||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=testRuntimeClasspath
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testImplementationDependen
|
|||||||
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
|
||||||
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.assertj:assertj-core:3.25.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=compileClasspath,default,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
|
||||||
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ org.commonmark:commonmark:0.21.0=default
|
|||||||
org.commonmark:commonmark:0.22.0=runtimeClasspath,testRuntimeClasspath
|
org.commonmark:commonmark:0.22.0=runtimeClasspath,testRuntimeClasspath
|
||||||
org.fusesource.jansi:jansi:2.4.0=default
|
org.fusesource.jansi:jansi:2.4.0=default
|
||||||
org.fusesource.jansi:jansi:2.4.1=runtimeClasspath,testRuntimeClasspath
|
org.fusesource.jansi:jansi:2.4.1=runtimeClasspath,testRuntimeClasspath
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.sdk:graal-sdk:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=default,runtimeClasspath,testRuntimeClasspath
|
org.graalvm.truffle:truffle-api:23.0.2=default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.jetbrains.kotlin:kotlin-reflect:1.7.10=default,runtimeClasspath,testRuntimeClasspath
|
org.jetbrains.kotlin:kotlin-reflect:1.7.10=default,runtimeClasspath,testRuntimeClasspath
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
|
||||||
|
|||||||
@@ -6,12 +6,12 @@ com.github.ajalt.clikt:clikt:3.5.1=pkldoc
|
|||||||
com.tunnelvisionlabs:antlr4-runtime:4.9.0=pkldoc
|
com.tunnelvisionlabs:antlr4-runtime:4.9.0=pkldoc
|
||||||
org.commonmark:commonmark-ext-gfm-tables:0.21.0=pkldoc
|
org.commonmark:commonmark-ext-gfm-tables:0.21.0=pkldoc
|
||||||
org.commonmark:commonmark:0.21.0=pkldoc
|
org.commonmark:commonmark:0.21.0=pkldoc
|
||||||
org.graalvm.sdk:graal-sdk:22.3.3=pkldoc
|
org.graalvm.sdk:graal-sdk:23.0.2=pkldoc
|
||||||
org.graalvm.truffle:truffle-api:22.3.3=pkldoc
|
org.graalvm.truffle:truffle-api:23.0.2=pkldoc
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=pkldoc
|
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21=pkldoc
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=pkldoc
|
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.21=pkldoc
|
||||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=pkldoc
|
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21=pkldoc
|
||||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=pkldoc
|
org.jetbrains.kotlin:kotlin-stdlib:1.8.21=pkldoc
|
||||||
org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1=pkldoc
|
org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1=pkldoc
|
||||||
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.5.1=pkldoc
|
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.5.1=pkldoc
|
||||||
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.5.1=pkldoc
|
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.5.1=pkldoc
|
||||||
|
|||||||
Reference in New Issue
Block a user