Prepare 0.31.1 release

Closes #1472

Co-authored-by: Islon Scherer <i_desouzascherer@apple.com>

.github/jobs/GradleJob.pkl

@@ -81,7 +81,7 @@ fixed job {
     }
     (catalog.`actions/setup-java@v5`) {
       with {
-        `java-version` = "25"
+        `java-version` = "21"
         distribution = "temurin"
         architecture =
           if (arch == "amd64")

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -58,7 +58,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -89,7 +89,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -108,7 +108,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -140,7 +140,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -182,7 +182,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -220,7 +220,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -263,7 +263,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -301,7 +301,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -341,7 +341,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -451,7 +451,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -490,7 +490,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -528,7 +528,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -571,7 +571,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -609,7 +609,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -649,7 +649,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -759,7 +759,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -56,7 +56,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -87,7 +87,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -106,7 +106,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -138,7 +138,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -180,7 +180,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -218,7 +218,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -261,7 +261,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -299,7 +299,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -339,7 +339,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -449,7 +449,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -488,7 +488,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -526,7 +526,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -569,7 +569,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -607,7 +607,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -647,7 +647,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -757,7 +757,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -812,7 +812,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5

.github/workflows/prb.yml

@@ -19,7 +19,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -54,7 +54,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -89,7 +89,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -129,7 +129,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -173,7 +173,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -213,7 +213,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -255,7 +255,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -367,7 +367,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -407,7 +407,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -447,7 +447,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -491,7 +491,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -531,7 +531,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -573,7 +573,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -685,7 +685,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5

.github/workflows/release-branch.yml

@@ -23,7 +23,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -56,7 +56,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -87,7 +87,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -106,7 +106,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -138,7 +138,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -180,7 +180,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -218,7 +218,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -261,7 +261,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -299,7 +299,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -339,7 +339,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -449,7 +449,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -488,7 +488,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -526,7 +526,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -569,7 +569,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -607,7 +607,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -647,7 +647,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -757,7 +757,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -56,7 +56,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -87,7 +87,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -106,7 +106,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -138,7 +138,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -181,7 +181,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -220,7 +220,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -264,7 +264,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -303,7 +303,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -344,7 +344,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -455,7 +455,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -495,7 +495,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -534,7 +534,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -578,7 +578,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -617,7 +617,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: aarch64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -658,7 +658,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -769,7 +769,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -825,7 +825,7 @@ jobs:
         persist-credentials: false
     - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
       with:
-        java-version: '25'
+        java-version: '21'
         distribution: temurin
         architecture: x64
     - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5

DEVELOPMENT.adoc

@@ -13,11 +13,11 @@ To import the project into IntelliJ, go to File->Open and select the project's r
 If the project is opened but not imported, look for a popup in the lower right corner
 and click its "Import Gradle Project" link.
 . (recommended) Install {uri-gng}[gng] +
-_gng_ enables you to run Gradle commands with `gw` (instead of `./gradlew`) from any subdirectory.
+_gng_ enables to run Gradle commands with `gw` (instead of `./gradlew`) from any subdirectory.
 . (recommended) Set up Git ignore-revs +
 `git config blame.ignoreRevsFile .git-blame-ignore-revs`
 . (recommended) Install {uri-jenv}[jenv] and plugins +
-_jenv_ uses specific JDK versions in certain subdirectories. _Pkl_ comes with a `.java-version` file specifying JDK 21. +
+_jenv_ use specific JDK versions in certain subdirectories. _Pkl_ comes with a `.java-version` file specifying JDK 21. +
 Enable _jenv_ plugins for better handling by `gradle`:
 +
 [source,shell]
@@ -92,9 +92,14 @@ Example: `./gradlew test -Djvmdebug=true`
 
 == Snippet Test Plugin
 
-There is an IntelliJ plugin meant for development on the Pkl project itself located in https://github.com/apple/pkl-project-commons[pkl-project-commons].
+There is an IntelliJ plugin meant for development on the Pkl project itself.
+This plugin provides a split pane window when viewing snippet tests such as LanguageSnippetTests and FormatterSnippetTests.
 
-See https://github.com/apple/pkl-project-commons?tab=readme-ov-file#internal-intellij-plugin[its readme] for instructions on how to set it up.
+To install:
+
+1. Run `./gradlew pkl-internal-intellij-plugin:buildPlugin`.
+2. Within IntelliJ, run the action "Install Plugin From Disk...".
+3. Select the zip file within `pkl-internal-intellij-plugin/build/distributions`.
 
 == Resources
 
@@ -105,12 +110,12 @@ For automated build setup examples see our https://github.com/apple/pkl/blob/mai
 * http://ssw.jku.at/Research/Projects/JVM/Truffle.html[Homepage]
 * https://github.com/graalvm/truffle[GitHub]
 * http://lafo.ssw.uni-linz.ac.at/javadoc/truffle/latest/[Javadoc]
-* https://mail.openjdk.org/pipermail/graal-dev/[Mailing List]
+* http://mail.openjdk.java.net/pipermail/graal-dev/[Mailing List]
 * https://medium.com/@octskyward/graal-truffle-134d8f28fb69#.2db370y2g[Graal & Truffle (Article)]
 * https://comserv.cs.ut.ee/home/files/Pool_ComputerScience_2016.pdf?study=ATILoputoo&reference=6319668E7151D556131810BC3F4A627D7FEF5F3B[Truffle Overview (see chapter 1)]
 * https://gist.github.com/smarr/d1f8f2101b5cc8e14e12[Truffle: Languages and Material]
 * https://github.com/smarr/truffle-notes[Truffle Notes]
-* https://www.graalvm.org/latest/graalvm-as-a-platform/language-implementation-framework/[Truffle Language Implementation Framework]
+* https://wiki.openjdk.java.net/display/Graal/Truffle+FAQ+and+Guidelines[Truffle FAQ]
 
 === Other Config Languages
 

NOTICE.txt

@@ -1,4 +1,4 @@
-Copyright © 2024-2026 Apple Inc. and the Pkl project authors
+Copyright © 2024-2025 Apple Inc. and the Pkl project authors
 
 
 Portions of this software were originally based on 'SnakeYAML' developed by Andrey Somov.

bench/gradle.lockfile

@@ -6,75 +6,64 @@ com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolva
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=jmh,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=jmh,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath
+net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhRuntimeClasspath
+org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=jmhCompileClasspath,testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=jmhCompileClasspath,jmhImplementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=jmh,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=jmh,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.graalvm.compiler:compiler:25.0.1=graal
+org.graalvm.compiler:compiler:25.0.0=graal
-org.graalvm.polyglot:polyglot:25.0.1=jmh,jmhRuntimeClasspath,truffle
+org.graalvm.polyglot:polyglot:25.0.0=jmh,jmhRuntimeClasspath,truffle
-org.graalvm.sdk:collections:25.0.1=graal,jmh,jmhRuntimeClasspath,truffle
+org.graalvm.sdk:collections:25.0.0=graal,jmh,jmhRuntimeClasspath,truffle
-org.graalvm.sdk:graal-sdk:25.0.1=jmh,jmhRuntimeClasspath
+org.graalvm.sdk:graal-sdk:25.0.0=jmh,jmhRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.1=jmh,jmhRuntimeClasspath,truffle
+org.graalvm.sdk:nativeimage:25.0.0=jmh,jmhRuntimeClasspath,truffle
-org.graalvm.sdk:word:25.0.1=graal,jmh,jmhRuntimeClasspath,truffle
+org.graalvm.sdk:word:25.0.0=graal,jmh,jmhRuntimeClasspath,truffle
-org.graalvm.truffle:truffle-api:25.0.1=jmh,jmhRuntimeClasspath,truffle
+org.graalvm.truffle:truffle-api:25.0.0=jmh,jmhRuntimeClasspath,truffle
-org.graalvm.truffle:truffle-compiler:25.0.1=graal
+org.graalvm.truffle:truffle-compiler:25.0.0=graal
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,jmh,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=jmh,jmhCompileClasspath,jmhRuntimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:6.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=jmh,jmhRuntimeClasspath
-org.msgpack:msgpack-core:0.9.11=jmh,jmhRuntimeClasspath
+org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
+org.openjdk.jmh:jmh-generator-asm:1.37=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-generator-asm:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
+org.openjdk.jmh:jmh-generator-bytecode:1.37=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-generator-bytecode:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
+org.openjdk.jmh:jmh-generator-reflection:1.37=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-generator-reflection:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.organicdesign:Paguro:3.10.3=jmh,jmhRuntimeClasspath
-org.ow2.asm:asm:9.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
+org.ow2.asm:asm:9.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.10=jmh,jmhRuntimeClasspath
-empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,jmhAnnotationProcessor,jmhApiDependenciesMetadata,jmhCompileOnlyDependenciesMetadata,jmhImplementationDependenciesMetadata,jmhIntransitiveDependenciesMetadata,jmhKotlinScriptDefExtensions,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=annotationProcessor,apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,jmhAnnotationProcessor,jmhApiDependenciesMetadata,jmhCompileOnlyDependenciesMetadata,jmhIntransitiveDependenciesMetadata,jmhKotlinScriptDefExtensions,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,runtimeClasspath,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

buildSrc/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,16 +20,11 @@ plugins {
   `jvm-toolchains`
 }
 
-/**
+// Keep this in sync with the constants in `BuildInfo.kt` (those are not addressable here).
- * To avoid the provisioning of multiple JDKs and other build issues, keep this value in sync with
+val toolchainVersion = 21
- * the JVM toolchain versions in `BuildInfo.kt` and `gradle-daemon-jvm.properties`.
- */
-val toolchainVersion = 25
 
 dependencies {
   implementation(libs.downloadTaskPlugin)
-  implementation(libs.errorPronePlugin)
-  implementation(libs.nullawayPlugin)
   implementation(libs.spotlessPlugin)
   implementation(libs.kotlinPlugin) { exclude(module = "kotlin-android-extensions") }
   implementation(libs.shadowPlugin)

buildSrc/src/main/kotlin/BuildInfo.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import org.gradle.process.CommandLineArgumentProvider
 
 /**
  * JVM bytecode target; this is pinned at a reasonable version, because downstream JVM projects
- * which consume Pkl will need a minimum bytecode level at or above this one.
+ * which consume Pkl will need a minimum Bytecode level at or above this one.
  *
  * Kotlin and Java need matching bytecode targets, so this is expressed as a build setting and
  * constant default. To override, pass `-DpklJdkToolchain=X` to the Gradle command line, where X is
@@ -40,13 +40,10 @@ import org.gradle.process.CommandLineArgumentProvider
 const val PKL_JVM_TARGET_DEFAULT_MAXIMUM = 17
 
 /**
- * The Pkl build requires JDK 25+; otherwise, NullAway will not work correctly.
+ * The Pkl build requires JDK 21+ to build, because JDK 17 is no longer within the default set of
- *
+ * supported JDKs for GraalVM. This is a build-time requirement, not a runtime requirement.
- * This is a build-time requirement, not a runtime requirement. To avoid the provisioning of
- * multiple JDKs and other build issues, keep this value in sync with the JVM toolchain versions in
- * `buildSrc/build.gradle.kts` and `gradle-daemon-jvm.properties`.
  */
-const val PKL_JDK_VERSION_MIN = 25
+const val PKL_JDK_VERSION_MIN = 21
 
 /**
  * The JDK minimum is set to match the bytecode minimum, to guarantee that fat JARs work against the
@@ -55,15 +52,14 @@ const val PKL_JDK_VERSION_MIN = 25
 const val PKL_TEST_JDK_MINIMUM = PKL_JVM_TARGET_DEFAULT_MAXIMUM
 
 /**
- * Maximum JDK version which Pkl is tested with; this should be bumped when new JDK releases are
+ * Maximum JDK version which Pkl is tested with; this should be bumped when new JDK stable releases
- * issued.
+ * are issued. At the time of this writing, JDK 23 is the latest available release.
  */
-const val PKL_TEST_JDK_MAXIMUM = 26
+const val PKL_TEST_JDK_MAXIMUM = 23
 
 /**
- * If `true`, all JDK releases between [PKL_TEST_JDK_MINIMUM] and [PKL_TEST_JDK_MAXIMUM] are tested.
+ * Test the full suite of JDKs between [PKL_TEST_JDK_MINIMUM] and [PKL_TEST_JDK_MAXIMUM]; if this is
- * If `false`, only LTS releases within that range are tested. To override, pass
+ * set to `false` (or overridden on the command line), only LTS releases are tested by default.
- * `-DpklTestAllJdks=true` on the Gradle command line.
  */
 const val PKL_TEST_ALL_JDKS = false
 
@@ -201,8 +197,8 @@ open class BuildInfo(private val project: Project) {
   }
 
   val testJdkVendors: Sequence<JvmVendorSpec> by lazy {
-    // By default, only Adoptium is tested during multi-JDK testing. Flip `-DpklTestAllVendors=true`
+    // By default, only OpenJDK is tested during multi-JDK testing. Flip `-DpklTestAllVendors=true`
-    // to additionally test against GraalVM and Oracle.
+    // to additionally test against a suite of JDK vendors, including Azul, Oracle, and GraalVM.
     when (System.getProperty("pklTestAllVendors")?.toBoolean()) {
       true -> sequenceOf(JvmVendorSpec.ADOPTIUM, JvmVendorSpec.GRAAL_VM, JvmVendorSpec.ORACLE)
       else -> sequenceOf(JvmVendorSpec.ADOPTIUM)
@@ -282,9 +278,8 @@ open class BuildInfo(private val project: Project) {
       val namer = testNamer(baseNameProvider)
       val applyConfig: MultiJdkTestConfigurator = { (version, jdk) ->
         // 1) copy configurations from the template task
+        dependsOn(templateTask)
         templateTask.get().let { template ->
-          // copy explicit dependencies not inferred from task inputs
-          dependsOn(template.dependsOn)
           classpath = template.classpath
           testClassesDirs = template.testClassesDirs
           jvmArgs.addAll(template.jvmArgs)
@@ -310,8 +305,8 @@ open class BuildInfo(private val project: Project) {
             // multiply out by jdk vendor
             testJdkVendors.map { vendor -> (targetVersion to vendor) }
           }
-          .mapNotNull { (jdkTarget, vendor) ->
+          .map { (jdkTarget, vendor) ->
-            if (jdkToolchainVersion == jdkTarget) {
+            if (jdkToolchainVersion == jdkTarget)
               tasks.register(namer(jdkTarget, vendor)) {
                 // alias to `test`
                 dependsOn(templateTask)
@@ -319,24 +314,20 @@ open class BuildInfo(private val project: Project) {
                 description =
                   "Alias for regular '${baseNameProvider()}' task, on JDK ${jdkTarget.asInt()}"
               }
-            } else {
+            else
-              // Always register and enable the task so it can be run explicitly,
+              tasks.register(namer(jdkTarget, vendor.takeIf { isMultiVendor }), Test::class) {
-              // but only return it if it should be included in "check".
+                enabled = jdkTarget.isEnabled
-              val task =
+                group = Category.VERIFICATION
-                tasks.register(namer(jdkTarget, vendor.takeIf { isMultiVendor }), Test::class) {
+                description = "Run tests against JDK ${jdkTarget.asInt()}"
-                  group = Category.VERIFICATION
+                applyConfig(jdkTarget to toolchains.launcherFor { languageVersion = jdkTarget })
-                  description = "Run tests against JDK ${jdkTarget.asInt()}"
+                // fix: on jdk17, we must force the polyglot module on to the modulepath
-                  applyConfig(jdkTarget to toolchains.launcherFor { languageVersion = jdkTarget })
+                if (jdkTarget.asInt() == 17)
-                  // fix: on jdk17, we must force the polyglot module on to the modulepath
+                  jvmArgumentProviders.add(
-                  if (jdkTarget.asInt() == 17)
+                    CommandLineArgumentProvider {
-                    jvmArgumentProviders.add(
+                      buildList { listOf("--add-modules=org.graalvm.polyglot") }
-                      CommandLineArgumentProvider {
+                    }
-                        buildList { listOf("--add-modules=org.graalvm.polyglot") }
+                  )
-                      }
+              }
-                    )
-                }
-              task.takeIf { jdkTarget.isEnabled }
-            }
           }
           .toList()
       }
@@ -377,7 +368,7 @@ open class BuildInfo(private val project: Project) {
     // allow -DcommitId=abc123 for build environments that don't have git.
     System.getProperty("commitId").let { if (it != null) return@lazy it }
     // only run command once per build invocation
-    if (project.path == project.rootProject.path) {
+    if (project === project.rootProject) {
       val process =
         ProcessBuilder()
           .command("git", "rev-parse", "--short", "HEAD")

buildSrc/src/main/kotlin/ExecutableJar.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@ abstract class ExecutableJar : DefaultTask() {
   @get:Input abstract val jvmArgs: ListProperty<String>
 
   @TaskAction
-  @Suppress("unused")
   fun buildJar() {
     val inFile = inJar.get().asFile
     val outFile = outJar.get().asFile

buildSrc/src/main/kotlin/JavaVersionRange.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ private val ltsReleases =
     JavaLanguageVersion.of(11),
     JavaLanguageVersion.of(17),
     JavaLanguageVersion.of(21),
-    JavaLanguageVersion.of(25),
   )
 
 /** Describes an inclusive range of JVM versions, based on the [JavaLanguageVersion] type. */

buildSrc/src/main/kotlin/MergeSourcesJars.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ open class MergeSourcesJars : DefaultTask() {
     // a word or a period character. should catch most cases.
     val importPattern =
       Pattern.compile(
-        "(?<!([\\w.]))(" + relocatedPkgs.keys.joinToString("|") { it.replace(".", "\\.") } + ")"
+        "(?<!(\\w|\\.))(" + relocatedPkgs.keys.joinToString("|") { it.replace(".", "\\.") } + ")"
       )
 
     val sourceFileExts = sourceFileExtensions.get()

buildSrc/src/main/kotlin/NativeImageBuild.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,12 +55,13 @@ abstract class NativeImageBuild : DefaultTask() {
 
   @get:Inject protected abstract val execOperations: ExecOperations
 
-  private val graalVm: Provider<BuildInfo.GraalVm> = arch.map { a ->
+  private val graalVm: Provider<BuildInfo.GraalVm> =
-    when (a) {
+    arch.map { a ->
-      Architecture.AMD64 -> buildInfo.graalVmAmd64
+      when (a) {
-      Architecture.AARCH64 -> buildInfo.graalVmAarch64
+        Architecture.AMD64 -> buildInfo.graalVmAmd64
+        Architecture.AARCH64 -> buildInfo.graalVmAarch64
+      }
     }
-  }
 
   private val buildInfo: BuildInfo = project.extensions.getByType(BuildInfo::class.java)
 
@@ -101,7 +102,6 @@ abstract class NativeImageBuild : DefaultTask() {
   }
 
   @TaskAction
-  @Suppress("unused")
   protected fun run() {
     execOperations.exec {
       val exclusions =
@@ -118,8 +118,6 @@ abstract class NativeImageBuild : DefaultTask() {
         add("--initialize-at-build-time=")
         // needed for messagepack-java (see https://github.com/msgpack/msgpack-java/issues/600)
         add("--initialize-at-run-time=org.msgpack.core.buffer.DirectBufferAccess")
-        // needed for jline-terminal-jni
-        add("--initialize-at-run-time=org.jline.nativ,org.jline.terminal.impl.jni")
         add("--no-fallback")
         add("-H:IncludeResources=org/pkl/core/stdlib/.*\\.pkl")
         add("-H:IncludeResources=org/jline/utils/.*")
@@ -131,7 +129,7 @@ abstract class NativeImageBuild : DefaultTask() {
         add(imageName.get())
         // the actual limit (currently) used by native-image is this number + 1400 (idea is to
         // compensate for Truffle's own nodes)
-        add("-H:MaxRuntimeCompileMethods=2000")
+        add("-H:MaxRuntimeCompileMethods=1800")
         add("-H:+EnforceMaxRuntimeCompileMethods")
         add("--enable-url-protocols=http,https")
         add("-H:+ReportExceptionStackTraces")
@@ -150,9 +148,10 @@ abstract class NativeImageBuild : DefaultTask() {
         }
         // native-image rejects non-existing class path entries -> filter
         add("--class-path")
-        val pathInput = classpath.filter {
+        val pathInput =
-          it.exists() && !exclusions.any { exclude -> it.name.contains(exclude) }
+          classpath.filter {
-        }
+            it.exists() && !exclusions.any { exclude -> it.name.contains(exclude) }
+          }
         add(pathInput.asPath)
         // make sure dev machine stays responsive (15% slowdown on my laptop)
         val processors =

buildSrc/src/main/kotlin/PklFormatterSpotless.kt

@@ -42,8 +42,7 @@ class PklFormatterFunc(@Transient private val configuration: Configuration) :
 
   private val classLoader by lazy {
     val urls = configuration.files.map { it.toURI().toURL() }
-    // Use the platform classloader as parent to isolate from Gradle's classloader
+    URLClassLoader(urls.toTypedArray())
-    URLClassLoader(urls.toTypedArray(), ClassLoader.getPlatformClassLoader())
   }
 
   private val formatterClass by lazy { classLoader.loadClass("org.pkl.formatter.Formatter") }

buildSrc/src/main/kotlin/RevertYearOnlyChanges.kt

@@ -1,77 +0,0 @@
-/*
- * Copyright © 2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import com.diffplug.spotless.FormatterFunc
-import com.diffplug.spotless.FormatterStep
-import java.io.File
-import java.io.Serial
-import java.io.Serializable
-
-/**
- * A Spotless [FormatterStep] that suppresses formatting changes where the only difference between
- * the formatted output and the file's content in the upstream base ref is the license header year.
- *
- * Avoids an issue where, in the process of working on the codebase:
- * 1. A file is modified.
- * 2. Spotless formats the file, and also updates the copyright year.
- * 3. The original modification is reverted.
- * 4. Spotless formats the file again, but now the copyright year is the updated year.
- */
-class RevertYearOnlyChangesStep(private val repoRoot: File, private val ratchetFrom: String) :
-  Serializable {
-  companion object {
-    @Serial private const val serialVersionUID: Long = 1L
-  }
-
-  fun create(): FormatterStep =
-    FormatterStep.createLazy(
-      "revertYearOnlyChanges",
-      { this },
-      { RevertYearOnlyChangesFunc(repoRoot, ratchetFrom) },
-    )
-}
-
-class RevertYearOnlyChangesFunc(private val repoRoot: File, private val ratchetFrom: String) :
-  FormatterFunc.NeedsFile, Serializable {
-  companion object {
-    @Serial private const val serialVersionUID: Long = 1L
-
-    // Matches "Copyright © 2024" or "Copyright © 2024-2025"
-    private val YEAR_REGEX = Regex("""(Copyright © )\d{4}(-\d{4})?""")
-  }
-
-  override fun applyWithFile(unix: String, file: File): String {
-    val relativePath = repoRoot.toPath().relativize(file.toPath()).toString()
-    val upstreamContent = gitShow(ratchetFrom, relativePath) ?: return unix
-    val normalizedRaw = YEAR_REGEX.replace(unix, "\$1YEAR")
-    val normalizedUpstream = YEAR_REGEX.replace(upstreamContent, "\$1YEAR")
-    return if (normalizedRaw == normalizedUpstream) {
-      // Only the year changed — return the upstream content
-      upstreamContent
-    } else {
-      unix
-    }
-  }
-
-  private fun gitShow(ref: String, path: String): String? {
-    val process =
-      ProcessBuilder("git", "show", "$ref:$path")
-        .directory(repoRoot)
-        .redirectErrorStream(true)
-        .start()
-    val output = process.inputStream.readBytes().toString(Charsets.UTF_8)
-    return if (process.waitFor() == 0) output.replace("\r\n", "\n") else null
-  }
-}

buildSrc/src/main/kotlin/pklAllProjects.gradle.kts

@@ -15,6 +15,8 @@
  */
 import com.diffplug.gradle.spotless.KotlinGradleExtension
 import org.gradle.accessors.dm.LibrariesForLibs
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins { id("com.diffplug.spotless") }
 
@@ -40,9 +42,25 @@ configurations {
   }
 }
 
-tasks.withType<JavaCompile>().configureEach {
+configurations.all {
-  javaCompiler = buildInfo.javaCompiler
+  resolutionStrategy.eachDependency {
-  options.release = buildInfo.jvmTarget
+    if (requested.group == "org.jetbrains.kotlin") {
+      // prevent transitive deps from bumping Koltin version
+      useVersion(libs.versions.kotlin.get())
+    }
+  }
+}
+
+plugins.withType(JavaPlugin::class).configureEach {
+  tasks.withType<JavaCompile>().configureEach { options.release = 17 }
+}
+
+tasks.withType<KotlinJvmCompile>().configureEach {
+  compilerOptions {
+    jvmTarget = JvmTarget.JVM_17
+    freeCompilerArgs.addAll("-Xjsr305=strict", "-Xjvm-default=all")
+    freeCompilerArgs.add("-Xjdk-release=17")
+  }
 }
 
 plugins.withType(IdeaPlugin::class).configureEach {
@@ -79,9 +97,10 @@ plugins.withType(MavenPublishPlugin::class).configureEach {
 
 // settings.gradle.kts sets `--write-locks`
 // if Gradle command line contains this task name
-val updateDependencyLocks by tasks.registering {
+val updateDependencyLocks by
-  doLast { configurations.filter { it.isCanBeResolved }.forEach { it.resolve() } }
+  tasks.registering {
-}
+    doLast { configurations.filter { it.isCanBeResolved }.forEach { it.resolve() } }
+  }
 
 val allDependencies by tasks.registering(DependencyReportTask::class)
 
@@ -91,6 +110,7 @@ tasks.withType(Test::class).configureEach {
   }
   debugOptions {
     enabled = System.getProperty("jvmdebug")?.toBoolean() ?: false
+    @Suppress("UnstableApiUsage")
     host = "*"
     port = 5005
     suspend = true
@@ -101,6 +121,7 @@ tasks.withType(Test::class).configureEach {
 tasks.withType(JavaExec::class).configureEach {
   debugOptions {
     enabled = System.getProperty("jvmdebug")?.toBoolean() ?: false
+    @Suppress("UnstableApiUsage")
     host = "*"
     port = 5005
     suspend = true
@@ -133,28 +154,22 @@ val ratchetBranchName =
 spotless {
   ratchetFrom = "$originalRemoteName/$ratchetBranchName"
 
-  val revertYearOnlyChangesStep =
-    RevertYearOnlyChangesStep(rootProject.rootDir, ratchetFrom!!).create()
-
   // When building root project, format buildSrc files too.
   // We need this because buildSrc is not a subproject of the root project, so a top-level
   // `spotlessApply` will not trigger `buildSrc:spotlessApply`.
   if (project === rootProject) {
     kotlinGradle {
       configureFormatter()
-      addStep(revertYearOnlyChangesStep)
       target("*.kts", "buildSrc/*.kts", "buildSrc/src/*/kotlin/**/*.kts")
     }
     kotlin {
       ktfmt(libs.versions.ktfmt.get()).googleStyle()
       target("buildSrc/src/*/kotlin/**/*.kt")
       licenseHeaderFile(licenseHeaderFile)
-      addStep(revertYearOnlyChangesStep)
     }
   } else {
     kotlinGradle {
       configureFormatter()
-      addStep(revertYearOnlyChangesStep)
       target("*.kts")
     }
   }

buildSrc/src/main/kotlin/pklFatJar.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ for ((key, value) in relocations) {
   }
 }
 
-val nonRelocations = listOf("com/oracle/truffle/", "org/graalvm/", "org/jspecify")
+val nonRelocations = listOf("com/oracle/truffle/", "org/graalvm/")
 
 tasks.shadowJar {
   inputs.property("relocations", relocations)
@@ -148,36 +148,37 @@ val testFatJar by
 
 tasks.check { dependsOn(testFatJar) }
 
-val validateFatJar by tasks.registering {
+val validateFatJar by
-  val outputFile = layout.buildDirectory.file("validateFatJar/result.txt")
+  tasks.registering {
-  inputs.files(tasks.shadowJar)
+    val outputFile = layout.buildDirectory.file("validateFatJar/result.txt")
-  inputs.property("nonRelocations", nonRelocations)
+    inputs.files(tasks.shadowJar)
-  outputs.file(outputFile)
+    inputs.property("nonRelocations", nonRelocations)
+    outputs.file(outputFile)
 
-  doLast {
+    doLast {
-    val unshadowedFiles = mutableListOf<String>()
+      val unshadowedFiles = mutableListOf<String>()
-    zipTree(tasks.shadowJar.get().outputs.files.singleFile).visit {
+      zipTree(tasks.shadowJar.get().outputs.files.singleFile).visit {
-      val fileDetails = this
+        val fileDetails = this
-      val path = fileDetails.relativePath.pathString
+        val path = fileDetails.relativePath.pathString
-      if (
+        if (
-        !(fileDetails.isDirectory ||
+          !(fileDetails.isDirectory ||
-          path.startsWith("org/pkl/") ||
+            path.startsWith("org/pkl/") ||
-          path.startsWith("META-INF/") ||
+            path.startsWith("META-INF/") ||
-          nonRelocations.any { path.startsWith(it) })
+            nonRelocations.any { path.startsWith(it) })
-      ) {
+        ) {
-        // don't throw exception inside `visit`
+          // don't throw exception inside `visit`
-        // as this gives a misleading "Could not expand ZIP" error message
+          // as this gives a misleading "Could not expand ZIP" error message
-        unshadowedFiles.add(path)
+          unshadowedFiles.add(path)
+        }
+      }
+      if (unshadowedFiles.isEmpty()) {
+        outputFile.get().asFile.writeText("SUCCESS")
+      } else {
+        outputFile.get().asFile.writeText("FAILURE")
+        throw GradleException("Found unshadowed files:\n" + unshadowedFiles.joinToString("\n"))
       }
     }
-    if (unshadowedFiles.isEmpty()) {
-      outputFile.get().asFile.writeText("SUCCESS")
-    } else {
-      outputFile.get().asFile.writeText("FAILURE")
-      throw GradleException("Found unshadowed files:\n" + unshadowedFiles.joinToString("\n"))
-    }
   }
-}
 
 tasks.check { dependsOn(validateFatJar) }
 

buildSrc/src/main/kotlin/pklGradlePluginTest.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,6 @@ tasks.addRule("Pattern: compatibilityTest[All|Releases|Latest|Candidate|Nightly|
   val taskName = this
   val matchResult = Regex("compatibilityTest(.+)").matchEntire(taskName) ?: return@addRule
 
-  // https://github.com/gradle/gradle/issues/32599
-  @Suppress("DEPRECATION")
   when (val taskNameSuffix = matchResult.groupValues[1]) {
     "All" ->
       task("compatibilityTestAll") {

buildSrc/src/main/kotlin/pklHtmlValidator.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,27 +23,25 @@ val validatorConfiguration: Configuration =
   configurations.create("validator") {
     resolutionStrategy.eachDependency {
       if (requested.group == "log4j" && requested.name == "log4j") {
-        useTarget(buildInfo.libs.findLibrary("log4j12Api").get())
+        @Suppress("UnstableApiUsage") useTarget(buildInfo.libs.findLibrary("log4j12Api").get())
         because("mitigate critical security vulnerabilities")
       }
     }
   }
 
 dependencies {
+  @Suppress("UnstableApiUsage")
   validatorConfiguration(buildInfo.libs.findLibrary("nuValidator").get()) {
-    // remove unnecessary dependencies
+    // we only want jetty-util and jetty-util-ajax (with the right version)
-    // (some of the requested versions don't even exist on Maven Central)
+    // couldn't find a more robust way to express this
-    exclude(group = "org.eclipse.jetty", module = "jetty-alpn-client")
     exclude(group = "org.eclipse.jetty", module = "jetty-continuation")
     exclude(group = "org.eclipse.jetty", module = "jetty-http")
+    exclude(group = "org.eclipse.jetty", module = "jetty-io")
     exclude(group = "org.eclipse.jetty", module = "jetty-security")
     exclude(group = "org.eclipse.jetty", module = "jetty-server")
     exclude(group = "org.eclipse.jetty", module = "jetty-servlets")
-    exclude(group = "org.eclipse.jetty", module = "jetty-jakarta-servlet-api")
-    exclude(group = "org.eclipse.jetty.toolchain")
     exclude(group = "javax.servlet")
-    exclude(group = "org.apache.commons", module = "commons-fileupload2-core")
+    exclude(group = "commons-fileupload")
-    exclude(group = "org.apache.commons", module = "commons-fileupload2-jakarta-servlet5")
   }
 }
 

buildSrc/src/main/kotlin/pklJSpecify.gradle.kts

@@ -1,46 +0,0 @@
-/*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import net.ltgt.gradle.errorprone.errorprone
-import net.ltgt.gradle.nullaway.nullaway
-import org.gradle.accessors.dm.LibrariesForLibs
-import org.gradle.api.tasks.compile.JavaCompile
-
-plugins {
-  `java-library`
-  id("net.ltgt.errorprone")
-  id("net.ltgt.nullaway")
-}
-
-val libs = the<LibrariesForLibs>()
-
-dependencies {
-  api(libs.jspecify)
-  errorprone(libs.errorProne)
-  errorprone(libs.nullaway)
-}
-
-nullaway { onlyNullMarked = true }
-
-tasks.withType<JavaCompile>().configureEach {
-  options.errorprone.disableAllChecks = true
-  options.errorprone.nullaway {
-    error()
-    onlyNullMarked = true
-    jspecifyMode = true
-    // honor assert x != null in addition to Objects.requireNonNull(x)
-    assertsEnabled = true
-  }
-}

buildSrc/src/main/kotlin/pklJavaExecutable.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ fun Task.setupTestStartJavaExecutable(launcher: Provider<JavaLauncher>? = null)
     outputFile.get().asFile.toPath().apply {
       try {
         parent.createDirectories()
-      } catch (_: java.nio.file.FileAlreadyExistsException) {}
+      } catch (ignored: java.nio.file.FileAlreadyExistsException) {}
       writeText("OK")
     }
   }

buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,16 +50,20 @@ artifacts {
 }
 
 spotless {
-  val revertYearOnlyChanges = RevertYearOnlyChangesStep(rootProject.rootDir, ratchetFrom!!).create()
-
   java {
-    addStep(revertYearOnlyChanges)
     googleJavaFormat(libs.versions.googleJavaFormat.get())
     target("src/*/java/**/*.java")
     licenseHeaderFile(rootProject.file("buildSrc/src/main/resources/license-header.star-block.txt"))
   }
+  kotlin {
+    ktfmt(libs.versions.ktfmt.get()).googleStyle()
+    target("src/*/kotlin/**/*.kt")
+    licenseHeaderFile(rootProject.file("buildSrc/src/main/resources/license-header.star-block.txt"))
+  }
 }
 
+tasks.compileKotlin { enabled = false }
+
 tasks.jar {
   manifest {
     attributes +=
@@ -77,6 +81,19 @@ tasks.javadoc {
   (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
 }
 
+val workAroundKotlinGradlePluginBug by
+  tasks.registering {
+    doLast {
+      // Works around this problem, which sporadically appears and disappears in different
+      // subprojects:
+      // A problem was found with the configuration of task ':pkl-executor:compileJava' (type
+      // 'JavaCompile').
+      // > Directory '[...]/pkl/pkl-executor/build/classes/kotlin/main'
+      // specified for property 'compileKotlinOutputClasses' does not exist.
+      layout.buildDirectory.dir("classes/kotlin/main").get().asFile.mkdirs()
+    }
+  }
+
 val truffleJavacArgs =
   listOf(
     // TODO: determine correct limits for Truffle specializations
@@ -86,6 +103,7 @@ val truffleJavacArgs =
 
 tasks.compileJava {
   javaCompiler = info.javaCompiler
+  dependsOn(workAroundKotlinGradlePluginBug)
   options.compilerArgs.addAll(truffleJavacArgs + info.jpmsAddModulesFlags)
 }
 

buildSrc/src/main/kotlin/pklKotlinBase.gradle.kts

@@ -1,67 +0,0 @@
-/*
- * Copyright © 2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import org.gradle.accessors.dm.LibrariesForLibs
-import org.gradle.kotlin.dsl.getByType
-import org.gradle.kotlin.dsl.kotlin
-import org.gradle.kotlin.dsl.the
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-
-plugins {
-  java
-  kotlin("jvm")
-  id("com.diffplug.spotless")
-}
-
-val buildInfo = project.extensions.getByType<BuildInfo>()
-
-val libs = the<LibrariesForLibs>()
-
-dependencies {
-  // Align versions of Kotlin modules during dependency resolution.
-  // Do NOT align "api", as this would affect consumers' builds.
-  implementation(platform(libs.kotlinBom))
-  testImplementation(platform(libs.kotlinBom))
-}
-
-kotlin {
-  compilerOptions {
-    val kotlinTarget = KotlinVersion.fromVersion(libs.versions.kotlinTarget.get())
-    languageVersion.set(kotlinTarget)
-    apiVersion.set(kotlinTarget)
-    jvmTarget = JvmTarget.fromTarget(buildInfo.jvmTarget.toString())
-    jvmToolchain {
-      languageVersion.set(buildInfo.jdkToolchainVersion)
-      vendor.set(buildInfo.jdkVendor)
-    }
-    freeCompilerArgs.addAll(
-      "-jvm-default=no-compatibility", // was: -Xjvm-default=all
-      "-Xjdk-release=${buildInfo.jvmTarget}",
-      "-Xjsr305=strict",
-    )
-  }
-}
-
-spotless {
-  val revertYearOnlyChanges = RevertYearOnlyChangesStep(rootProject.rootDir, ratchetFrom!!).create()
-
-  kotlin {
-    addStep(revertYearOnlyChanges)
-    ktfmt(libs.versions.ktfmt.get()).googleStyle()
-    target("src/*/kotlin/**/*.kt")
-    licenseHeaderFile(rootProject.file("buildSrc/src/main/resources/license-header.star-block.txt"))
-  }
-}

buildSrc/src/main/kotlin/pklKotlinLibrary.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,38 @@
  * limitations under the License.
  */
 import org.gradle.accessors.dm.LibrariesForLibs
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
-plugins { id("pklJavaLibrary") }
+plugins {
+  id("pklJavaLibrary")
+  kotlin("jvm")
+}
 
+// Build configuration.
 val buildInfo = project.extensions.getByType<BuildInfo>()
 
+// Version Catalog library symbols.
 val libs = the<LibrariesForLibs>()
 
 dependencies {
-  // Kotlin libraries typically expose stdlib types in their public APIs.
+  // At least some of our kotlin APIs contain Kotlin stdlib types
-  // Therefore, the stdlib must be available on the consumer's compile classpath,
+  // that aren't compiled away by kotlinc (e.g., `kotlin.Function`).
-  // and "implementation" is not sufficient.
+  // So let's be conservative and default to `api` for now.
-  api(libs.kotlinStdLib)
+  // For Kotlin APIs that only target Kotlin users (e.g., pkl-config-kotlin),
+  // it won't make a difference.
+  api(buildInfo.libs.findLibrary("kotlinStdLib").get())
+}
+
+tasks.compileKotlin {
+  enabled = true // disabled by pklJavaLibrary
+}
+
+tasks.withType<KotlinJvmCompile>().configureEach {
+  compilerOptions {
+    languageVersion = KotlinVersion.KOTLIN_2_1
+    jvmTarget = JvmTarget.fromTarget(buildInfo.jvmTarget.toString())
+    freeCompilerArgs.addAll("-Xjdk-release=${buildInfo.jvmTarget}")
+  }
 }

buildSrc/src/main/kotlin/pklKotlinTest.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 plugins {
   `jvm-test-suite`
-  id("pklKotlinBase")
+  kotlin("jvm")
 }
 
 val buildInfo = project.extensions.getByType<BuildInfo>()
@@ -27,11 +27,10 @@ val buildInfo = project.extensions.getByType<BuildInfo>()
 val libs = the<LibrariesForLibs>()
 
 dependencies {
-  testImplementation(libs.kotlinStdLib)
-
   testImplementation(libs.assertj)
   testImplementation(libs.junitApi)
   testImplementation(libs.junitParams)
+  testImplementation(libs.kotlinStdLib)
 
   testRuntimeOnly(libs.junitEngine)
   testRuntimeOnly(libs.junitLauncher)
@@ -45,7 +44,7 @@ tasks.withType<Test>().configureEach {
   // enable checking of stdlib return types
   systemProperty("org.pkl.testMode", "true")
 
-  reports.named("html") { required = true }
+  reports.named("html") { enabled = true }
 
   testLogging { exceptionFormat = TestExceptionFormat.FULL }
 

buildSrc/src/main/kotlin/pklNativeExecutable.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -161,7 +161,7 @@ val testStartNativeExecutable by
       outputFile.get().asFile.toPath().apply {
         try {
           parent.createDirectories()
-        } catch (_: java.nio.file.FileAlreadyExistsException) {}
+        } catch (ignored: java.nio.file.FileAlreadyExistsException) {}
         writeText("OK")
       }
     }

docs/antora.yml

@@ -1,6 +1,6 @@
 name: main
 title: Main Project
-version: 0.32.0-dev
+version: 0.31.1
-prerelease: true
+prerelease: false
 nav:
 - nav.adoc

docs/gradle.lockfile

@@ -7,66 +7,55 @@ io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.graalvm.polyglot:polyglot:25.0.1=testRuntimeClasspath
+org.graalvm.polyglot:polyglot:25.0.0=testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.1=testRuntimeClasspath
+org.graalvm.sdk:collections:25.0.0=testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.1=testRuntimeClasspath
+org.graalvm.sdk:graal-sdk:25.0.0=testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.1=testRuntimeClasspath
+org.graalvm.sdk:nativeimage:25.0.0=testRuntimeClasspath
-org.graalvm.sdk:word:25.0.1=testRuntimeClasspath
+org.graalvm.sdk:word:25.0.0=testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.1=testRuntimeClasspath
+org.graalvm.truffle:truffle-api:25.0.0=testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.11=testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.organicdesign:Paguro:3.10.3=testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.10=testRuntimeClasspath
-empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=annotationProcessor,apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,runtimeClasspath,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

docs/modules/ROOT/partials/component-attributes.adoc

@@ -3,10 +3,10 @@
 // the following attributes must be updated immediately before a release
 
 // pkl version corresponding to current git commit without -dev suffix or git hash
-:pkl-version-no-suffix: 0.32.0
+:pkl-version-no-suffix: 0.31.1
 // tells whether pkl version corresponding to current git commit
 // is a release version (:is-release-version: '') or dev version (:!is-release-version:)
-:!is-release-version:
+:is-release-version: ''
 
 // the remaining attributes do not need to be updated regularly
 

docs/modules/release-notes/pages/0.32.adoc

@@ -1,54 +0,0 @@
-= Pkl 0.32.0 Release Notes
-:version: 0.32
-:version-minor: 0.32.0
-:release-date: TBD
-:version-next: 0.33
-:version-next-date: TBD
-
-include::partial$intro.adoc[]
-
-== Highlights [small]#💖#
-
-News you don't want to miss.
-
-.XXX
-[%collapsible]
-====
-XXX
-====
-
-== Noteworthy [small]#🎶#
-
-Ready when you need them.
-
-.XXX
-[%collapsible]
-====
-XXX
-====
-
-== Breaking Changes [small]#💔#
-
-Things to watch out for when upgrading.
-
-.XXX
-[%collapsible]
-====
-XXX
-====
-
-== Work In Progress [small]#🚆#
-
-They missed the train but deserve a mention.
-
-.XXX
-[%collapsible]
-====
-XXX
-====
-
-== Contributors [small]#🙏#
-
-We would like to thank the contributors to this release (in alphabetical order):
-
-* XXX

docs/modules/release-notes/pages/changelog.adoc

@@ -1,9 +1,6 @@
 = Changelog
 include::ROOT:partial$component-attributes.adoc[]
 
-[[release-0.32.0]]
-== 0.32.0 (UNRELEASED)
-
 [[release-0.31.1]]
 == 0.31.1 (2026-03-26)
 
@@ -38,6 +35,7 @@ Thank you to all the contributors for this release!
 == 0.31.0 (2026-02-26)
 
 xref:0.31.adoc[Release Notes]
+
 [[release-0.30.2]]
 
 == 0.30.2 (2025-12-15)

docs/modules/release-notes/pages/index.adoc

@@ -2,7 +2,6 @@
 
 The Pkl team aims to release a new version of Pkl in February, June, and October of each year.
 
-* xref:0.32.adoc[0.32 Release Notes]
 * xref:0.31.adoc[0.31 Release Notes]
 * xref:0.30.adoc[0.30 Release Notes]
 * xref:0.29.adoc[0.29 Release Notes]

docs/modules/release-notes/template.adoc

@@ -52,3 +52,10 @@ XXX
 We would like to thank the contributors to this release (in alphabetical order):
 
 * XXX
+
+== Closed Radars [small]#🔒#
+
+XXX Radars down, Inbox Zero in sight ...
+
+[smaller]
+. XXX (https://github.com/apple/pkl/issues/new[XXX])

docs/nav.adoc

@@ -41,7 +41,6 @@
 * xref:ROOT:evolution-and-roadmap.adoc[Evolution and Roadmap]
 
 * xref:release-notes:index.adoc[Release Notes]
-** xref:release-notes:0.32.adoc[0.32 Release Notes]
 ** xref:release-notes:0.31.adoc[0.31 Release Notes]
 ** xref:release-notes:0.30.adoc[0.30 Release Notes]
 ** xref:release-notes:0.29.adoc[0.29 Release Notes]

gradle.properties

@@ -1,7 +1,7 @@
 # suppress inspection "UnusedProperty" for whole file
 
 group=org.pkl-lang
-version=0.32.0
+version=0.31.1
 
 # google-java-format requires jdk.compiler exports
 org.gradle.jvmargs= \

gradle/gradle-daemon-jvm.properties

@@ -1,12 +0,0 @@
-#This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
-toolchainVendor=ADOPTIUM
-toolchainVersion=25

gradle/libs.versions.toml

@@ -3,67 +3,58 @@ assertj = "3.+"
 checksumPlugin = "1.4.0"
 clikt = "5.+"
 commonMark = "0.+"
-downloadTaskPlugin = "5.7.0"
+downloadTaskPlugin = "5.6.0"
-errorProne = "2.48.0"
-errorPronePlugin = "5.1.0"
 geantyref = "1.+"
-#noinspection UnusedVersionCatalogEntry
+googleJavaFormat = "1.25.2"
-googleJavaFormat = "1.35.0"
 # must not use `+` because used in download URL
-# 25.0.2 no longer supports macos-x64
+# 23.1.x requires JDK 20+
-graalVm = "25.0.1"
+graalVm = "25.0.0"
 #noinspection UnusedVersionCatalogEntry
-graalVmJdkVersion = "25.0.1"
+graalVmJdkVersion = "25.0.0"
 # slightly hacky but convenient place so we remember to update the checksum
 #noinspection UnusedVersionCatalogEntry
-graalVmSha256-macos-x64 = "a3d895b4cd1c783badbd277ec70409806bd4102fca0d2a60dbaeb0bab41aec30"
+graalVmSha256-macos-x64 = "04278cf867d040e29dc71dd7727793f0ea67eb72adce8a35d04b87b57906778d"
 #noinspection UnusedVersionCatalogEntry
-graalVmSha256-macos-aarch64 = "066339f24a8ab5c161548491a9400f7344e7761a1e46f8979e76c7ef11d5bc76"
+graalVmSha256-macos-aarch64 = "c446d5aaeda98660a4c14049d299e9fba72105a007df89f19d27cf3979d37158"
 #noinspection UnusedVersionCatalogEntry
-graalVmSha256-linux-x64 = "01e39fe1a87f28b842a3e4e3b77be9b544dca3a58fa6e93b924a6106c8bac7fb"
+graalVmSha256-linux-x64 = "1862f2ce97387a303cae4c512cb21baf36fafd2457c3cbbc10d87db94b89d3dd"
 #noinspection UnusedVersionCatalogEntry
-graalVmSha256-linux-aarch64 = "7aa0b9935a80e67f37c6025678393dbd123bb6f2226811decbc1a13093fc8ae2"
+graalVmSha256-linux-aarch64 = "6c3c8b7617006c5d174d9cf7d357ccfb4bae77a4df1294ee28084fcb6eea8921"
 #noinspection UnusedVersionCatalogEntry
-graalVmSha256-windows-x64 = "fde83c5ceec2c75560c747ccd9f314f90e4cf5c5287416e67c4ce442e344ca27"
+graalVmSha256-windows-x64 = "33ef1d186b5c1e95465fcc97e637bc26e72d5f2250a8615b9c5d667ed5c17fd0"
-# pklGraalVm.gradle.kts assumes this entry exists
+ideaExtPlugin = "1.1.9"
-#noinspection UnusedVersionCatalogEntry
+intellijPlugin = "2.10.1"
-graalVmSha256-windows-aarch64 = "unavailable"
+intellij = "2025.2.3"
-ideaExtPlugin = "1.4.1"
 javaPoet = "0.+"
 javaxInject = "1"
+jansi = "2.+"
 jimfs = "1.+"
-jline = "4.+"
+# later versions don't work with native image
+# (at least not without additional configuration; tested with 3.25.1 and 3.27.1)
+jline = "3.23.0"
 jmh = "1.+"
-jmhPlugin = "0.7.3"
+jmhPlugin = "0.7.2"
-jspecify = "1.0.0"
 jsr305 = "3.+"
-junit = "6.+"
+junit = "5.+"
-kotlinBom = "2.2.21"
+junitPlatform = "1.+"
-#noinspection UnusedVersionCatalogEntry
+kotlin = "2.2.20"
-kotlinTarget = "2.2"
-kotlinToolchain = "2.3.20"
 # 1.7+ generates much more verbose code
 kotlinPoet = "1.6.+"
-kotlinxHtml = "0.12.0"
+kotlinxHtml = "0.11.0"
-# 1.8.1 is the last version that supports Kotlin 2.1,
+kotlinxSerialization = "1.8.0"
-# which is the language level currently set in pklKotlinLibrary.
-kotlinxSerialization = "1.8.1"
 kotlinxCoroutines = "1.+"
-#noinspection UnusedVersionCatalogEntry
+ktfmt = "0.53"
-ktfmt = "0.62"
 # replaces nuValidator's log4j dependency
-# 2.17.1 is the last version compatible with nuValidator
+# something related to log4j-1.2-api is apparently broken in 2.17.2
 log4j = "2.17.1"
-msgpack = "0.9.11"
+msgpack = "0.9.8"
 nexusPublishPlugin = "2.0.0"
-nullaway = "0.13.1"
+nuValidator = "20.+"
-nullawayPlugin = "3.0.0"
-nuValidator = "26.+"
 paguro = "3.+"
 shadowPlugin = "9.+"
-slf4j = "2.+"
+slf4j = "1.+"
 snakeYaml = "2.+"
-spotlessPlugin = "8.4.0"
+spotlessPlugin = "6.25.0"
 wiremock = "3.+"
 
 [libraries] # ordered alphabetically
@@ -73,34 +64,29 @@ cliktMarkdown = { group = "com.github.ajalt.clikt", name = "clikt-markdown", ver
 commonMark = { group = "org.commonmark", name = "commonmark", version.ref = "commonMark" }
 commonMarkTables = { group = "org.commonmark", name = "commonmark-ext-gfm-tables", version.ref = "commonMark" }
 downloadTaskPlugin = { group = "de.undercouch", name = "gradle-download-task", version.ref = "downloadTaskPlugin" }
-#noinspection UnusedVersionCatalogEntry
-errorProne = { group = "com.google.errorprone", name = "error_prone_core", version.ref = "errorProne" }
-errorPronePlugin = { group = "net.ltgt.gradle", name = "gradle-errorprone-plugin", version.ref = "errorPronePlugin" }
 geantyref = { group = "io.leangen.geantyref", name = "geantyref", version.ref = "geantyref" }
 graalCompiler = { group = "org.graalvm.compiler", name = "compiler", version.ref = "graalVm" }
 graalSdk = { group = "org.graalvm.sdk", name = "graal-sdk", version.ref = "graalVm" }
 graalJs = { group = "org.graalvm.js", name = "js", version.ref = "graalVm" }
+#noinspection UnusedVersionCatalogEntry
+intellij = { group = "com.jetbrains.intellij.idea", name = "ideaIC", version.ref = "intellij" }
 javaPoet = { group = "com.palantir.javapoet", name = "javapoet", version.ref = "javaPoet" }
 javaxInject = { group = "javax.inject", name = "javax.inject", version.ref = "javaxInject" }
+jansi = { group = "org.fusesource.jansi", name = "jansi", version.ref = "jansi" }
 jimfs = { group = "com.google.jimfs", name = "jimfs", version.ref = "jimfs" }
 jlineReader = { group = "org.jline", name = "jline-reader", version.ref = "jline" }
 jlineTerminal = { group = "org.jline", name = "jline-terminal", version.ref = "jline" }
-jlineTerminalJni = { group = "org.jline", name = "jline-terminal-jni", version.ref = "jline" }
+jlineTerminalJansi = { group = "org.jline", name = "jline-terminal-jansi", version.ref = "jline" }
-#noinspection UnusedVersionCatalogEntry
-jspecify = { group = "org.jspecify", name = "jspecify", version.ref = "jspecify" }
 jsr305 = { group = "com.google.code.findbugs", name = "jsr305", version.ref = "jsr305" }
 junitApi = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" }
 junitEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
 junitParams = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" }
-#noinspection UnusedVersionCatalogEntry
+junitLauncher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junitPlatform" }
-junitLauncher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junit" }
+kotlinPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
-#noinspection UnusedVersionCatalogEntry
-kotlinBom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlinBom" }
-kotlinPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlinToolchain" }
 kotlinPoet = { group = "com.squareup", name = "kotlinpoet", version.ref = "kotlinPoet" }
-kotlinReflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlinBom" }
+kotlinReflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
-kotlinScripting = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jsr223", version.ref = "kotlinBom" }
+kotlinScripting = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jsr223", version.ref = "kotlin" }
-kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlinBom" }
+kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
 kotlinxHtml = { group = "org.jetbrains.kotlinx", name = "kotlinx-html-jvm", version.ref = "kotlinxHtml" }
 kotlinxSerializationJson = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
 kotlinxCoroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
@@ -109,9 +95,6 @@ log4j12Api = { group = "org.apache.logging.log4j", name = "log4j-1.2-api", versi
 msgpack = { group = "org.msgpack", name = "msgpack-core", version.ref = "msgpack" }
 #noinspection UnusedVersionCatalogEntry
 nuValidator = { group = "nu.validator", name = "validator", version.ref = "nuValidator" }
-#noinspection UnusedVersionCatalogEntry
-nullaway = { group = "com.uber.nullaway", name = "nullaway", version.ref = "nullaway" }
-nullawayPlugin = { group = "net.ltgt.gradle", name = "gradle-nullaway-plugin", version.ref = "nullawayPlugin" }
 # to be replaced with https://github.com/usethesource/capsule or https://github.com/lacuna/bifurcan
 paguro = { group = "org.organicdesign", name = "Paguro", version.ref = "paguro" }
 pklConfigJavaAll025 = { group = "org.pkl-lang", name = "pkl-config-java-all", version = "0.25.0" }
@@ -129,12 +112,9 @@ wiremock = { group = "org.wiremock", name = "wiremock", version.ref = "wiremock"
 
 [plugins] # ordered alphabetically
 checksum = { id = "org.gradle.crypto.checksum", version.ref = "checksumPlugin" }
-#noinspection UnusedVersionCatalogEntry
-errorProne = { id = "net.ltgt.errorprone", version.ref = "errorPronePlugin" }
 ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "ideaExtPlugin" }
 jmh = { id = "me.champeau.jmh", version.ref = "jmhPlugin" }
-kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinToolchain" }
+kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexusPublishPlugin" }
-#noinspection UnusedVersionCatalogEntry
-nullaway = { id = "net.ltgt.nullaway", version.ref = "nullawayPlugin" }
 shadow = { id = "com.gradleup.shadow", version.ref = "shadowPlugin" }
+intellij = { id = "org.jetbrains.intellij.platform", version.ref = "intellijPlugin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -114,6 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -210,6 +212,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,10 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

pkl-bom/gradle.lockfile

@@ -1,4 +0,0 @@
-# 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.
-empty=classpath

pkl-cli/gradle.lockfile

@@ -1,155 +1,145 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.ethlo.time:itu:1.14.0=testCompileClasspath,testRuntimeClasspath
+com.ethlo.time:itu:1.10.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-annotations:2.20=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-annotations:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-core:2.20.1=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-databind:2.20.1=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-databind:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.1=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.1=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson:jackson-bom:2.20.1=testCompileClasspath,testRuntimeClasspath
+com.fasterxml.jackson:jackson-bom:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-core:5.0.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown:5.1.0=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-markdown:5.0.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt:5.0.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-core:3.0.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-markdown:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant:3.0.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable
-com.github.jknack:handlebars-helpers:4.3.1=testCompileClasspath,testRuntimeClasspath
+com.github.jknack:handlebars-helpers:4.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.jknack:handlebars:4.3.1=testCompileClasspath,testRuntimeClasspath
+com.github.jknack:handlebars:4.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable
-com.google.errorprone:error_prone_annotations:2.41.0=testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.36.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath
+com.google.guava:failureaccess:1.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.guava:guava:33.5.0-jre=testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.4.8-jre=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.1=testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.jayway.jsonpath:json-path:2.10.0=testCompileClasspath,testRuntimeClasspath
+com.jayway.jsonpath:json-path:2.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.networknt:json-schema-validator:1.5.9=testCompileClasspath,testRuntimeClasspath
+com.networknt:json-schema-validator:1.5.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-commons-fileupload:commons-fileupload:1.6.0=testCompileClasspath,testRuntimeClasspath
+commons-fileupload:commons-fileupload:1.6.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-commons-io:commons-io:2.19.0=testCompileClasspath,testRuntimeClasspath
+commons-io:commons-io:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 net.java.dev.jna:jna:5.14.0=runtimeClasspath,testRuntimeClasspath
-net.javacrumbs.json-unit:json-unit-core:2.40.1=testCompileClasspath,testRuntimeClasspath
+net.javacrumbs.json-unit:json-unit-core:2.40.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-net.minidev:accessors-smart:2.6.0=testRuntimeClasspath
+net.minidev:accessors-smart:2.5.0=testRuntimeClasspath
-net.minidev:json-smart:2.6.0=testRuntimeClasspath
+net.minidev:json-smart:2.5.0=testRuntimeClasspath
-net.sf.jopt-simple:jopt-simple:5.0.4=testCompileClasspath,testRuntimeClasspath
+net.sf.jopt-simple:jopt-simple:5.0.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apache.httpcomponents.client5:httpclient5:5.5.1=testCompileClasspath,testRuntimeClasspath
+org.apache.httpcomponents.client5:httpclient5:5.5=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apache.httpcomponents.core5:httpcore5-h2:5.3.6=testCompileClasspath,testRuntimeClasspath
+org.apache.httpcomponents.core5:httpcore5-h2:5.3.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apache.httpcomponents.core5:httpcore5:5.3.6=testCompileClasspath,testRuntimeClasspath
+org.apache.httpcomponents.core5:httpcore5:5.3.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.eclipse.jetty.http2:http2-common:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:http2-common:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:http2-hpack:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-server:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.http2:http2-server:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-client:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-client:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-java-server:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-alpn-server:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-bom:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-bom:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-client:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-proxy:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-proxy:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlet:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlets:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlets:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-webapp:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-webapp:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-xml:11.0.26=testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-xml:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.polyglot:polyglot:25.0.1=compileClasspath,compileOnlyDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.fusesource.jansi:jansi:2.4.2=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.1=compileClasspath,compileOnlyDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.polyglot:polyglot:25.0.0=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.1=compileClasspath,compileOnlyDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:collections:25.0.0=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:jniutils:25.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:graal-sdk:25.0.0=compileClasspath,compileOnlyDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.1=compileClasspath,compileOnlyDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:jniutils:25.0.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.1=compileClasspath,compileOnlyDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:nativeimage:25.0.0=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:word:25.0.0=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.truffle:truffle-compiler:25.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.truffle:truffle-api:25.0.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.truffle:truffle-runtime:25.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.truffle:truffle-compiler:25.0.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testRuntimeClasspath
+org.graalvm.truffle:truffle-runtime:25.0.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
+org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,nativeImageClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,swiftExportClasspathResolvable
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,nativeImageClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:markdown-jvm:0.7.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
 org.jetbrains:markdown:0.7.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.jline:jline-native:4.0.12=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jline:jline-native:3.23.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jline:jline-reader:4.0.12=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jline:jline-reader:3.23.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jline:jline-terminal-jni:4.0.12=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jline:jline-terminal-jansi:3.23.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jline:jline-terminal:4.0.12=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jline:jline-terminal:3.23.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.11=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.organicdesign:Paguro:3.10.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.17=testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.17=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.10=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.wiremock:wiremock:3.13.2=testCompileClasspath,testRuntimeClasspath
+org.wiremock:wiremock:3.13.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.xmlunit:xmlunit-core:2.11.0=testCompileClasspath,testRuntimeClasspath
+org.xmlunit:xmlunit-core:2.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.xmlunit:xmlunit-legacy:2.11.0=testCompileClasspath,testRuntimeClasspath
+org.xmlunit:xmlunit-legacy:2.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.xmlunit:xmlunit-placeholders:2.11.0=testCompileClasspath,testRuntimeClasspath
+org.xmlunit:xmlunit-placeholders:2.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.yaml:snakeyaml:2.4=testCompileClasspath,testRuntimeClasspath
+org.yaml:snakeyaml:2.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-empty=annotationProcessor,implementationDependenciesMetadata,intransitiveDependenciesMetadata,javaExecutable,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,stagedAlpineLinuxAmd64Executable,stagedLinuxAarch64Executable,stagedLinuxAmd64Executable,stagedMacAarch64Executable,stagedMacAmd64Executable,stagedWindowsAmd64Executable,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=annotationProcessor,intransitiveDependenciesMetadata,javaExecutable,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,stagedAlpineLinuxAmd64Executable,stagedLinuxAarch64Executable,stagedLinuxAmd64Executable,stagedMacAarch64Executable,stagedMacAmd64Executable,stagedWindowsAmd64Executable,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

pkl-cli/pkl-cli.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,9 +56,10 @@ dependencies {
   api(projects.pklCommonsCli)
 
   implementation(projects.pklCommons)
+  implementation(libs.jansi)
   implementation(libs.jlineReader)
   implementation(libs.jlineTerminal)
-  implementation(libs.jlineTerminalJni)
+  implementation(libs.jlineTerminalJansi)
   implementation(projects.pklServer)
   implementation(projects.pklFormatter)
   implementation(libs.clikt)

pkl-cli/src/main/kotlin/org/pkl/cli/CliFormatterCommand.kt

@@ -47,7 +47,7 @@ constructor(
   private val errWriter: Writer = System.err.writer(),
 ) : CliCommand(CliBaseOptions()) {
   private fun format(contents: String): String {
-    return Formatter(grammarVersion).format(contents)
+    return Formatter().format(contents, grammarVersion)
   }
 
   private fun writeErrLine(error: String) {

pkl-cli/src/main/kotlin/org/pkl/cli/repl/Repl.kt

@@ -20,6 +20,7 @@ import java.net.URI
 import java.nio.file.Path
 import java.util.regex.Pattern
 import kotlin.io.path.deleteIfExists
+import org.fusesource.jansi.Ansi
 import org.jline.reader.EndOfFileException
 import org.jline.reader.Highlighter
 import org.jline.reader.LineReader
@@ -51,7 +52,7 @@ class PklHighlighter : Highlighter {
 }
 
 internal class Repl(workingDir: Path, private val server: ReplServer, private val color: Boolean) {
-  private val terminal = TerminalBuilder.builder().apply { jni(true) }.build()
+  private val terminal = TerminalBuilder.builder().apply { jansi(true) }.build()
   private val history = DefaultHistory()
   private val reader =
     LineReaderBuilder.builder()
@@ -248,20 +249,14 @@ internal class Repl(workingDir: Path, private val server: ReplServer, private va
   }
 
   private fun highlight(str: String): String {
-    // Inserting ANSI codes into a string that may already contain ANSI codes is problematic.
+    val ansi = Ansi.ansi()
-    // This code preserves existing behavior but should eventually be removed.
+    var normal = true
-    val builder = StringBuilder()
-    var bold = false
     for (part in str.split("`", "```")) {
-      if (bold) {
+      ansi.a(part)
-        builder.append("\u001B[1m")
+      normal = !normal
-        builder.append(part)
+      if (!normal) ansi.bold() else ansi.boldOff()
-        builder.append("\u001B[22m")
-      } else {
-        builder.append(part)
-      }
-      bold = !bold
     }
-    return builder.toString()
+    ansi.reset()
+    return ansi.toString()
   }
 }

pkl-codegen-java/gradle.lockfile

@@ -1,97 +1,85 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-core:5.0.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown:5.1.0=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-markdown:5.0.3=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt:5.0.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-core:3.0.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-markdown:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant:3.0.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable
 com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable
-com.palantir.javapoet:javapoet:0.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.palantir.javapoet:javapoet:0.7.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 net.java.dev.jna:jna:5.14.0=runtimeClasspath,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.graalvm.polyglot:polyglot:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.polyglot:polyglot:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:collections:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:graal-sdk:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:nativeimage:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:word:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.truffle:truffle-api:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,swiftExportClasspathResolvable
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:markdown-jvm:0.7.3=runtimeClasspath,testRuntimeClasspath
 org.jetbrains:markdown:0.7.3=runtimeClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=runtimeClasspath,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.11=runtimeClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.10=runtimeClasspath,testRuntimeClasspath
-empty=annotationProcessor,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

pkl-codegen-java/src/main/kotlin/org/pkl/codegen/java/JavaCodeGenerator.kt

@@ -82,7 +82,7 @@ data class JavaCodeGeneratorOptions(
    *
    * The specified annotation type must have a [java.lang.annotation.Target] of
    * [java.lang.annotation.ElementType.TYPE_USE] or the generated code may not compile. If set to
-   * `null`, `org.pkl.config.java.mapper.NonNull` will be used.
+   * `null`, [org.pkl.config.java.mapper.NonNull] will be used.
    */
   val nonNullAnnotation: String? = null,
 
@@ -105,7 +105,7 @@ class JavaCodeGenerator(
 ) {
 
   companion object {
-    private val OBJECT = ClassName.get(Any::class.java)
+    private val OBJECT = ClassName.get(Object::class.java)
     private val STRING = ClassName.get(String::class.java)
     private val DURATION = ClassName.get(Duration::class.java)
     private val DURATION_UNIT = ClassName.get(DurationUnit::class.java)
@@ -295,7 +295,7 @@ class JavaCodeGenerator(
         MethodSpec.methodBuilder("equals")
           .addModifiers(Modifier.PUBLIC)
           .addAnnotation(Override::class.java)
-          .addParameter(Any::class.java, "obj")
+          .addParameter(Object::class.java, "obj")
           .returns(Boolean::class.java)
           .addStatement("if (this == obj) return true")
           .addStatement("if (obj == null) return false")
@@ -418,7 +418,7 @@ class JavaCodeGenerator(
       val hasJavadoc =
         docComment != null && codegenOptions.generateJavadoc && !codegenOptions.generateGetters
       if (hasJavadoc) {
-        builder.addJavadoc(renderAsJavadoc(docComment))
+        builder.addJavadoc(renderAsJavadoc(docComment!!))
       }
 
       if (codegenOptions.generateGetters) {
@@ -466,7 +466,7 @@ class JavaCodeGenerator(
       val docComment = property.docComment
       val hasJavadoc = docComment != null && codegenOptions.generateJavadoc
       if (hasJavadoc) {
-        builder.addJavadoc(renderAsJavadoc(docComment))
+        builder.addJavadoc(renderAsJavadoc(docComment!!))
       }
 
       generateDeprecation(
@@ -583,7 +583,7 @@ class JavaCodeGenerator(
       val docComment = pClass.docComment
       val hasJavadoc = docComment != null && codegenOptions.generateJavadoc
       if (hasJavadoc) {
-        builder.addJavadoc(renderAsJavadoc(docComment))
+        builder.addJavadoc(renderAsJavadoc(docComment!!))
       }
 
       generateDeprecation(
@@ -707,7 +707,7 @@ class JavaCodeGenerator(
       .addModifiers(Modifier.STATIC)
       .addParameter(StringBuilder::class.java, "builder")
       .addParameter(String::class.java, "name")
-      .addParameter(Any::class.java, "value")
+      .addParameter(Object::class.java, "value")
       .addStatement("builder.append(\"\\n  \").append(name).append(\" = \")")
       .addStatement(
         "\$T lines = \$T.toString(value).split(\"\\n\")",

pkl-codegen-kotlin/gradle.lockfile

@@ -1,102 +1,86 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-core:5.0.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown:5.1.0=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-markdown:5.0.3=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt:5.0.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-core:3.0.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-markdown:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant:3.0.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable
 com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable
-com.squareup:kotlinpoet:1.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.squareup:kotlinpoet:1.6.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 net.java.dev.jna:jna:5.14.0=runtimeClasspath,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.graalvm.polyglot:polyglot:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.polyglot:polyglot:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:collections:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:graal-sdk:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:nativeimage:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:word:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.1=runtimeClasspath,testRuntimeClasspath
+org.graalvm.truffle:truffle-api:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.21=testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jsr223:2.2.20=testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.21=testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-scripting-jvm-host:2.2.20=testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.21=testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jsr223:2.2.21=testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm-host:2.2.21=testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.21=testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:markdown-jvm:0.7.3=runtimeClasspath,testRuntimeClasspath
 org.jetbrains:markdown:0.7.3=runtimeClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=runtimeClasspath,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.11=runtimeClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.10=runtimeClasspath,testRuntimeClasspath
-empty=annotationProcessor,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

pkl-commons-cli/gradle.lockfile

@@ -1,108 +1,96 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-core:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-core:5.0.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown:5.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-markdown:5.0.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.clikt:clikt:5.1.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt:5.0.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.colormath:colormath:3.6.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-core:3.0.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-markdown:3.0.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant:3.0.2=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant:3.0.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable
 com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 net.java.dev.jna:jna:5.14.0=runtimeClasspath,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.graalvm.compiler:compiler:25.0.1=svmClasspath
+org.graalvm.compiler:compiler:25.0.0=svmClasspath
-org.graalvm.espresso:espresso-svm:25.0.1=svmClasspath
+org.graalvm.espresso:espresso-svm:25.0.0=svmClasspath
-org.graalvm.nativeimage:native-image-base:25.0.1=svmClasspath
+org.graalvm.nativeimage:native-image-base:25.0.0=svmClasspath
-org.graalvm.nativeimage:objectfile:25.0.1=svmClasspath
+org.graalvm.nativeimage:objectfile:25.0.0=svmClasspath
-org.graalvm.nativeimage:pointsto:25.0.1=svmClasspath
+org.graalvm.nativeimage:pointsto:25.0.0=svmClasspath
-org.graalvm.nativeimage:svm-capnproto-runtime:25.0.1=svmClasspath
+org.graalvm.nativeimage:svm-capnproto-runtime:25.0.0=svmClasspath
-org.graalvm.nativeimage:svm-configure:25.0.1=svmClasspath
+org.graalvm.nativeimage:svm-configure:25.0.0=svmClasspath
-org.graalvm.nativeimage:svm:25.0.1=svmClasspath
+org.graalvm.nativeimage:svm:25.0.0=svmClasspath
-org.graalvm.nativeimage:truffle-runtime-svm:25.0.1=svmClasspath
+org.graalvm.nativeimage:truffle-runtime-svm:25.0.0=svmClasspath
-org.graalvm.polyglot:polyglot:25.0.1=runtimeClasspath,svmClasspath,testRuntimeClasspath
+org.graalvm.polyglot:polyglot:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.1=runtimeClasspath,svmClasspath,testRuntimeClasspath
+org.graalvm.sdk:collections:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.1=runtimeClasspath,svmClasspath,testRuntimeClasspath
+org.graalvm.sdk:graal-sdk:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.sdk:jniutils:25.0.1=svmClasspath
+org.graalvm.sdk:jniutils:25.0.0=svmClasspath
-org.graalvm.sdk:nativeimage-libgraal:25.0.1=svmClasspath
+org.graalvm.sdk:nativeimage-libgraal:25.0.0=svmClasspath
-org.graalvm.sdk:nativeimage:25.0.1=runtimeClasspath,svmClasspath,testRuntimeClasspath
+org.graalvm.sdk:nativeimage:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.1=runtimeClasspath,svmClasspath,testRuntimeClasspath
+org.graalvm.sdk:word:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.1=runtimeClasspath,svmClasspath,testRuntimeClasspath
+org.graalvm.truffle:truffle-api:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-compiler:25.0.1=svmClasspath
+org.graalvm.truffle:truffle-compiler:25.0.0=svmClasspath
-org.graalvm.truffle:truffle-runtime:25.0.1=svmClasspath
+org.graalvm.truffle:truffle-runtime:25.0.0=svmClasspath
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,svmClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,swiftExportClasspathResolvable
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:markdown-jvm:0.7.3=runtimeClasspath,testRuntimeClasspath
-org.jetbrains:markdown:0.7.3=runtimeClasspath,testRuntimeClasspath
+org.jetbrains:markdown:0.7.3=implementationDependenciesMetadata,runtimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=runtimeClasspath,svmClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.11=runtimeClasspath,svmClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.organicdesign:Paguro:3.10.3=runtimeClasspath,svmClasspath,testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.10=runtimeClasspath,svmClasspath,testRuntimeClasspath
-empty=annotationProcessor,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,signatures,sourcesJar,svmAnnotationProcessor,svmApiDependenciesMetadata,svmCompileClasspath,svmCompileOnlyDependenciesMetadata,svmImplementationDependenciesMetadata,svmIntransitiveDependenciesMetadata,svmKotlinScriptDefExtensions,svmRuntimeClasspath,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,signatures,sourcesJar,svmAnnotationProcessor,svmApiDependenciesMetadata,svmCompileClasspath,svmCompileOnlyDependenciesMetadata,svmImplementationDependenciesMetadata,svmIntransitiveDependenciesMetadata,svmKotlinScriptDefExtensions,svmRuntimeClasspath,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

pkl-commons-cli/src/test/kotlin/org/pkl/commons/cli/CliCommandTest.kt

@@ -24,8 +24,6 @@ import kotlin.io.path.writeText
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import org.junit.jupiter.api.condition.DisabledOnJre
-import org.junit.jupiter.api.condition.JRE
 import org.junit.jupiter.api.io.TempDir
 import org.pkl.commons.cli.commands.BaseCommand
 import org.pkl.commons.cli.commands.ProjectOptions
@@ -115,8 +113,8 @@ class CliCommandTest {
       .resolve("PklProject")
       .writeText(
         """
-        amends "pkl:Project"
+      amends "pkl:Project"
-        """
+    """
           .trimIndent()
       )
     cmd.parse(arrayOf("--working-dir=$tempDir"))
@@ -131,8 +129,8 @@ class CliCommandTest {
       .resolve("PklProject")
       .writeText(
         """
-        amends "pkl:Project"
+      amends "pkl:Project"
-        """
+    """
           .trimIndent()
       )
     cmd.parse(arrayOf("--working-dir=$tempDir"))
@@ -150,15 +148,15 @@ class CliCommandTest {
       .resolve("PklProject")
       .writeText(
         """
-        amends "pkl:Project"
+      amends "pkl:Project"
       
-        package {
+      package {
-          name = "foo"
+        name = "foo"
-          baseUri = "package://example.com/foo"
+        baseUri = "package://example.com/foo"
-          version = "0.0.1"
+        version = "0.0.1"
-          packageZipUrl = "https://example.com/foo@\(version).zip"
+        packageZipUrl = "https://example.com/foo@\(version).zip"
-        }
+      }
-        """
+    """
           .trimIndent()
       )
 
@@ -189,14 +187,14 @@ class CliCommandTest {
       .resolve("PklProject")
       .writeText(
         """
-        amends "pkl:Project"
+      amends "pkl:Project"
 
-        dependencies {
+      dependencies {
-          ["foo"] {
+        ["foo"] {
-            uri = "package://example.com/foo@1.2.3"
+          uri = "package://example.com/foo@1.2.3"
-          }
         }
-        """
+      }
+    """
           .trimIndent()
       )
     cmd.parse(arrayOf("--working-dir=$tempDir"))
@@ -238,12 +236,10 @@ class CliCommandTest {
       }
       traceMode = "pretty"
     }
-    """
+  """
       .trimIndent()
 
   @Test
-  // TODO: why does assertThat(builder.color).isFalse fail on these JDKs?
-  @DisabledOnJre(JRE.JAVA_22, JRE.JAVA_23, JRE.JAVA_24)
   fun `test that --omit-project-settings actually omits project settings`(@TempDir tempDir: Path) {
     val project = tempDir.resolve("PklProject").writeString(projectWithAllEvaluatorSettings)
     cmd.parse(arrayOf("--working-dir=$tempDir", "--omit-project-settings"))

pkl-commons-test/gradle.lockfile

@@ -6,58 +6,47 @@ com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolva
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=apiDependenciesMetadata,compileClasspath,testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=apiDependenciesMetadata,compileClasspath,testCompileClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:6.0.3=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=compileClasspath
-org.msgpack:msgpack-core:0.9.11=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
-empty=annotationProcessor,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

pkl-commons/gradle.lockfile

@@ -6,57 +6,46 @@ com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolva
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=testCompileClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
+empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
-empty=annotationProcessor,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

pkl-commons/src/main/kotlin/org/pkl/commons/Control.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ fun <This, Return> lazyWithReceiver(
 class LazyWithReceiver<This, out Return>(val initializer: This.() -> Return) {
   private val values = WeakHashMap<This, Return>()
 
-  private val lock = Any()
+  private val lock = Object()
 
   operator fun getValue(thisValue: This, property: KProperty<*>): Return =
     synchronized(lock) { values.getOrPut(thisValue) { thisValue.initializer() } }

pkl-config-java/gradle.lockfile

@@ -1,98 +1,86 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.github.ajalt.clikt:clikt-core-jvm:5.1.0=pklCodegenJava
+com.github.ajalt.clikt:clikt-core-jvm:5.0.3=pklCodegenJava
-com.github.ajalt.clikt:clikt-core:5.1.0=pklCodegenJava
+com.github.ajalt.clikt:clikt-core:5.0.3=pklCodegenJava
-com.github.ajalt.clikt:clikt-jvm:5.1.0=pklCodegenJava
+com.github.ajalt.clikt:clikt-jvm:5.0.3=pklCodegenJava
-com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=pklCodegenJava
+com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=pklCodegenJava
-com.github.ajalt.clikt:clikt-markdown:5.1.0=pklCodegenJava
+com.github.ajalt.clikt:clikt-markdown:5.0.3=pklCodegenJava
-com.github.ajalt.clikt:clikt:5.1.0=pklCodegenJava
+com.github.ajalt.clikt:clikt:5.0.3=pklCodegenJava
 com.github.ajalt.colormath:colormath-jvm:3.6.0=pklCodegenJava
 com.github.ajalt.colormath:colormath:3.6.0=pklCodegenJava
-com.github.ajalt.mordant:mordant-core-jvm:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-core-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-core:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-core:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-markdown:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant-markdown:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant:3.0.2=pklCodegenJava
+com.github.ajalt.mordant:mordant:3.0.1=pklCodegenJava
 com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable
 com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable
-com.palantir.javapoet:javapoet:0.14.0=pklCodegenJava
+com.palantir.javapoet:javapoet:0.7.0=pklCodegenJava
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
-io.leangen.geantyref:geantyref:1.3.16=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+io.leangen.geantyref:geantyref:1.3.16=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-javax.inject:javax.inject:1=testCompileClasspath,testRuntimeClasspath
+javax.inject:javax.inject:1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 net.java.dev.jna:jna:5.14.0=pklCodegenJava
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.graalvm.polyglot:polyglot:25.0.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
+org.graalvm.polyglot:polyglot:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:collections:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:graal-sdk:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:nativeimage:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
+org.graalvm.sdk:word:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.1=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
+org.graalvm.truffle:truffle-api:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,pklCodegenJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=pklCodegenJava,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=pklCodegenJava,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=pklCodegenJava,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,pklCodegenJava,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=pklCodegenJava,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0=pklCodegenJava
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,pklCodegenJava,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:markdown-jvm:0.7.3=pklCodegenJava
 org.jetbrains:markdown:0.7.3=pklCodegenJava
-org.jspecify:jspecify:1.0.0=pklCodegenJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=compileClasspath,pklCodegenJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.11=compileClasspath,pklCodegenJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.organicdesign:Paguro:3.10.3=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.10=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,fatJar,firstPartySourcesJars,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,fatJar,firstPartySourcesJars,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

pkl-config-kotlin/gradle.lockfile

@@ -1,97 +1,85 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.github.ajalt.clikt:clikt-core-jvm:5.1.0=pklCodegenKotlin
+com.github.ajalt.clikt:clikt-core-jvm:5.0.3=pklCodegenKotlin
-com.github.ajalt.clikt:clikt-core:5.1.0=pklCodegenKotlin
+com.github.ajalt.clikt:clikt-core:5.0.3=pklCodegenKotlin
-com.github.ajalt.clikt:clikt-jvm:5.1.0=pklCodegenKotlin
+com.github.ajalt.clikt:clikt-jvm:5.0.3=pklCodegenKotlin
-com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=pklCodegenKotlin
+com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=pklCodegenKotlin
-com.github.ajalt.clikt:clikt-markdown:5.1.0=pklCodegenKotlin
+com.github.ajalt.clikt:clikt-markdown:5.0.3=pklCodegenKotlin
-com.github.ajalt.clikt:clikt:5.1.0=pklCodegenKotlin
+com.github.ajalt.clikt:clikt:5.0.3=pklCodegenKotlin
 com.github.ajalt.colormath:colormath-jvm:3.6.0=pklCodegenKotlin
 com.github.ajalt.colormath:colormath:3.6.0=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-core-jvm:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-core-jvm:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-core:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-core:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-jvm:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-jvm:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant-markdown:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant-markdown:3.0.1=pklCodegenKotlin
-com.github.ajalt.mordant:mordant:3.0.2=pklCodegenKotlin
+com.github.ajalt.mordant:mordant:3.0.1=pklCodegenKotlin
 com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable
 com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable
 com.squareup:kotlinpoet:1.6.0=pklCodegenKotlin
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
-io.leangen.geantyref:geantyref:1.3.16=testCompileClasspath,testRuntimeClasspath
+io.leangen.geantyref:geantyref:1.3.16=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 net.java.dev.jna:jna:5.14.0=pklCodegenKotlin
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.graalvm.polyglot:polyglot:25.0.1=pklCodegenKotlin,testRuntimeClasspath
+org.graalvm.polyglot:polyglot:25.0.0=pklCodegenKotlin,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.1=pklCodegenKotlin,testRuntimeClasspath
+org.graalvm.sdk:collections:25.0.0=pklCodegenKotlin,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.1=pklCodegenKotlin,testRuntimeClasspath
+org.graalvm.sdk:graal-sdk:25.0.0=pklCodegenKotlin,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.1=pklCodegenKotlin,testRuntimeClasspath
+org.graalvm.sdk:nativeimage:25.0.0=pklCodegenKotlin,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.1=pklCodegenKotlin,testRuntimeClasspath
+org.graalvm.sdk:word:25.0.0=pklCodegenKotlin,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.1=pklCodegenKotlin,testRuntimeClasspath
+org.graalvm.truffle:truffle-api:25.0.0=pklCodegenKotlin,testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,pklCodegenKotlin,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=compileClasspath,pklCodegenKotlin,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,pklCodegenKotlin,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,compileClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0=pklCodegenKotlin
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,pklCodegenKotlin,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:markdown-jvm:0.7.3=pklCodegenKotlin
 org.jetbrains:markdown:0.7.3=pklCodegenKotlin
-org.jspecify:jspecify:1.0.0=pklCodegenKotlin,testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=compileClasspath,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.11=compileClasspath,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.organicdesign:Paguro:3.10.3=pklCodegenKotlin,testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.10=pklCodegenKotlin,testRuntimeClasspath
-empty=annotationProcessor,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,pklConfigJava,pklConfigJavaAll,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,pklConfigJava,pklConfigJavaAll,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

pkl-config-kotlin/src/test/kotlin/org/pkl/config/kotlin/mapper/PPairToKotlinPairTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@ class PPairToKotlinPairTest {
   @Test
   fun ex1() {
     val ex1 = module.getProperty("ex1")
-    @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
     val mapped: Pair<Int, Duration> =
       mapper.map(
         ex1,

pkl-core/gradle.lockfile

@@ -4,71 +4,60 @@
 com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable
 com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata
 com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable
-com.palantir.javapoet:javapoet:0.14.0=generatorCompileClasspath,generatorRuntimeClasspath
+com.palantir.javapoet:javapoet:0.7.0=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.graalvm.polyglot:polyglot:25.0.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.polyglot:polyglot:25.0.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:collections:25.0.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:graal-sdk:25.0.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:nativeimage:25.0.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:word:25.0.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.1=compileClasspath,generatorCompileClasspath,generatorRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.truffle:truffle-api:25.0.0=compileClasspath,generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.truffle:truffle-dsl-processor:25.0.1=annotationProcessor
+org.graalvm.truffle:truffle-dsl-processor:25.0.0=annotationProcessor
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=generatorCompileClasspath,generatorRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=generatorCompileClasspath,generatorImplementationDependenciesMetadata,generatorRuntimeClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=generatorCompileClasspath,generatorRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=generatorCompileClasspath,generatorRuntimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=generatorCompileClasspath,generatorRuntimeClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathGenerator,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.11=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
+org.organicdesign:Paguro:3.10.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.organicdesign:Paguro:3.10.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.snakeyaml:snakeyaml-engine:2.10=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.snakeyaml:snakeyaml-engine:2.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+empty=apiDependenciesMetadata,generatorAnnotationProcessor,generatorApiDependenciesMetadata,generatorCompileOnlyDependenciesMetadata,generatorIntransitiveDependenciesMetadata,generatorKotlinScriptDefExtensions,intransitiveDependenciesMetadata,javaExecutable,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
-empty=apiDependenciesMetadata,generatorAnnotationProcessor,generatorApiDependenciesMetadata,generatorCompileOnlyDependenciesMetadata,generatorImplementationDependenciesMetadata,generatorIntransitiveDependenciesMetadata,generatorKotlinScriptDefExtensions,implementationDependenciesMetadata,intransitiveDependenciesMetadata,javaExecutable,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

pkl-core/src/main/java/org/pkl/core/ast/builder/ImportsAndReadsParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ import org.pkl.parser.syntax.StringPart.StringChars;
  *   <li>read expressions
  * </ul>
  */
-public class ImportsAndReadsParser extends AbstractAstBuilder<List<Entry>> {
+public class ImportsAndReadsParser extends AbstractAstBuilder<@Nullable List<Entry>> {
 
   public record Entry(
       boolean isModule,
@@ -141,11 +141,12 @@ public class ImportsAndReadsParser extends AbstractAstBuilder<List<Entry>> {
   }
 
   @Override
-  protected List<Entry> aggregateResult(List<Entry> aggregate, List<Entry> nextResult) {
+  protected @Nullable List<Entry> aggregateResult(
-    if (aggregate.isEmpty()) {
+      @Nullable List<Entry> aggregate, @Nullable List<Entry> nextResult) {
+    if (aggregate == null || aggregate.isEmpty()) {
       return nextResult;
     }
-    if (nextResult.isEmpty()) {
+    if (nextResult == null || nextResult.isEmpty()) {
       return aggregate;
     }
     var ret = new ArrayList<Entry>(aggregate.size() + nextResult.size());

pkl-core/src/main/java/org/pkl/core/ast/expression/member/ReadLocalPropertyNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,20 +22,10 @@ import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.source.SourceSection;
 import org.pkl.core.ast.ExpressionNode;
 import org.pkl.core.ast.member.ObjectMember;
-import org.pkl.core.runtime.VmObject;
+import org.pkl.core.runtime.VmObjectLike;
 import org.pkl.core.runtime.VmUtils;
 
-/**
+/** Reads a local non-constant property that is known to exist in the lexical scope of this node. */
- * Reads a local non-constant property that is known to exist in the lexical scope of this node.
- *
- * <p>Local property values are cached using the ObjectMember as the key (identity-based) rather
- * than the property name. This is necessary because the same property name can exist at different
- * declaration sites in an amends chain, and we need to distinguish between them for correct
- * late-binding semantics.
- *
- * <p>The cache is stored in a separate IdentityHashMap in VmObject (not in the DynamicObject
- * storage) to avoid shape transitions that would destroy cache locality.
- */
 public final class ReadLocalPropertyNode extends ExpressionNode {
   private final ObjectMember property;
   private final int levelsUp;
@@ -73,17 +63,15 @@ public final class ReadLocalPropertyNode extends ExpressionNode {
       owner = owner.getEnclosingOwner();
     }
 
-    assert receiver instanceof VmObject
+    assert receiver instanceof VmObjectLike
         : "Assumption: This node isn't used in Truffle ASTs of `external` pkl.base classes whose values aren't VmObject's.";
 
-    // Use the local property cache instead of DynamicObject storage
+    var objReceiver = (VmObjectLike) receiver;
-    // to avoid shape transitions from ObjectMember keys
+    var result = objReceiver.getCachedValue(property);
-    var objReceiver = (VmObject) receiver;
-    var result = objReceiver.getLocalCachedValue(property);
 
     if (result == null) {
       result = callNode.call(objReceiver, owner, property.getName());
-      objReceiver.setLocalCachedValue(property, result);
+      objReceiver.setCachedValue(property, result);
     }
 
     return result;

pkl-core/src/main/java/org/pkl/core/ast/expression/member/ReadPropertyNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,9 @@ import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.*;
-import com.oracle.truffle.api.dsl.Cached.Shared;
-import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.nodes.NodeInfo;
-import com.oracle.truffle.api.object.DynamicObjectLibrary;
 import com.oracle.truffle.api.source.SourceSection;
 import org.pkl.core.ast.ExpressionNode;
 import org.pkl.core.ast.MemberLookupMode;
@@ -64,27 +61,6 @@ public abstract class ReadPropertyNode extends ExpressionNode {
     this(sourceSection, propertyName, MemberLookupMode.EXPLICIT_RECEIVER, false);
   }
 
-  // Optimized specialization for VmTyped using DynamicObjectLibrary
-  @Specialization
-  protected Object evalTyped(
-      VmTyped receiver,
-      @CachedLibrary(limit = "3") DynamicObjectLibrary objectLibrary,
-      @Cached("create()") @Shared("callNode") IndirectCallNode callNode) {
-
-    checkConst(receiver);
-
-    // fast path: check cache using optimized library access
-    var result = receiver.getCachedValue(propertyName, objectLibrary);
-    if (result != null) return result;
-
-    // slow path: look up member in prototype chain and compute value
-    result = VmUtils.readMemberOrNull(receiver, propertyName, true, callNode);
-    if (result != null) return result;
-
-    CompilerDirectives.transferToInterpreter();
-    throw cannotFindProperty(receiver);
-  }
-
   // This method effectively covers `VmObject receiver` but is implemented in a more
   // efficient way. See:
   // https://www.graalvm.org/22.0/graalvm-as-a-platform/language-implementation-framework/TruffleLibraries/#strategy-2-java-interfaces
@@ -92,7 +68,7 @@ public abstract class ReadPropertyNode extends ExpressionNode {
   protected Object evalObject(
       Object receiver,
       @Cached("getVmObjectSubclassOrNull(receiver)") Class<? extends VmObjectLike> cachedClass,
-      @Cached("create()") @Shared("callNode") IndirectCallNode callNode) {
+      @Cached("create()") IndirectCallNode callNode) {
 
     var object = cachedClass.cast(receiver);
     checkConst(object);

pkl-core/src/main/java/org/pkl/core/externalreader/ExternalReaderProcess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,9 +71,9 @@ public interface ExternalReaderProcess extends AutoCloseable {
    *
    * <p>This method can be safely called multiple times. Subsequent calls have no effect.
    *
-   * <p><b>Implementation Note:</b> Implementers should request a graceful termination by sending a
+   * @implNote Implementers should request a graceful termination by sending a {@link
-   * {@link ExternalReaderMessages.CloseExternalProcess CloseExternalProcess} message to the process
+   *     ExternalReaderMessages.CloseExternalProcess CloseExternalProcess} message to the process
-   * before terminating it forcibly.
+   *     before terminating it forcibly.
    */
   @Override
   void close();

pkl-core/src/main/java/org/pkl/core/messaging/AbstractMessagePackEncoder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,17 +41,10 @@ public abstract class AbstractMessagePackEncoder implements MessageEncoder {
 
   @Override
   public final void encode(Message msg) throws IOException, ProtocolException {
-    // Serialize access to the packer.  In pkl server mode the main thread
+    packer.packArrayHeader(2);
-    // (handling CreateEvaluatorRequest) and the executor thread (sending
+    packer.packInt(msg.type().getCode());
-    // EvaluateResponse / ReadModuleRequest) call encode() concurrently.
+    encodeMessage(msg);
-    // Without this lock their writes interleave, corrupting the MessagePack
+    packer.flush();
-    // stream.  See JvmServerTest "concurrent encoding" for a regression test.
-    synchronized (packer) {
-      packer.packArrayHeader(2);
-      packer.packInt(msg.type().getCode());
-      encodeMessage(msg);
-      packer.flush();
-    }
   }
 
   protected void packMapHeader(int size, @Nullable Object value1) throws IOException {

pkl-core/src/main/java/org/pkl/core/runtime/PklShape.java

@@ -1,38 +0,0 @@
-/*
- * Copyright © 2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.pkl.core.runtime;
-
-import com.oracle.truffle.api.object.Shape;
-
-/** Factory for Truffle {@link Shape} instances used by Pkl objects. */
-public final class PklShape {
-
-  /** The root shape for all Pkl object instances. */
-  private static final Shape ROOT_SHAPE = Shape.newBuilder().build();
-
-  private PklShape() {}
-
-  /**
-   * Returns the root shape for Pkl objects.
-   *
-   * <p>This is the base shape from which all instance shapes derive. Properties are added
-   * dynamically as values are cached via {@link
-   * com.oracle.truffle.api.object.DynamicObjectLibrary#put}.
-   */
-  public static Shape getRootShape() {
-    return ROOT_SHAPE;
-  }
-}

pkl-core/src/main/java/org/pkl/core/runtime/PowerAssertions.java

@@ -219,6 +219,9 @@ public class PowerAssertions {
       return parserNode;
     }
     var children = parserNode.children();
+    if (children == null) {
+      return null;
+    }
     for (var child : children) {
       var found = findParserNode(node, child, offset);
       if (found != null) {

pkl-core/src/main/java/org/pkl/core/runtime/TestRunner.java

@@ -104,7 +104,7 @@ public final class TestRunner {
                   if (factValue == Boolean.FALSE) {
                     if (PowerAssertions.isEnabled()) {
                       try (var valueTracker = valueTrackerFactory.create()) {
-                        listing.cleanAllCachedValues();
+                        listing.cachedValues.clear();
                         VmUtils.readMember(listing, idx);
                         var failure =
                             factFailure(

pkl-core/src/main/java/org/pkl/core/runtime/VmBytes.java

@@ -29,7 +29,7 @@ import org.pkl.core.util.ByteArrayUtils;
 import org.pkl.core.util.Nullable;
 
 @ValueType
-public final class VmBytes implements VmValue, Iterable<Long> {
+public final class VmBytes extends VmValue implements Iterable<Long> {
 
   private @Nullable VmList vmList;
   private @Nullable String base64;

pkl-core/src/main/java/org/pkl/core/runtime/VmClass.java

@@ -19,8 +19,6 @@ import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 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.nodes.IndirectCallNode;
-import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.source.SourceSection;
 import java.util.*;
 import java.util.function.*;
@@ -45,7 +43,7 @@ import org.pkl.core.util.Nullable;
 // The currently implemented (and likely insufficient) solution is to
 // * deeply force standard library modules at initialization time.
 // * ensure that any further mutation (e.g., lazy initialization in VmClass) is thread-safe.
-public final class VmClass implements VmValue {
+public final class VmClass extends VmValue {
   private final SourceSection sourceSection;
   private final SourceSection headerSection;
   private final SourceSection @Nullable [] docComment;
@@ -125,16 +123,6 @@ public final class VmClass implements VmValue {
 
   private final Object mapToTypedMembersLock = new Object();
 
-  // Shape for instances of this class - used for Truffle's Dynamic Object Model
-  @LateInit
-  @GuardedBy("instanceShapeLock")
-  private Shape __instanceShape;
-
-  private final Object instanceShapeLock = new Object();
-
-  /** Cached IndirectCallNode for force() operations. */
-  private final IndirectCallNode cachedCallNode = IndirectCallNode.create();
-
   public VmClass(
       SourceSection sourceSection,
       SourceSection headerSection,
@@ -709,41 +697,6 @@ public final class VmClass implements VmValue {
     }
   }
 
-  /**
-   * Returns the Truffle Shape for instances of this class.
-   *
-   * <p>The shape is lazily initialized from the root shape. Instance shapes are used by the Dynamic
-   * Object Model to provide optimized property storage and inline caching for cached property
-   * values.
-   */
-  public Shape getInstanceShape() {
-    synchronized (instanceShapeLock) {
-      if (__instanceShape == null) {
-        __instanceShape = buildInstanceShape();
-      }
-      return __instanceShape;
-    }
-  }
-
-  @TruffleBoundary
-  private Shape buildInstanceShape() {
-    // start with the superclass shape if available, otherwise use root shape
-    if (superclass != null) {
-      return superclass.getInstanceShape();
-    }
-    return PklShape.getRootShape();
-  }
-
-  /**
-   * Returns the cached IndirectCallNode for force() operations.
-   *
-   * <p>This node is shared by all instances of this class and avoids the overhead of {@code
-   * IndirectCallNode.getUncached()} which performs a lookup on every call.
-   */
-  public IndirectCallNode getCachedCallNode() {
-    return cachedCallNode;
-  }
-
   /**
    * Tells if the given property defines a member of this class. Requires a fully initialized
    * inheritance hierarchy.

pkl-core/src/main/java/org/pkl/core/runtime/VmCollection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import java.util.Iterator;
 import org.organicdesign.fp.xform.Xform;
 
-public abstract class VmCollection implements VmValue, Iterable<Object> {
+public abstract class VmCollection extends VmValue implements Iterable<Object> {
   public interface Builder<T extends VmCollection> {
     void add(Object element);
 

pkl-core/src/main/java/org/pkl/core/runtime/VmDataSize.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.pkl.core.util.MathUtils;
 import org.pkl.core.util.Nullable;
 
 @ValueType
-public final class VmDataSize implements VmValue, Comparable<VmDataSize> {
+public final class VmDataSize extends VmValue implements Comparable<VmDataSize> {
   private static final Map<Identifier, DataSizeUnit> UNITS =
       Map.ofEntries(
           entry(Identifier.B, DataSizeUnit.BYTES),

pkl-core/src/main/java/org/pkl/core/runtime/VmDuration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import org.pkl.core.util.DurationUtils;
 import org.pkl.core.util.Nullable;
 
 @ValueType
-public final class VmDuration implements VmValue, Comparable<VmDuration> {
+public final class VmDuration extends VmValue implements Comparable<VmDuration> {
   private static final Map<Identifier, DurationUnit> UNITS =
       Map.of(
           Identifier.NS, DurationUnit.NANOS,

pkl-core/src/main/java/org/pkl/core/runtime/VmDynamic.java

@@ -28,8 +28,6 @@ import org.pkl.core.util.EconomicMaps;
 public final class VmDynamic extends VmObject {
   private int cachedRegularMemberCount = -1;
 
-  private final int length;
-
   private static final class EmptyHolder {
     private static final VmDynamic EMPTY =
         new VmDynamic(
@@ -39,6 +37,8 @@ public final class VmDynamic extends VmObject {
             0);
   }
 
+  private final int length;
+
   public static VmDynamic empty() {
     return EmptyHolder.EMPTY;
   }
@@ -48,7 +48,7 @@ public final class VmDynamic extends VmObject {
       VmObject parent,
       UnmodifiableEconomicMap<Object, ObjectMember> members,
       int length) {
-    super(PklShape.getRootShape(), enclosingFrame, Objects.requireNonNull(parent), members);
+    super(enclosingFrame, Objects.requireNonNull(parent), members);
     this.length = length;
   }
 
@@ -75,7 +75,8 @@ public final class VmDynamic extends VmObject {
   @Override
   @TruffleBoundary
   public PObject export() {
-    var properties = CollectionUtils.<String, Object>newLinkedHashMap(getCachedValueCount());
+    var properties =
+        CollectionUtils.<String, Object>newLinkedHashMap(EconomicMaps.size(cachedValues));
 
     iterateMemberValues(
         (key, member, value) -> {
@@ -108,7 +109,7 @@ public final class VmDynamic extends VmObject {
     other.force(false);
     if (getRegularMemberCount() != other.getRegularMemberCount()) return false;
 
-    var cursor = getCachedValueEntries();
+    var cursor = cachedValues.getEntries();
     while (cursor.advance()) {
       Object key = cursor.getKey();
       if (isHiddenOrLocalProperty(key)) continue;
@@ -129,7 +130,7 @@ public final class VmDynamic extends VmObject {
 
     force(false);
     var result = 0;
-    var cursor = getCachedValueEntries();
+    var cursor = cachedValues.getEntries();
 
     while (cursor.advance()) {
       var key = cursor.getKey();
@@ -149,9 +150,8 @@ public final class VmDynamic extends VmObject {
     if (cachedRegularMemberCount != -1) return cachedRegularMemberCount;
 
     var result = 0;
-    var cursor = getCachedValueEntries();
+    for (var key : cachedValues.getKeys()) {
-    while (cursor.advance()) {
+      if (!isHiddenOrLocalProperty(key)) result += 1;
-      if (!isHiddenOrLocalProperty(cursor.getKey())) result += 1;
     }
     cachedRegularMemberCount = result;
     return result;

pkl-core/src/main/java/org/pkl/core/runtime/VmFunction.java

@@ -23,14 +23,9 @@ import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.pkl.core.ast.PklRootNode;
 import org.pkl.core.ast.member.ObjectMember;
 import org.pkl.core.util.EconomicMaps;
-import org.pkl.core.util.EmptyMapCursor;
-import org.pkl.core.util.MapCursor;
 import org.pkl.core.util.Nullable;
 
-public final class VmFunction implements VmObjectLike {
+public final class VmFunction extends VmObjectLike {
-  // Own fields (VmFunction does not extend DynamicObject, so it has its own storage)
-  private final MaterializedFrame enclosingFrame;
-  private @Nullable Object extraStorage;
 
   private final Object thisValue;
   private final int paramCount;
@@ -42,28 +37,13 @@ public final class VmFunction implements VmObjectLike {
       int paramCount,
       PklRootNode rootNode,
       @Nullable Object extraStorage) {
-    this.enclosingFrame = enclosingFrame;
+    super(enclosingFrame);
     this.thisValue = thisValue;
     this.paramCount = paramCount;
     this.rootNode = rootNode;
     this.extraStorage = extraStorage;
   }
 
-  @Override
-  public MaterializedFrame getEnclosingFrame() {
-    return enclosingFrame;
-  }
-
-  @Override
-  public @Nullable Object getExtraStorage() {
-    return extraStorage;
-  }
-
-  @Override
-  public void setExtraStorage(@Nullable Object extraStorage) {
-    this.extraStorage = extraStorage;
-  }
-
   public RootCallTarget getCallTarget() {
     return rootNode.getCallTarget();
   }
@@ -143,27 +123,17 @@ public final class VmFunction implements VmObjectLike {
   }
 
   @Override
-  public MapCursor<Object, Object> getCachedValueEntries() {
+  public boolean iterateMemberValues(MemberValueConsumer consumer) {
-    return EmptyMapCursor.instance();
-  }
-
-  @Override
-  public int getCachedValueCount() {
-    return 0;
-  }
-
-  @Override
-  public boolean iterateMemberValues(VmObjectLike.MemberValueConsumer consumer) {
     return true;
   }
 
   @Override
-  public boolean forceAndIterateMemberValues(VmObjectLike.ForcedMemberValueConsumer consumer) {
+  public boolean forceAndIterateMemberValues(ForcedMemberValueConsumer consumer) {
     return true;
   }
 
   @Override
-  public boolean iterateAlreadyForcedMemberValues(VmObjectLike.ForcedMemberValueConsumer consumer) {
+  public boolean iterateAlreadyForcedMemberValues(ForcedMemberValueConsumer consumer) {
     return true;
   }
 

pkl-core/src/main/java/org/pkl/core/runtime/VmIntSeq.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import org.pkl.core.util.Nullable;
 // Some code copied from kotlin.ranges.Progressions, kotlin.ranges.ProgressionIterators,
 // kotlin.internal.ProgressionUtil (Apache 2).
 @ValueType
-public final class VmIntSeq implements VmValue, Iterable<Long> {
+public final class VmIntSeq extends VmValue implements Iterable<Long> {
   public final long start;
   public final long end;
   public final long step;

pkl-core/src/main/java/org/pkl/core/runtime/VmLanguage.java

@@ -34,7 +34,7 @@ import org.pkl.parser.syntax.Module;
 @TruffleLanguage.Registration(
     id = "pkl",
     name = "Pkl",
-    version = "0.32.0-dev",
+    version = "0.31.1",
     characterMimeTypes = VmLanguage.MIME_TYPE,
     contextPolicy = ContextPolicy.SHARED)
 @ProvidedTags(PklTags.Expression.class)

pkl-core/src/main/java/org/pkl/core/runtime/VmListing.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,7 +87,7 @@ public final class VmListing extends VmListingOrMapping {
   @Override
   @TruffleBoundary
   public List<Object> export() {
-    var properties = new ArrayList<>(getCachedValueCount());
+    var properties = new ArrayList<>(EconomicMaps.size(cachedValues));
 
     iterateMemberValues(
         (key, prop, value) -> {
@@ -121,7 +121,7 @@ public final class VmListing extends VmListingOrMapping {
     force(false);
     other.force(false);
 
-    var cursor = getCachedValueEntries();
+    var cursor = cachedValues.getEntries();
     while (cursor.advance()) {
       var key = cursor.getKey();
       if (key instanceof Identifier) continue;
@@ -142,7 +142,7 @@ public final class VmListing extends VmListingOrMapping {
 
     force(false);
     var result = 0;
-    var cursor = getCachedValueEntries();
+    var cursor = cachedValues.getEntries();
 
     while (cursor.advance()) {
       var key = cursor.getKey();

pkl-core/src/main/java/org/pkl/core/runtime/VmListingOrMapping.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.pkl.core.ast.member.ListingOrMappingTypeCastNode;
 import org.pkl.core.ast.member.ObjectMember;
 import org.pkl.core.ast.type.TypeNode;
+import org.pkl.core.util.EconomicMaps;
 import org.pkl.core.util.Nullable;
 
 public abstract class VmListingOrMapping extends VmObject {
@@ -31,24 +32,24 @@ public abstract class VmListingOrMapping extends VmObject {
   private final @Nullable Object typeCheckReceiver;
   private final @Nullable VmObjectLike typeCheckOwner;
 
-  protected VmListingOrMapping(
+  public VmListingOrMapping(
       MaterializedFrame enclosingFrame,
       @Nullable VmObject parent,
       UnmodifiableEconomicMap<Object, ObjectMember> members) {
-    super(PklShape.getRootShape(), enclosingFrame, parent, members);
+    super(enclosingFrame, parent, members);
     typeCastNode = null;
     typeCheckReceiver = null;
     typeCheckOwner = null;
   }
 
-  protected VmListingOrMapping(
+  public VmListingOrMapping(
       MaterializedFrame enclosingFrame,
       @Nullable VmObject parent,
       UnmodifiableEconomicMap<Object, ObjectMember> members,
       ListingOrMappingTypeCastNode typeCastNode,
       Object typeCheckReceiver,
       VmObjectLike typeCheckOwner) {
-    super(PklShape.getRootShape(), enclosingFrame, parent, members);
+    super(enclosingFrame, parent, members);
     this.typeCastNode = typeCastNode;
     this.typeCheckReceiver = typeCheckReceiver;
     this.typeCheckOwner = typeCheckOwner;
@@ -87,7 +88,7 @@ public abstract class VmListingOrMapping extends VmObject {
   @Override
   @TruffleBoundary
   public final @Nullable Object getCachedValue(Object key) {
-    var result = super.getCachedValue(key);
+    var result = EconomicMaps.get(cachedValues, key);
     // if this object has members, `this[key]` may differ from `parent[key]`, so stop the search
     if (result != null || !members.isEmpty()) return result;
 

pkl-core/src/main/java/org/pkl/core/runtime/VmMap.java

@@ -30,7 +30,7 @@ import org.pkl.core.util.paguro.RrbTree;
 import org.pkl.core.util.paguro.RrbTree.ImRrbt;
 import org.pkl.core.util.paguro.RrbTree.MutRrbt;
 
-public final class VmMap implements VmValue, Iterable<Map.Entry<Object, Object>> {
+public final class VmMap extends VmValue implements Iterable<Map.Entry<Object, Object>> {
   public static final VmMap EMPTY = new VmMap(PersistentHashMap.empty(), RrbTree.empty());
 
   private final ImMap<Object, Object> map;

pkl-core/src/main/java/org/pkl/core/runtime/VmMapping.java

@@ -93,7 +93,7 @@ public final class VmMapping extends VmListingOrMapping {
   @Override
   @TruffleBoundary
   public Map<Object, Object> export() {
-    var properties = CollectionUtils.newLinkedHashMap(getCachedValueCount());
+    var properties = CollectionUtils.newLinkedHashMap(EconomicMaps.size(cachedValues));
 
     iterateMemberValues(
         (key, prop, value) -> {
@@ -128,7 +128,7 @@ public final class VmMapping extends VmListingOrMapping {
     other.force(false);
     if (getLength() != other.getLength()) return false;
 
-    var cursor = getCachedValueEntries();
+    var cursor = cachedValues.getEntries();
     while (cursor.advance()) {
       Object key = cursor.getKey();
       if (key instanceof Identifier) continue;
@@ -149,7 +149,7 @@ public final class VmMapping extends VmListingOrMapping {
 
     force(false);
     var result = 0;
-    var cursor = getCachedValueEntries();
+    var cursor = cachedValues.getEntries();
 
     while (cursor.advance()) {
       var key = cursor.getKey();

pkl-core/src/main/java/org/pkl/core/runtime/VmNull.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import org.pkl.core.PNull;
 import org.pkl.core.util.Nullable;
 
 @ValueType
-public final class VmNull implements VmValue {
+public final class VmNull extends VmValue {
   private static final VmNull WITHOUT_DEFAULT = new VmNull(null);
 
   // worthwhile to create this lazily?

pkl-core/src/main/java/org/pkl/core/runtime/VmObject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,69 +18,42 @@ package org.pkl.core.runtime;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.MaterializedFrame;
-import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.object.DynamicObjectLibrary;
-import com.oracle.truffle.api.object.Shape;
 import java.util.*;
 import java.util.function.BiFunction;
+import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.pkl.core.ast.member.ObjectMember;
 import org.pkl.core.util.CollectionUtils;
-import org.pkl.core.util.DynamicObjectMapCursor;
 import org.pkl.core.util.EconomicMaps;
-import org.pkl.core.util.MapCursor;
 import org.pkl.core.util.Nullable;
 
-/**
+/** Corresponds to `pkl.base#Object`. */
- * Corresponds to `pkl.base#Object`.
+public abstract class VmObject extends VmObjectLike {
- *
- * <p>Extends {@link DynamicObject} to leverage Truffle's object storage and inline caching
- * capabilities. Cached property values are stored directly in this object using the Dynamic Object
- * Model.
- */
-public abstract class VmObject extends DynamicObject implements VmObjectLike {
-  // moved from VmObjectLike
-  protected final MaterializedFrame enclosingFrame;
-  protected @Nullable Object extraStorage;
-
   @CompilationFinal protected @Nullable VmObject parent;
   protected final UnmodifiableEconomicMap<Object, ObjectMember> members;
+  protected final EconomicMap<Object, Object> cachedValues;
 
   protected int cachedHash;
   private boolean forced;
 
-  /**
+  public VmObject(
-   * Separate cache for local property values.
-   *
-   * <p>This is kept separate from the DynamicObject storage to avoid shape transitions.
-   */
-  private @Nullable IdentityHashMap<ObjectMember, Object> localPropertyCache;
-
-  protected VmObject(
-      Shape shape,
       MaterializedFrame enclosingFrame,
       @Nullable VmObject parent,
-      UnmodifiableEconomicMap<Object, ObjectMember> members) {
+      UnmodifiableEconomicMap<Object, ObjectMember> members,
-    super(shape);
+      EconomicMap<Object, Object> cachedValues) {
-    this.enclosingFrame = enclosingFrame;
+    super(enclosingFrame);
     this.parent = parent;
     this.members = members;
+    this.cachedValues = cachedValues;
+
     assert parent != this;
   }
 
-  @Override
+  public VmObject(
-  public final MaterializedFrame getEnclosingFrame() {
+      MaterializedFrame enclosingFrame,
-    return enclosingFrame;
+      @Nullable VmObject parent,
-  }
+      UnmodifiableEconomicMap<Object, ObjectMember> members) {
-
+    this(enclosingFrame, parent, members, EconomicMaps.create());
-  @Override
-  public final @Nullable Object getExtraStorage() {
-    return extraStorage;
-  }
-
-  @Override
-  public final void setExtraStorage(@Nullable Object extraStorage) {
-    this.extraStorage = extraStorage;
   }
 
   public final void lateInitParent(VmObject parent) {
@@ -94,13 +67,11 @@ public abstract class VmObject extends DynamicObject implements VmObjectLike {
   }
 
   @Override
-  @TruffleBoundary
   public final boolean hasMember(Object key) {
     return EconomicMaps.containsKey(members, key);
   }
 
   @Override
-  @TruffleBoundary
   public final @Nullable ObjectMember getMember(Object key) {
     return EconomicMaps.get(members, key);
   }
@@ -111,81 +82,23 @@ public abstract class VmObject extends DynamicObject implements VmObjectLike {
   }
 
   @Override
-  @TruffleBoundary
   public @Nullable Object getCachedValue(Object key) {
-    return DynamicObjectLibrary.getUncached().getOrDefault(this, key, null);
+    return EconomicMaps.get(cachedValues, key);
+  }
+
+  @Override
+  public final void setCachedValue(Object key, Object value) {
+    EconomicMaps.put(cachedValues, key, value);
+  }
+
+  @Override
+  public final boolean hasCachedValue(Object key) {
+    return EconomicMaps.containsKey(cachedValues, key);
   }
 
   @Override
   @TruffleBoundary
-  public void setCachedValue(Object key, Object value) {
+  public final boolean iterateMemberValues(MemberValueConsumer consumer) {
-    DynamicObjectLibrary.getUncached().put(this, key, value);
-  }
-
-  @Override
-  @TruffleBoundary
-  public boolean hasCachedValue(Object key) {
-    return DynamicObjectLibrary.getUncached().containsKey(this, key);
-  }
-
-  @Override
-  public MapCursor<Object, Object> getCachedValueEntries() {
-    return new DynamicObjectMapCursor(this);
-  }
-
-  @Override
-  @TruffleBoundary
-  public int getCachedValueCount() {
-    return DynamicObjectLibrary.getUncached().getKeyArray(this).length;
-  }
-
-  /**
-   * Clean all cached values. Local or otherwise. Resets cached values to null without removing the
-   * keys, preserving the object's shape for pre-allocated slots.
-   */
-  @TruffleBoundary
-  public void cleanAllCachedValues() {
-    if (localPropertyCache != null) {
-      localPropertyCache.clear();
-    }
-
-    var lib = DynamicObjectLibrary.getUncached();
-    Object[] keys = lib.getKeyArray(this);
-    for (Object key : keys) {
-      lib.put(this, key, null);
-    }
-
-    forced = false;
-  }
-
-  /**
-   * Gets a cached local property value.
-   *
-   * @param property the ObjectMember representing the local property declaration
-   * @return the cached value, or null if not cached
-   */
-  @TruffleBoundary
-  public @Nullable Object getLocalCachedValue(ObjectMember property) {
-    return localPropertyCache == null ? null : localPropertyCache.get(property);
-  }
-
-  /**
-   * Sets a cached local property value.
-   *
-   * @param property the ObjectMember representing the local property declaration
-   * @param value the value to cache
-   */
-  @TruffleBoundary
-  public void setLocalCachedValue(ObjectMember property, Object value) {
-    if (localPropertyCache == null) {
-      localPropertyCache = new IdentityHashMap<>(4);
-    }
-    localPropertyCache.put(property, value);
-  }
-
-  @Override
-  @TruffleBoundary
-  public final boolean iterateMemberValues(VmObjectLike.MemberValueConsumer consumer) {
     var visited = new HashSet<>();
     return iterateMembers(
         (key, member) -> {
@@ -199,16 +112,14 @@ public abstract class VmObject extends DynamicObject implements VmObjectLike {
 
   @Override
   @TruffleBoundary
-  public final boolean forceAndIterateMemberValues(
+  public final boolean forceAndIterateMemberValues(ForcedMemberValueConsumer consumer) {
-      VmObjectLike.ForcedMemberValueConsumer consumer) {
     force(false, false);
     return iterateAlreadyForcedMemberValues(consumer);
   }
 
   @Override
   @TruffleBoundary
-  public final boolean iterateAlreadyForcedMemberValues(
+  public final boolean iterateAlreadyForcedMemberValues(ForcedMemberValueConsumer consumer) {
-      VmObjectLike.ForcedMemberValueConsumer consumer) {
     var visited = new HashSet<>();
     return iterateMembers(
         (key, member) -> {
@@ -247,9 +158,6 @@ public abstract class VmObject extends DynamicObject implements VmObjectLike {
 
     if (recurse) forced = true;
 
-    // use cached call node from this object's class to avoid getUncached() overhead
-    var callNode = getVmClass().getCachedCallNode();
-
     try {
       for (VmObjectLike owner = this; owner != null; owner = owner.getParent()) {
         var cursor = EconomicMaps.getEntries(owner.getMembers());
@@ -266,7 +174,7 @@ public abstract class VmObject extends DynamicObject implements VmObjectLike {
           var memberValue = getCachedValue(memberKey);
           if (memberValue == null) {
             try {
-              memberValue = VmUtils.doReadMember(this, owner, memberKey, member, true, callNode);
+              memberValue = VmUtils.doReadMember(this, owner, memberKey, member);
             } catch (VmUndefinedValueException e) {
               if (!allowUndefinedValues) throw e;
               continue;
@@ -300,7 +208,7 @@ public abstract class VmObject extends DynamicObject implements VmObjectLike {
    */
   @TruffleBoundary
   protected final Map<String, Object> exportMembers() {
-    var result = CollectionUtils.<String, Object>newLinkedHashMap(getCachedValueCount());
+    var result = CollectionUtils.<String, Object>newLinkedHashMap(EconomicMaps.size(cachedValues));
 
     iterateMemberValues(
         (key, member, value) -> {

pkl-core/src/main/java/org/pkl/core/runtime/VmObjectLike.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,39 +15,53 @@
  */
 package org.pkl.core.runtime;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import java.util.function.BiFunction;
 import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.pkl.core.ast.member.ObjectMember;
-import org.pkl.core.util.MapCursor;
 import org.pkl.core.util.Nullable;
 
 /**
  * Corresponds to `pkl.base#Object|pkl.base#Function`. The lexical scope is a chain of
  * `VmObjectLike` instances.
  */
-public interface VmObjectLike extends VmValue {
+public abstract class VmObjectLike extends VmValue {
   /** The frame that was active when this object was instantiated. * */
-  MaterializedFrame getEnclosingFrame();
+  protected final MaterializedFrame enclosingFrame;
 
-  @Nullable
+  protected @Nullable Object extraStorage;
-  Object getExtraStorage();
 
-  void setExtraStorage(@Nullable Object extraStorage);
+  protected VmObjectLike(MaterializedFrame enclosingFrame) {
-
+    this.enclosingFrame = enclosingFrame;
-  default boolean hasExtraStorage() {
-    return getExtraStorage() != null;
   }
 
-  default @Nullable Object getEnclosingReceiver() {
+  public final MaterializedFrame getEnclosingFrame() {
-    return VmUtils.getReceiverOrNull(getEnclosingFrame());
+    return enclosingFrame;
   }
 
-  default @Nullable VmObjectLike getEnclosingOwner() {
+  public final @Nullable Object getEnclosingReceiver() {
-    return VmUtils.getOwnerOrNull(getEnclosingFrame());
+    return VmUtils.getReceiverOrNull(enclosingFrame);
   }
 
-  default boolean isModuleObject() {
+  public final @Nullable VmObjectLike getEnclosingOwner() {
+    return VmUtils.getOwnerOrNull(enclosingFrame);
+  }
+
+  public final boolean hasExtraStorage() {
+    return extraStorage != null;
+  }
+
+  public Object getExtraStorage() {
+    assert extraStorage != null;
+    return extraStorage;
+  }
+
+  public final void setExtraStorage(@Nullable Object extraStorage) {
+    this.extraStorage = extraStorage;
+  }
+
+  public boolean isModuleObject() {
     return false;
   }
 
@@ -55,45 +69,41 @@ public interface VmObjectLike extends VmValue {
    * Returns the parent object in the prototype chain. For each concrete subclass X of VmObjectLike,
    * the exact return type of this method is `X|VmTyped`.
    */
-  @Nullable
+  public abstract @Nullable VmObjectLike getParent();
-  VmObjectLike getParent();
 
   /** Always prefer this method over `getMembers().containsKey(key)`. */
-  boolean hasMember(Object key);
+  @TruffleBoundary
+  public abstract boolean hasMember(Object key);
 
   /** Always prefer this method over `getMembers().get(key)`. */
-  @Nullable
+  @TruffleBoundary
-  ObjectMember getMember(Object key);
+  public abstract @Nullable ObjectMember getMember(Object key);
 
   /** Returns the declared members of this object. */
-  UnmodifiableEconomicMap<Object, ObjectMember> getMembers();
+  public abstract UnmodifiableEconomicMap<Object, ObjectMember> getMembers();
 
   /**
    * Reads from the properties cache for this object. The cache contains the values of all members
    * defined in this object or an ancestor thereof which have been requested with this object as the
    * receiver.
    */
-  @Nullable
+  @TruffleBoundary
-  Object getCachedValue(Object key);
+  public abstract @Nullable Object getCachedValue(Object key);
 
   /**
    * Writes to the properties cache for this object. The cache contains the values of all members
    * defined in this object or an ancestor thereof which have been requested with this object as the
    * receiver.
    */
-  void setCachedValue(Object key, Object value);
+  @TruffleBoundary
+  public abstract void setCachedValue(Object key, Object value);
 
   /**
    * Prefer this method over {@link #getCachedValue} if the value is not required. (There is no
    * point in calling this method to determine whether to call {@link #getCachedValue}.)
    */
-  boolean hasCachedValue(Object key);
+  @TruffleBoundary
-
+  public abstract boolean hasCachedValue(Object key);
-  /** Returns a cursor for iterating over all cached values in this object. */
-  MapCursor<Object, Object> getCachedValueEntries();
-
-  /** Returns the number of cached values in this object. */
-  int getCachedValueCount();
 
   /**
    * Iterates over member definitions and their values in order of their definition, from the top of
@@ -108,15 +118,15 @@ public interface VmObjectLike extends VmValue {
    * remaining members are not visited, and `false` is returned. Otherwise, all members are visited,
    * and `true` is returned.
    */
-  boolean iterateMemberValues(MemberValueConsumer consumer);
+  public abstract boolean iterateMemberValues(MemberValueConsumer consumer);
 
   /**
    * Same as {@link #iterateMemberValues} except that it first performs a shallow {@link #force}. As
    * a consequence, values passed to {@code consumer} are guaranteed to be non-null.
    */
-  boolean forceAndIterateMemberValues(ForcedMemberValueConsumer consumer);
+  public abstract boolean forceAndIterateMemberValues(ForcedMemberValueConsumer consumer);
 
-  boolean iterateAlreadyForcedMemberValues(ForcedMemberValueConsumer consumer);
+  public abstract boolean iterateAlreadyForcedMemberValues(ForcedMemberValueConsumer consumer);
 
   /**
    * Iterates over member definitions in order of their definition, from the top of the prototype
@@ -125,20 +135,19 @@ public interface VmObjectLike extends VmValue {
    * members are not visited, and `false` is returned. Otherwise, all members are visited, and
    * `true` is returned.
    */
-  boolean iterateMembers(BiFunction<Object, ObjectMember, Boolean> consumer);
+  public abstract boolean iterateMembers(BiFunction<Object, ObjectMember, Boolean> consumer);
 
   /** Forces shallow or recursive (deep) evaluation of this object. */
-  void force(boolean allowUndefinedValues, boolean recurse);
+  public abstract void force(boolean allowUndefinedValues, boolean recurse);
 
   /**
    * Exports this object to an external representation. Does not export local, hidden, or external
    * properties
    */
-  @Override
+  public abstract Object export();
-  Object export();
 
   @FunctionalInterface
-  interface MemberValueConsumer {
+  public interface MemberValueConsumer {
     /**
      * Returns true if {@link #iterateMemberValues} should continue calling this method for the
      * remaining members, and false otherwise.
@@ -147,7 +156,7 @@ public interface VmObjectLike extends VmValue {
   }
 
   @FunctionalInterface
-  interface ForcedMemberValueConsumer {
+  public interface ForcedMemberValueConsumer {
     /**
      * Returns true if {@link #forceAndIterateMemberValues} should continue calling this method for
      * the remaining members, and false otherwise.

pkl-core/src/main/java/org/pkl/core/runtime/VmPair.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import org.pkl.core.Pair;
 import org.pkl.core.util.Nullable;
 
 @ValueType
-public final class VmPair implements VmValue, Iterable<Object> {
+public final class VmPair extends VmValue implements Iterable<Object> {
   private final Object first;
   private final Object second;
 

pkl-core/src/main/java/org/pkl/core/runtime/VmRegex.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import org.pkl.core.ValueFormatter;
 import org.pkl.core.util.Nullable;
 
 @ValueType
-public final class VmRegex implements VmValue {
+public final class VmRegex extends VmValue {
   private final Pattern pattern;
 
   public VmRegex(Pattern pattern) {

pkl-core/src/main/java/org/pkl/core/runtime/VmTypeAlias.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ import org.pkl.core.ast.type.TypeNode.UnknownTypeNode;
 import org.pkl.core.util.LateInit;
 import org.pkl.core.util.Nullable;
 
-public final class VmTypeAlias implements VmValue {
+public final class VmTypeAlias extends VmValue {
   private final SourceSection sourceSection;
   private final SourceSection headerSection;
   private final SourceSection @Nullable [] docComment;

pkl-core/src/main/java/org/pkl/core/runtime/VmTyped.java

@@ -19,9 +19,6 @@ import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.instrumentation.InstrumentableNode.WrapperNode;
-import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.object.DynamicObjectLibrary;
-import com.oracle.truffle.api.object.Shape;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.pkl.core.Composite;
@@ -37,99 +34,14 @@ import org.pkl.core.util.Nullable;
 public final class VmTyped extends VmObject {
   @CompilationFinal @LateInit private VmClass clazz;
 
-  /**
-   * Creates a new VmTyped with the class's instance shape.
-   *
-   * @param enclosingFrame the frame that was active when this object was instantiated
-   * @param parent the parent in the prototype chain, or null
-   * @param clazz the class of this object, or null if it will be late-initialized
-   * @param members the declared members of this object
-   */
   public VmTyped(
       MaterializedFrame enclosingFrame,
       @Nullable VmTyped parent,
       // null -> will be initialized using lateInitVmClass() later
       @Nullable VmClass clazz,
       UnmodifiableEconomicMap<Object, ObjectMember> members) {
-    this(enclosingFrame, parent, clazz, members, getShapeForClass(clazz));
+    super(enclosingFrame, parent, members);
-  }
-
-  /**
-   * Creates a new VmTyped with a custom shape.
-   *
-   * <p>This constructor is used when a specific shape is needed, such as when amending an object
-   * where the shape may differ from the class's base instance shape.
-   *
-   * @param enclosingFrame the frame that was active when this object was instantiated
-   * @param parent the parent in the prototype chain, or null
-   * @param clazz the class of this object, or null if it will be late-initialized
-   * @param members the declared members of this object
-   * @param shape the Truffle shape for this object's cached value storage
-   */
-  public VmTyped(
-      MaterializedFrame enclosingFrame,
-      @Nullable VmTyped parent,
-      @Nullable VmClass clazz,
-      UnmodifiableEconomicMap<Object, ObjectMember> members,
-      Shape shape) {
-    super(shape, enclosingFrame, parent, members);
     this.clazz = clazz;
-    // pre-allocate cache slots for all members to stabilize the shape
-    preallocateCacheSlots(members);
-  }
-
-  /**
-   * Pre-allocates cache slots for all members by putting null values. This creates shape
-   * transitions upfront so all instances share the same final shape.
-   */
-  private void preallocateCacheSlots(UnmodifiableEconomicMap<Object, ObjectMember> members) {
-    var library = DynamicObjectLibrary.getUncached();
-    var cursor = members.getEntries();
-    while (cursor.advance()) {
-      library.put(this, cursor.getKey(), null);
-    }
-  }
-
-  private static Shape getShapeForClass(@Nullable VmClass clazz) {
-    return clazz != null ? clazz.getInstanceShape() : PklShape.getRootShape();
-  }
-
-  /** Returns this object for cached value storage. */
-  public DynamicObject getCachedValuesStorage() {
-    return this;
-  }
-
-  /**
-   * Gets a cached value using the provided library for PE-optimized access.
-   *
-   * @param key the property key
-   * @param library the DynamicObjectLibrary to use (should be cached via @CachedLibrary)
-   * @return the cached value, or null if not present
-   */
-  public @Nullable Object getCachedValue(Object key, DynamicObjectLibrary library) {
-    return library.getOrDefault(this, key, null);
-  }
-
-  /**
-   * Sets a cached value using the provided library for PE-optimized access.
-   *
-   * @param key the property key
-   * @param value the value to cache
-   * @param library the DynamicObjectLibrary to use (should be cached via @CachedLibrary)
-   */
-  public void setCachedValue(Object key, Object value, DynamicObjectLibrary library) {
-    library.put(this, key, value);
-  }
-
-  /**
-   * Checks if a cached value exists using the provided library for PE-optimized access.
-   *
-   * @param key the property key
-   * @param library the DynamicObjectLibrary to use (should be cached via @CachedLibrary)
-   * @return true if a value is cached for this key
-   */
-  public boolean hasCachedValue(Object key, DynamicObjectLibrary library) {
-    return library.containsKey(this, key);
   }
 
   public void lateInitVmClass(VmClass clazz) {

pkl-core/src/main/java/org/pkl/core/runtime/VmValue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,30 +17,30 @@ package org.pkl.core.runtime;
 
 import org.pkl.core.util.Nullable;
 
-public interface VmValue {
+public abstract class VmValue {
-  VmClass getVmClass();
+  public abstract VmClass getVmClass();
 
-  default VmTyped getPrototype() {
+  public VmTyped getPrototype() {
     return getVmClass().getPrototype();
   }
 
-  default boolean isPrototype() {
+  public boolean isPrototype() {
     return false;
   }
 
-  default boolean isDynamic() {
+  public boolean isDynamic() {
     return this instanceof VmDynamic;
   }
 
-  default boolean isListing() {
+  public boolean isListing() {
     return this instanceof VmListing;
   }
 
-  default boolean isMapping() {
+  public boolean isMapping() {
     return this instanceof VmMapping;
   }
 
-  default boolean isTyped() {
+  public boolean isTyped() {
     return this instanceof VmTyped;
   }
 
@@ -48,21 +48,21 @@ public interface VmValue {
    * Tells if this value is a {@link VmCollection}, {@link VmListing}, or {@link VmDynamic} with
    * {@link VmDynamic#hasElements() elements}.
    */
-  default boolean isSequence() {
+  public boolean isSequence() {
     return false;
   }
 
   /** Forces recursive (deep) evaluation of this value. */
-  void force(boolean allowUndefinedValues);
+  public abstract void force(boolean allowUndefinedValues);
 
-  Object export();
+  public abstract Object export();
 
-  void accept(VmValueVisitor visitor);
+  public abstract void accept(VmValueVisitor visitor);
 
-  <T> T accept(VmValueConverter<T> converter, Iterable<Object> path);
+  public abstract <T> T accept(VmValueConverter<T> converter, Iterable<Object> path);
 
   /** Forces recursive (deep) evaluation of the given value. */
-  static void force(Object value, boolean allowUndefinedValues) {
+  public static void force(Object value, boolean allowUndefinedValues) {
     if (value instanceof VmValue vmValue) {
       vmValue.force(allowUndefinedValues);
     }
@@ -72,7 +72,7 @@ public interface VmValue {
    * Used to export values other than object member values. Such values aren't `@Nullable` (but can
    * be `VmNull`).
    */
-  static Object export(Object value) {
+  public static Object export(Object value) {
     if (value instanceof VmValue vmValue) {
       return vmValue.export();
     }
@@ -80,10 +80,14 @@ public interface VmValue {
   }
 
   /** Used to export object member values. Such values are `null` if they haven't been forced. */
-  static @Nullable Object exportNullable(@Nullable Object value) {
+  public static @Nullable Object exportNullable(@Nullable Object value) {
     if (value instanceof VmValue vmValue) {
       return vmValue.export();
     }
     return value;
   }
+
+  /** Enables calling `vmValue.equals()` when not behind a Truffle boundary. */
+  @Override
+  public abstract boolean equals(Object obj);
 }

pkl-core/src/main/java/org/pkl/core/util/DynamicObjectMapCursor.java

@@ -1,65 +0,0 @@
-/*
- * Copyright © 2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.pkl.core.util;
-
-import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.object.DynamicObjectLibrary;
-
-/**
- * A {@link MapCursor} implementation that iterates over the properties of a {@link DynamicObject}.
- *
- * <p>This cursor provides allocation-free iteration over DynamicObject properties by caching the
- * key array at construction time and accessing values on demand.
- */
-public final class DynamicObjectMapCursor implements MapCursor<Object, Object> {
-  private final DynamicObject object;
-  private final DynamicObjectLibrary library;
-  private final Object[] keys;
-  private int index = -1;
-
-  /**
-   * Creates a cursor for iterating over the given DynamicObject's properties.
-   *
-   * @param object the DynamicObject to iterate over
-   */
-  public DynamicObjectMapCursor(DynamicObject object) {
-    this.object = object;
-    this.library = DynamicObjectLibrary.getUncached();
-    this.keys = library.getKeyArray(object);
-  }
-
-  @Override
-  public boolean advance() {
-    index++;
-    return index < keys.length;
-  }
-
-  @Override
-  public Object getKey() {
-    if (index < 0 || index >= keys.length) {
-      throw new IllegalStateException("Cursor not positioned on a valid entry");
-    }
-    return keys[index];
-  }
-
-  @Override
-  public Object getValue() {
-    if (index < 0 || index >= keys.length) {
-      throw new IllegalStateException("Cursor not positioned on a valid entry");
-    }
-    return library.getOrDefault(object, keys[index], null);
-  }
-}

pkl-core/src/main/java/org/pkl/core/util/EmptyMapCursor.java

@@ -1,44 +0,0 @@
-/*
- * Copyright © 2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.pkl.core.util;
-
-/** A cursor that iterates over zero entries. */
-public final class EmptyMapCursor<K, V> implements MapCursor<K, V> {
-  private static final EmptyMapCursor<Object, Object> INSTANCE = new EmptyMapCursor<>();
-
-  private EmptyMapCursor() {}
-
-  /** Returns the singleton empty cursor instance. */
-  @SuppressWarnings("unchecked")
-  public static <K, V> MapCursor<K, V> instance() {
-    return (MapCursor<K, V>) INSTANCE;
-  }
-
-  @Override
-  public boolean advance() {
-    return false;
-  }
-
-  @Override
-  public K getKey() {
-    throw new IllegalStateException("Cannot get key from empty cursor");
-  }
-
-  @Override
-  public V getValue() {
-    throw new IllegalStateException("Cannot get value from empty cursor");
-  }
-}

pkl-core/src/main/java/org/pkl/core/util/MapCursor.java

@@ -1,40 +0,0 @@
-/*
- * Copyright © 2026 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.pkl.core.util;
-
-/** A cursor for iterating over map entries without allocating Entry objects. */
-public interface MapCursor<K, V> {
-  /**
-   * Advances the cursor to the next entry.
-   *
-   * @return true if there is a next entry, false if iteration is complete
-   */
-  boolean advance();
-
-  /**
-   * Returns the key at the current cursor position.
-   *
-   * @throws IllegalStateException if called before {@link #advance()} or after it returns false
-   */
-  K getKey();
-
-  /**
-   * Returns the value at the current cursor position.
-   *
-   * @throws IllegalStateException if called before {@link #advance()} or after it returns false
-   */
-  V getValue();
-}

pkl-core/src/main/java/org/pkl/core/util/paguro/RrbTree.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2016-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1016,7 +1016,7 @@ public abstract class RrbTree<E> implements BaseList<E>, Indented {
      * Can we put focus at the given index without reshuffling nodes?
      *
      * @param index the index we want to insert at
-     * @param size the number of items to insert. Must be {@code size < MAX_NODE_LENGTH}
+     * @param size the number of items to insert. Must be size < MAX_NODE_LENGTH
      * @return true if we can do so without otherwise adjusting the tree.
      */
     boolean hasRelaxedCapacity(int index, int size);

pkl-core/src/main/java/org/pkl/core/util/paguro/package-info.java

@@ -8,7 +8,7 @@
  *
  * <p>Original license:
  *
- * <p>Copyright 2016-05-28 PlanBase Inc. &amp; Glen Peterson
+ * <p>Copyright 2016-05-28 PlanBase Inc. & Glen Peterson
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License.

pkl-core/src/test/kotlin/org/pkl/core/PClassInfoTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,8 +47,7 @@ class PClassInfoTest {
 
   @Test
   fun isExactTypeOf() {
-    // Any() is the equivalent of Java's Object()
+    assertThat(PClassInfo.Any.isExactClassOf(Object())).isFalse
-    assertThat(PClassInfo.Any.isExactClassOf(Any())).isFalse
+    assertThat(PClassInfo.Typed.isExactClassOf(Object())).isFalse
-    assertThat(PClassInfo.Typed.isExactClassOf(Any())).isFalse
   }
 }

pkl-core/src/test/kotlin/org/pkl/core/PklBinaryDecoderTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import org.pkl.core.util.pklbinary.PklBinaryCode
 class PklBinaryDecoderTest {
   @Test
   fun `decoding succeeds`() {
-    val moduleUri = URI.create($$"file:///$snippetsDir/input/api/encoding1.msgpack.yaml.pkl")
+    val moduleUri = URI.create("file:///\$snippetsDir/input/api/encoding1.msgpack.yaml.pkl")
     // based on pkl-core/src/test/files/LanguageSnippetTests/input/api/encoding1.msgpack.yaml.pkl
     // but Class, TypeAlias, and IntSeq values are nil'd
     // and any module URIs are normalized to use $snippetsDir instead of an absoulute path
@@ -63,7 +63,7 @@ class PklBinaryDecoderTest {
             PObject(
               PClassInfo.get("pkl.base", "PcfRenderer", PClassInfo.pklBaseUri),
               mapOf(
-                "converters" to emptyMap<Any, Any>(),
+                "converters" to emptyMap<Object, Object>(),
                 "extension" to "pcf",
                 "indent" to "  ",
                 "omitNullProperties" to false,

pkl-doc/gradle.lockfile

@@ -1,139 +1,131 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.github.ajalt.clikt:clikt-core-jvm:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-core:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-core:5.0.3=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-jvm:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown-jvm:5.1.0=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown:5.1.0=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt-markdown:5.0.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt:5.1.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.clikt:clikt:5.0.3=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.github.ajalt.colormath:colormath-jvm:3.6.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.colormath:colormath:3.6.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.colormath:colormath:3.6.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core-jvm:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-core:3.0.1=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.2=runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown:3.0.2=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant-markdown:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant:3.0.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.ajalt.mordant:mordant:3.0.1=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable
 com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable
-com.google.errorprone:error_prone_annotations:2.36.0=testCompileClasspath,testRuntimeClasspath
+com.google.errorprone:error_prone_annotations:2.36.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath
+com.google.guava:failureaccess:1.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.guava:guava:33.4.8-jre=testCompileClasspath,testRuntimeClasspath
+com.google.guava:guava:33.4.8-jre=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testRuntimeClasspath
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath,testRuntimeClasspath
+com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.jimfs:jimfs:1.3.1=testCompileClasspath,testRuntimeClasspath
+com.google.jimfs:jimfs:1.3.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.ibm.icu:icu4j:75.1=validator
+com.ibm.icu:icu4j:58.2=validator
-commons-codec:commons-codec:1.15=validator
+com.shapesecurity:salvation:2.7.2=validator
-commons-io:commons-io:2.15.1=validator
+commons-codec:commons-codec:1.10=validator
+commons-io:commons-io:2.4=validator
 commons-logging:commons-logging:1.2=validator
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
 isorelax:isorelax:20030108=validator
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 net.java.dev.jna:jna:5.14.0=runtimeClasspath,testRuntimeClasspath
 net.sf.saxon:Saxon-HE:9.6.0-4=validator
-nu.validator:validator:26.4.11=validator
+nu.validator:cssvalidator:1.0.8=validator
-org.apache.commons:commons-lang3:3.14.0=validator
+nu.validator:galimatias:0.1.3=validator
-org.apache.commons:commons-text:1.12.0=validator
+nu.validator:htmlparser:1.4.16=validator
+nu.validator:jing:20200702VNU=validator
+nu.validator:langdetect:1.2=validator
+nu.validator:validator:20.7.2=validator
+org.apache.httpcomponents:httpclient:4.4=validator
+org.apache.httpcomponents:httpcore:4.4=validator
 org.apache.logging.log4j:log4j-1.2-api:2.17.1=validator
 org.apache.logging.log4j:log4j-api:2.17.1=validator
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.27.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.checkerframework:checker-qual:3.43.0=swiftExportClasspathResolvable
-org.commonmark:commonmark-ext-gfm-tables:0.28.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.commonmark:commonmark-ext-gfm-tables:0.26.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.commonmark:commonmark:0.28.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.commonmark:commonmark:0.26.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:11.0.20=validator
+org.eclipse.jetty:jetty-util-ajax:9.4.18.v20190429=validator
-org.eclipse.jetty:jetty-io:11.0.20=validator
+org.eclipse.jetty:jetty-util:9.4.18.v20190429=validator
-org.eclipse.jetty:jetty-util:11.0.20=validator
+org.graalvm.js:js-language:25.0.0=testRuntimeClasspath
-org.glassfish:javax.json:1.1.4=validator
+org.graalvm.js:js:25.0.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.js:js-language:25.0.1=testRuntimeClasspath
+org.graalvm.polyglot:polyglot:25.0.0=nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.js:js:25.0.1=testCompileClasspath,testRuntimeClasspath
+org.graalvm.regex:regex:25.0.0=testRuntimeClasspath
-org.graalvm.polyglot:polyglot:25.0.1=nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:collections:25.0.0=nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.regex:regex:25.0.1=testRuntimeClasspath
+org.graalvm.sdk:graal-sdk:25.0.0=nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.1=nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:jniutils:25.0.0=nativeImageClasspath,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.1=nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.sdk:nativeimage:25.0.0=nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:jniutils:25.0.1=nativeImageClasspath,testRuntimeClasspath
+org.graalvm.sdk:word:25.0.0=nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.1=nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.shadowed:icu4j:25.0.0=testRuntimeClasspath
-org.graalvm.sdk:word:25.0.1=nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.graalvm.shadowed:xz:25.0.0=testRuntimeClasspath
-org.graalvm.shadowed:icu4j:25.0.1=testRuntimeClasspath
+org.graalvm.truffle:truffle-api:25.0.0=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.graalvm.shadowed:xz:25.0.1=testRuntimeClasspath
+org.graalvm.truffle:truffle-compiler:25.0.0=nativeImageClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+org.graalvm.truffle:truffle-runtime:25.0.0=nativeImageClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-compiler:25.0.1=nativeImageClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.graalvm.truffle:truffle-runtime:25.0.1=nativeImageClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.htmlunit:htmlunit-csp:4.22.0=validator
+org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-serialization-compiler-plugin-embeddable:2.2.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-serialization-compiler-plugin-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,nativeImageClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=apiDependenciesMetadata,compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=apiDependenciesMetadata,swiftExportClasspathResolvable
+org.jetbrains.kotlinx:atomicfu:0.23.1=implementationDependenciesMetadata,testImplementationDependenciesMetadata
-org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-html-jvm:0.12.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-html-jvm:0.11.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.8.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.8.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.8.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.8.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.jetbrains:annotations:13.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains:annotations:23.0.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jetbrains:markdown-jvm:0.7.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
 org.jetbrains:markdown:0.7.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.11=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
+org.msgpack:msgpack-core:0.9.8=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 org.organicdesign:Paguro:3.10.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.9=validator
 org.snakeyaml:snakeyaml-engine:2.10=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-empty=annotationProcessor,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,stagedAlpineLinuxAmd64Executable,stagedLinuxAarch64Executable,stagedLinuxAmd64Executable,stagedMacAarch64Executable,stagedMacAmd64Executable,stagedWindowsAmd64Executable,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,stagedAlpineLinuxAmd64Executable,stagedLinuxAarch64Executable,stagedLinuxAmd64Executable,stagedMacAarch64Executable,stagedMacAmd64Executable,stagedWindowsAmd64Executable,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

pkl-doc/src/main/kotlin/org/pkl/doc/DocGenerator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ package org.pkl.doc
 
 import java.io.IOException
 import java.io.OutputStream
-import java.lang.reflect.InvocationTargetException
 import java.net.URI
 import java.nio.file.Files
 import java.nio.file.Path
@@ -122,8 +121,7 @@ class DocGenerator(
         } catch (e: Throwable) {
           when (e) {
             is NoSuchMethodException,
-            is IllegalAccessException,
+            is IllegalAccessException ->
-            is InvocationTargetException ->
               return Executors.newFixedThreadPool(
                 64.coerceAtLeast(Runtime.getRuntime().availableProcessors())
               )
@@ -289,9 +287,8 @@ internal class DocPackage(val docPackageInfo: DocPackageInfo, val modules: List<
   }
 
   val docModules: List<DocModule> by lazy {
-    val regularModules = modules.filter { mod ->
+    val regularModules =
-      !mod.annotations.any { it.classInfo == PClassInfo.DocExample }
+      modules.filter { mod -> !mod.annotations.any { it.classInfo == PClassInfo.DocExample } }
-    }
     regularModules.map { mod ->
       DocModule(
         this,

pkl-doc/src/main/kotlin/org/pkl/doc/PageGenerator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ internal abstract class PageGenerator<out S>(
   consoleOut: OutputStream,
 ) : AbstractGenerator(consoleOut) where S : PageScope {
   companion object {
-    private val json = Json
+    private val json = Json {}
   }
 
   private val markdownInlineParserFactory = MarkdownParserFactory(pageScope)
@@ -181,7 +181,7 @@ internal abstract class PageGenerator<out S>(
             } else {
               "Click or press 'S' to search this package"
             }
-          autoComplete = "off"
+          autoComplete = false
           if (packageName != null) {
             require(packageVersion != null)
             attributes["data-package-name"] = packageName

pkl-doc/src/main/kotlin/org/pkl/doc/SearchIndexGenerator.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ internal class SearchIndexGenerator(private val outputDir: Path, consoleOut: Out
     }
   }
 
-  internal object KindSerializer : KSerializer<Kind> {
+  private object KindSerializer : KSerializer<Kind> {
     override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("Kind", PrimitiveKind.INT)
 
     override fun serialize(encoder: Encoder, value: Kind) {