Bump com.squareup:kotlinpoet from 1.6.0 to 2.3.0

Bumps [com.squareup:kotlinpoet](https://github.com/square/kotlinpoet) from 1.6.0 to 2.3.0. - [Release notes](https://github.com/square/kotlinpoet/releases) - [Changelog](https://github.com/square/kotlinpoet/blob/main/docs/changelog.md) - [Commits](https://github.com/square/kotlinpoet/compare/1.6.0...2.3.0) --- updated-dependencies: - dependency-name: com.squareup:kotlinpoet dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
SPICE-0028: Add support for multi-line string line continuations (#1507 )
2026-05-25 16:19:20 +02:00 · 2026-04-23 15:16:03 +00:00 · 2026-04-21 10:29:52 -07:00 · 2026-04-20 22:28:57 -07:00 · 2026-04-20 22:02:13 -07:00 · 2026-04-20 11:30:30 -07:00
321 changed files with 9780 additions and 9869 deletions
@@ -2,9 +2,9 @@ amends "pkl:Project"

 dependencies {
  ["pkl.impl.ghactions"] {
-    uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.5.0"
+    uri = "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.6.0"
  }
  ["gha"] {
-    uri = "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.2.0"
+    uri = "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.4.0"
  }
 }
@@ -3,16 +3,16 @@
  "resolvedDependencies": {
    "package://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1": {
      "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.3.1",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.actions@1.4.0",
      "checksums": {
-        "sha256": "fd515da685ea126678c3ec684e84a4f992d43481cc1d75cb866cd55775f675f9"
+        "sha256": "e0b9a9f71071d6101e9d764c069b2ec4a597d5315cb6e4c265b3f0d90c2b482c"
      }
    },
    "package://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1": {
      "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.5.0",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-project-commons/pkl.impl.ghactions@1.6.0",
      "checksums": {
-        "sha256": "2c1e0d9efcd65b3c3207bf535c325ebc0ec2ab169187b324c4bb70821cac0e51"
+        "sha256": "fbc3c456ea468a0fe6baa9b3d30167259ac04e721a41a10fe82d2970026f0b1d"
      }
    },
    "package://pkg.pkl-lang.org/pkl-pantry/pkl.experimental.deepToTyped@1": {
@@ -24,16 +24,16 @@
    },
    "package://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1": {
      "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1.0.3",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/pkl.github.dependabotManagedActions@1.1.0",
      "checksums": {
-        "sha256": "d368900942efb88ed51a98f9614748b06c74ba43423f045fcd6dedb5dbdc0bea"
+        "sha256": "025fac778f2c5f75c8229fa4ec0f49ebdb99a61affe9aae489fefd8fccd92faa"
      }
    },
    "package://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1": {
      "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.0.0",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-pantry/com.github.dependabot@1.0.1",
      "checksums": {
-        "sha256": "02ef6f25bfca5b1d095db73ea15de79d2d2c6832ebcab61e6aba90554382abcb"
+        "sha256": "0a4fe9b0983716ec49fb060b9e5e83f8c365eb899d517123b43134416a9574b6"
      }
    }
  }
@@ -0,0 +1,67 @@
+amends "@gha/Workflow.pkl"
+
+import "@gha/catalog.pkl"
+
+on {
+  push {
+    branches {
+      "main"
+    }
+  }
+  pull_request {}
+  schedule {
+    // Run at 01:38 on Saturday
+    new { cron = "38 1 * * 6" }
+  }
+}
+
+local class CodeQLScan {
+  language: String
+
+  `build-mode`: String
+}
+
+local scans: Listing<CodeQLScan> = new {
+  new {
+    language = "actions"
+    `build-mode` = "none"
+  }
+  new {
+    language = "java-kotlin"
+    `build-mode` = "autobuild"
+  }
+  new {
+    language = "javascript-typescript"
+    `build-mode` = "none"
+  }
+}
+
+jobs {
+  for (scan in scans) {
+    ["analyze-\(scan.language)"] {
+      name = "Analyze (\(scan.language))"
+      `runs-on` = "ubuntu-latest"
+      permissions {
+        `security-events` = "write"
+      }
+      steps {
+        catalog.`actions/checkout@v6`
+        new {
+          name = "Initialize CodeQL"
+          uses = "github/codeql-action/init@v4"
+          with {
+            ["languages"] = scan.language
+            ["build-mode"] = scan.`build-mode`
+          }
+        }
+        new {
+          name = "Perform CodeQL Analysis"
+          uses = "github/codeql-action/analyze@v4"
+          with {
+            ["category"] = "/language:\(scan.language)"
+          }
+        }
+      }
+    }
+  }
+}
@@ -1,6 +1,14 @@
 version: 2
 updates:
+- package-ecosystem: gradle
+  cooldown:
+    default-days: 7
+  directory: /
+  schedule:
+    interval: weekly
 - package-ecosystem: github-actions
+  cooldown:
+    default-days: 7
  directory: /
  ignore:
  - dependency-name: '*'
@@ -9,6 +9,7 @@ import "jobs/GithubRelease.pkl"
 import "jobs/GradleJob.pkl"
 import "jobs/PklJob.pkl"
 import "jobs/SimpleGradleJob.pkl"
+import "codeql.pkl"

 triggerDocsBuild = "both"

@@ -22,6 +23,8 @@ testReports {
  excludeJobs {
    "bench"
    "github-release"
+    "dependency-submission"
+    "dependency-review"
    Regex("deploy-.*")
  }
 }
@@ -40,11 +43,15 @@ local gradleCheckWindows = (baseGradleCheck) {
  os = "windows"
 }

-local typealias PklJobs = Mapping<String, PklJob>
+local typealias PklJobs = Mapping<String, PklJob | *Workflow.Job>

 local toWorkflowJobs: (PklJobs) -> Workflow.Jobs = (it) -> new Workflow.Jobs {
  for (k, v in it) {
-    [k] = v.job
+    when (v is PklJob) {
+      [k] = v.job
+    } else {
+      [k] = v
+    }
  }
 }

@@ -173,6 +180,28 @@ main {
      ) {
        needs = buildAndTestJobs.keys.toListing()
      }
+      ["dependency-submission"] {
+        `runs-on` = "ubuntu-latest"
+        permissions {
+          contents = "write"
+        }
+        steps {
+          module.catalog.`actions/checkout@v6`
+          (module.catalog.`actions/setup-java@v5`) {
+            with {
+              `java-version` = "25"
+              distribution = "temurin"
+            }
+          }
+          (module.catalog.`gradle/actions/dependency-submission@v6`) {
+            with {
+              // language=regexp
+              `dependency-graph-include-configurations` =
+                ".*[rR]untimeClasspath|.*[cC]ompileClasspath"
+            }
+          }
+        }
+      }
    } |> toWorkflowJobs
 }

@@ -196,3 +225,23 @@ release {
      }
    } |> toWorkflowJobs
 }
+
+dependabot {
+  updates {
+    new {
+      `package-ecosystem` = "gradle"
+      schedule {
+        interval = "weekly"
+      }
+      cooldown {
+        `default-days` = 7
+      }
+      directory = "/"
+    }
+  }
+}
+
+workflows {
+  // add codeql workflow to set of workflows
+  ["workflows/codeql.yml"] = codeql
+}
@@ -23,7 +23,8 @@ preSteps {
  when (os == "linux" && !musl) {
    new {
      name = "Install deps"
-      run = "dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en"
+      run =
+        "dnf install -y git binutils gcc glibc-devel zlib-devel libstdc++-static glibc-langpack-en"
    }
  }
 }
@@ -81,7 +81,7 @@ fixed job {
    }
    (catalog.`actions/setup-java@v5`) {
      with {
-        `java-version` = "21"
+        `java-version` = "25"
        distribution = "temurin"
        architecture =
          if (arch == "amd64")
@@ -30,5 +30,11 @@ jobs:
      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5
    - name: dawidd6/action-download-artifact@v11
      uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
+    - name: github/codeql-action/analyze@v4
+      uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
+    - name: github/codeql-action/init@v4
+      uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
+    - name: gradle/actions/dependency-submission@v6
+      uses: gradle/actions/dependency-submission@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
    - name: gradle/actions/setup-gradle@v5
      uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -25,7 +25,7 @@ jobs:
        fetch-depth: 0
    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
      with:
-        java-version: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        distribution: temurin
        architecture: x64
    - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -0,0 +1,63 @@
+# Generated from Workflow.pkl. DO NOT EDIT.
+'on':
+  pull_request: {}
+  push:
+    branches:
+    - main
+  schedule:
+  - cron: 38 1 * * 6
+jobs:
+  analyze-actions:
+    name: Analyze (actions)
+    permissions:
+      security-events: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      with:
+        persist-credentials: false
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
+      with:
+        languages: actions
+        build-mode: none
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
+      with:
+        category: /language:actions
+  analyze-java-kotlin:
+    name: Analyze (java-kotlin)
+    permissions:
+      security-events: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      with:
+        persist-credentials: false
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
+      with:
+        languages: java-kotlin
+        build-mode: autobuild
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
+      with:
+        category: /language:java-kotlin
+  analyze-javascript-typescript:
+    name: Analyze (javascript-typescript)
+    permissions:
+      security-events: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      with:
+        persist-credentials: false
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
+      with:
+        languages: javascript-typescript
+        build-mode: none
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4
+      with:
+        category: /language:javascript-typescript
@@ -23,7 +23,7 @@ jobs:
        fetch-depth: 0
    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
      with:
-        java-version: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        distribution: temurin
        architecture: x64
    - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -831,6 +831,21 @@ jobs:
        ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEPASSWORD }}
        ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEUSERNAME }}
      run: ./gradlew --info --stacktrace --no-daemon -DpklMultiJdkTesting=true --no-parallel publishToSonatype
+  dependency-submission:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      with:
+        persist-credentials: false
+    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+      with:
+        java-version: '25'
+        distribution: temurin
+    - uses: gradle/actions/dependency-submission@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
+      with:
+        dependency-graph-include-configurations: .*[rR]untimeClasspath|.*[cC]ompileClasspath
  publish-test-results:
    if: '!cancelled()'
    needs:
@@ -891,6 +906,7 @@ jobs:
    - pkl-doc-alpine-linux-amd64-snapshot
    - pkl-doc-windows-amd64-snapshot
    - deploy-snapshot
+    - dependency-submission
    - publish-test-results
    runs-on: ubuntu-latest
    steps:
@@ -19,7 +19,7 @@ jobs:
        fetch-depth: 0
    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
      with:
-        java-version: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        distribution: temurin
        architecture: x64
    - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -23,7 +23,7 @@ jobs:
        fetch-depth: 0
    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
      with:
-        java-version: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        distribution: temurin
        architecture: x64
    - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -23,7 +23,7 @@ jobs:
        fetch-depth: 0
    - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
      with:
-        java-version: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        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: '21'
+        java-version: '25'
        distribution: temurin
        architecture: x64
    - uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
@@ -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 to run Gradle commands with `gw` (instead of `./gradlew`) from any subdirectory.
+_gng_ enables you 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_ use specific JDK versions in certain subdirectories. _Pkl_ comes with a `.java-version` file specifying JDK 21. +
+_jenv_ uses 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]
@@ -74,9 +74,7 @@ gw wrapper --gradle-version [version] --gradle-distribution-sha256-sum [sha]

 . (optional) Update _gradle/libs.version.toml_
 based on version information from https://search.maven.org, https://plugins.gradle.org, and GitHub repos
-. Run `gw updateDependencyLocks`
 . Validate changes with `gw build buildNative`
-. Review and commit the updated dependency lock files

 == Code Generation

@@ -92,14 +90,9 @@ Example: `./gradlew test -Djvmdebug=true`

 == Snippet Test Plugin

-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.
+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].

-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`.
+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.

 == Resources

@@ -110,12 +103,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]
-* http://mail.openjdk.java.net/pipermail/graal-dev/[Mailing List]
+* https://mail.openjdk.org/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://wiki.openjdk.java.net/display/Graal/Truffle+FAQ+and+Guidelines[Truffle FAQ]
+* https://www.graalvm.org/latest/graalvm-as-a-platform/language-implementation-framework/[Truffle Language Implementation Framework]

 === Other Config Languages

@@ -1,4 +1,4 @@
-Copyright © 2024-2025 Apple Inc. and the Pkl project authors
+Copyright © 2024-2026 Apple Inc. and the Pkl project authors


 Portions of this software were originally based on 'SnakeYAML' developed by Andrey Somov.
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 * limitations under the License.
 */
 plugins {
-  pklAllProjects
-  pklJavaLibrary
+  id("pklAllProjects")
+  id("pklJavaLibrary")
  id("me.champeau.jmh")
 }

@@ -1,69 +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.
-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.17.7=jmh,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=jmhCompileClasspath,jmhImplementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
-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.0=graal
-org.graalvm.polyglot:polyglot:25.0.0=jmh,jmhRuntimeClasspath,truffle
-org.graalvm.sdk:collections:25.0.0=graal,jmh,jmhRuntimeClasspath,truffle
-org.graalvm.sdk:graal-sdk:25.0.0=jmh,jmhRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.0=jmh,jmhRuntimeClasspath,truffle
-org.graalvm.sdk:word:25.0.0=graal,jmh,jmhRuntimeClasspath,truffle
-org.graalvm.truffle:truffle-api:25.0.0=jmh,jmhRuntimeClasspath,truffle
-org.graalvm.truffle:truffle-compiler:25.0.0=graal
-org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathJmh,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,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:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,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.junit.jupiter:junit-jupiter-api:5.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:5.14.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.8=jmh,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-generator-asm:1.37=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-generator-bytecode:1.37=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.openjdk.jmh:jmh-generator-reflection:1.37=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.organicdesign:Paguro:3.10.3=jmh,jmhRuntimeClasspath
-org.ow2.asm:asm:9.0=jmh,jmhCompileClasspath,jmhImplementationDependenciesMetadata,jmhRuntimeClasspath
-org.snakeyaml:snakeyaml-engine:2.10=jmh,jmhRuntimeClasspath
-empty=annotationProcessor,apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,jmhAnnotationProcessor,jmhApiDependenciesMetadata,jmhCompileOnlyDependenciesMetadata,jmhIntransitiveDependenciesMetadata,jmhKotlinScriptDefExtensions,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,runtimeClasspath,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,11 +20,16 @@ plugins {
  `jvm-toolchains`
 }

-// Keep this in sync with the constants in `BuildInfo.kt` (those are not addressable here).
-val toolchainVersion = 21
+/**
+ * To avoid the provisioning of multiple JDKs and other build issues, keep this value in sync with
+ * 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)
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 */
@file:Suppress("UnstableApiUsage")

-rootProject.name = "buildSrc"
+rootProject.name = "build-logic"

 pluginManagement {
  repositories {
@@ -24,7 +24,7 @@ pluginManagement {
  }
 }

-plugins { id("org.gradle.toolchains.foojay-resolver-convention") }
+plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" }

 // makes ~/.gradle/init.gradle unnecessary and ~/.gradle/gradle.properties optional
 dependencyResolutionManagement {
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -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,10 +40,13 @@ import org.gradle.process.CommandLineArgumentProvider
 const val PKL_JVM_TARGET_DEFAULT_MAXIMUM = 17

 /**
- * 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.
+ * The Pkl build requires JDK 25+; otherwise, NullAway will not work correctly.
+ *
+ * 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
+ * `build-logic/build.gradle.kts` and `gradle-daemon-jvm.properties`.
 */
-const val PKL_JDK_VERSION_MIN = 21
+const val PKL_JDK_VERSION_MIN = 25

 /**
 * The JDK minimum is set to match the bytecode minimum, to guarantee that fat JARs work against the
@@ -52,14 +55,15 @@ const val PKL_JDK_VERSION_MIN = 21
 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 stable releases
- * are issued. At the time of this writing, JDK 23 is the latest available release.
+ * Maximum JDK version which Pkl is tested with; this should be bumped when new JDK releases are
+ * issued.
 */
-const val PKL_TEST_JDK_MAXIMUM = 23
+const val PKL_TEST_JDK_MAXIMUM = 26

 /**
- * Test the full suite of JDKs between [PKL_TEST_JDK_MINIMUM] and [PKL_TEST_JDK_MAXIMUM]; if this is
- * set to `false` (or overridden on the command line), only LTS releases are tested by default.
+ * If `true`, all JDK releases between [PKL_TEST_JDK_MINIMUM] and [PKL_TEST_JDK_MAXIMUM] are tested.
+ * If `false`, only LTS releases within that range are tested. To override, pass
+ * `-DpklTestAllJdks=true` on the Gradle command line.
 */
 const val PKL_TEST_ALL_JDKS = false

@@ -197,8 +201,8 @@ open class BuildInfo(private val project: Project) {
  }

  val testJdkVendors: Sequence<JvmVendorSpec> by lazy {
-    // By default, only OpenJDK is tested during multi-JDK testing. Flip `-DpklTestAllVendors=true`
-    // to additionally test against a suite of JDK vendors, including Azul, Oracle, and GraalVM.
+    // By default, only Adoptium is tested during multi-JDK testing. Flip `-DpklTestAllVendors=true`
+    // to additionally test against GraalVM and Oracle.
    when (System.getProperty("pklTestAllVendors")?.toBoolean()) {
      true -> sequenceOf(JvmVendorSpec.ADOPTIUM, JvmVendorSpec.GRAAL_VM, JvmVendorSpec.ORACLE)
      else -> sequenceOf(JvmVendorSpec.ADOPTIUM)
@@ -278,8 +282,9 @@ 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)
@@ -305,8 +310,8 @@ open class BuildInfo(private val project: Project) {
            // multiply out by jdk vendor
            testJdkVendors.map { vendor -> (targetVersion to vendor) }
          }
-          .map { (jdkTarget, vendor) ->
-            if (jdkToolchainVersion == jdkTarget)
+          .mapNotNull { (jdkTarget, vendor) ->
+            if (jdkToolchainVersion == jdkTarget) {
              tasks.register(namer(jdkTarget, vendor)) {
                // alias to `test`
                dependsOn(templateTask)
@@ -314,20 +319,24 @@ open class BuildInfo(private val project: Project) {
                description =
                  "Alias for regular '${baseNameProvider()}' task, on JDK ${jdkTarget.asInt()}"
              }
-            else
-              tasks.register(namer(jdkTarget, vendor.takeIf { isMultiVendor }), Test::class) {
-                enabled = jdkTarget.isEnabled
-                group = Category.VERIFICATION
-                description = "Run tests against JDK ${jdkTarget.asInt()}"
-                applyConfig(jdkTarget to toolchains.launcherFor { languageVersion = jdkTarget })
-                // fix: on jdk17, we must force the polyglot module on to the modulepath
-                if (jdkTarget.asInt() == 17)
-                  jvmArgumentProviders.add(
-                    CommandLineArgumentProvider {
-                      buildList { listOf("--add-modules=org.graalvm.polyglot") }
-                    }
-                  )
-              }
+            } else {
+              // Always register and enable the task so it can be run explicitly,
+              // but only return it if it should be included in "check".
+              val task =
+                tasks.register(namer(jdkTarget, vendor.takeIf { isMultiVendor }), Test::class) {
+                  group = Category.VERIFICATION
+                  description = "Run tests against JDK ${jdkTarget.asInt()}"
+                  applyConfig(jdkTarget to toolchains.launcherFor { languageVersion = jdkTarget })
+                  // fix: on jdk17, we must force the polyglot module on to the modulepath
+                  if (jdkTarget.asInt() == 17)
+                    jvmArgumentProviders.add(
+                      CommandLineArgumentProvider {
+                        buildList { listOf("--add-modules=org.graalvm.polyglot") }
+                      }
+                    )
+                }
+              task.takeIf { jdkTarget.isEnabled }
+            }
          }
          .toList()
      }
@@ -368,7 +377,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 === project.rootProject) {
+    if (project.path == project.rootProject.path) {
      val process =
        ProcessBuilder()
          .command("git", "rev-parse", "--short", "HEAD")
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@ 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
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * 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.
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ 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. */
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -57,7 +57,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()
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * 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.
@@ -55,13 +55,12 @@ abstract class NativeImageBuild : DefaultTask() {

  @get:Inject protected abstract val execOperations: ExecOperations

-  private val graalVm: Provider<BuildInfo.GraalVm> =
-    arch.map { a ->
-      when (a) {
-        Architecture.AMD64 -> buildInfo.graalVmAmd64
-        Architecture.AARCH64 -> buildInfo.graalVmAarch64
-      }
+  private val graalVm: Provider<BuildInfo.GraalVm> = arch.map { a ->
+    when (a) {
+      Architecture.AMD64 -> buildInfo.graalVmAmd64
+      Architecture.AARCH64 -> buildInfo.graalVmAarch64
    }
+  }

  private val buildInfo: BuildInfo = project.extensions.getByType(BuildInfo::class.java)

@@ -102,6 +101,7 @@ abstract class NativeImageBuild : DefaultTask() {
  }

  @TaskAction
+  @Suppress("unused")
  protected fun run() {
    execOperations.exec {
      val exclusions =
@@ -118,6 +118,8 @@ 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/.*")
@@ -148,10 +150,9 @@ abstract class NativeImageBuild : DefaultTask() {
        }
        // native-image rejects non-existing class path entries -> filter
        add("--class-path")
-        val pathInput =
-          classpath.filter {
-            it.exists() && !exclusions.any { exclude -> it.name.contains(exclude) }
-          }
+        val pathInput = 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 =
@@ -42,7 +42,8 @@ class PklFormatterFunc(@Transient private val configuration: Configuration) :

  private val classLoader by lazy {
    val urls = configuration.files.map { it.toURI().toURL() }
-    URLClassLoader(urls.toTypedArray())
+    // Use the platform classloader as parent to isolate from Gradle's classloader
+    URLClassLoader(urls.toTypedArray(), ClassLoader.getPlatformClassLoader())
  }

  private val formatterClass by lazy { classLoader.loadClass("org.pkl.formatter.Formatter") }
@@ -63,59 +63,58 @@ fun Project.configurePklPomMetadata() {

 /** Configures POM validation task to check for unresolved versions and snapshots in releases. */
 fun Project.configurePomValidation() {
-  val validatePom by
-    tasks.registering {
-      if (tasks.findByName("generatePomFileForLibraryPublication") == null) {
-        return@registering
-      }
-      val generatePomFileForLibraryPublication by tasks.existing(GenerateMavenPom::class)
-      val outputFile =
-        layout.buildDirectory.file("validatePom") // dummy output to satisfy up-to-date check
+  val validatePom by tasks.registering {
+    if (tasks.findByName("generatePomFileForLibraryPublication") == null) {
+      return@registering
+    }
+    val generatePomFileForLibraryPublication by tasks.existing(GenerateMavenPom::class)
+    val outputFile =
+      layout.buildDirectory.file("validatePom") // dummy output to satisfy up-to-date check

-      dependsOn(generatePomFileForLibraryPublication)
-      inputs.file(generatePomFileForLibraryPublication.get().destination)
-      outputs.file(outputFile)
+    dependsOn(generatePomFileForLibraryPublication)
+    inputs.file(generatePomFileForLibraryPublication.get().destination)
+    outputs.file(outputFile)

-      doLast {
-        outputFile.get().asFile.delete()
+    doLast {
+      outputFile.get().asFile.delete()

-        val pomFile = generatePomFileForLibraryPublication.get().destination
-        assert(pomFile.exists())
+      val pomFile = generatePomFileForLibraryPublication.get().destination
+      assert(pomFile.exists())

-        val text = pomFile.readText()
+      val text = pomFile.readText()

-        run {
-          val unresolvedVersion = Regex("<version>.*[+,()\\[\\]].*</version>")
-          val matches = unresolvedVersion.findAll(text).toList()
-          if (matches.isNotEmpty()) {
-            throw org.gradle.api.GradleException(
-              """
+      run {
+        val unresolvedVersion = Regex("<version>.*[+,()\\[\\]].*</version>")
+        val matches = unresolvedVersion.findAll(text).toList()
+        if (matches.isNotEmpty()) {
+          throw org.gradle.api.GradleException(
+            """
        Found unresolved version selector(s) in generated POM:
        ${matches.joinToString("\n") { it.groupValues[0] }}
      """
-                .trimIndent()
-            )
-          }
+              .trimIndent()
+          )
        }
+      }

-        val buildInfo = project.extensions.getByType<BuildInfo>()
-        if (buildInfo.isReleaseBuild) {
-          val snapshotVersion = Regex("<version>.*-SNAPSHOT</version>")
-          val matches = snapshotVersion.findAll(text).toList()
-          if (matches.isNotEmpty()) {
-            throw org.gradle.api.GradleException(
-              """
+      val buildInfo = project.extensions.getByType<BuildInfo>()
+      if (buildInfo.isReleaseBuild) {
+        val snapshotVersion = Regex("<version>.*-SNAPSHOT</version>")
+        val matches = snapshotVersion.findAll(text).toList()
+        if (matches.isNotEmpty()) {
+          throw org.gradle.api.GradleException(
+            """
        Found snapshot version(s) in generated POM of Pkl release version:
        ${matches.joinToString("\n") { it.groupValues[0] }}
      """
-                .trimIndent()
-            )
-          }
+              .trimIndent()
+          )
        }
-
-        outputFile.get().asFile.writeText("OK")
      }
+
+      outputFile.get().asFile.writeText("OK")
    }
+  }

  tasks.named("publish") { dependsOn(validatePom) }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -0,0 +1,77 @@
+/*
+ * 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
+  }
+}
@@ -15,19 +15,19 @@
 */
 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") }

 val buildInfo = extensions.create<BuildInfo>("buildInfo", project)

-dependencyLocking { lockAllConfigurations() }
-
 configurations {
  val rejectedVersionSuffix = Regex("-alpha|-beta|-eap|-m|-rc|-snapshot", RegexOption.IGNORE_CASE)
  configureEach {
    resolutionStrategy {
+      // forbid dependencies whose pom.xml's include version ranges, because this will lead to
+      // unreproducible builds.
+
+      failOnDynamicVersions()
      componentSelection {
        all {
          if (rejectedVersionSuffix.containsMatchIn(candidate.version)) {
@@ -42,25 +42,9 @@ configurations {
  }
 }

-configurations.all {
-  resolutionStrategy.eachDependency {
-    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")
-  }
+tasks.withType<JavaCompile>().configureEach {
+  javaCompiler = buildInfo.javaCompiler
+  options.release = buildInfo.jvmTarget
 }

 plugins.withType(IdeaPlugin::class).configureEach {
@@ -95,13 +79,6 @@ plugins.withType(MavenPublishPlugin::class).configureEach {
  }
 }

-// settings.gradle.kts sets `--write-locks`
-// if Gradle command line contains this task name
-val updateDependencyLocks by
-  tasks.registering {
-    doLast { configurations.filter { it.isCanBeResolved }.forEach { it.resolve() } }
-  }
-
 val allDependencies by tasks.registering(DependencyReportTask::class)

 tasks.withType(Test::class).configureEach {
@@ -110,7 +87,6 @@ tasks.withType(Test::class).configureEach {
  }
  debugOptions {
    enabled = System.getProperty("jvmdebug")?.toBoolean() ?: false
-    @Suppress("UnstableApiUsage")
    host = "*"
    port = 5005
    suspend = true
@@ -121,7 +97,6 @@ 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,7 +108,7 @@ tasks.withType(JavaExec::class).configureEach {
 private val libs = the<LibrariesForLibs>()

 private val licenseHeaderFile by lazy {
-  rootProject.file("buildSrc/src/main/resources/license-header.star-block.txt")
+  rootProject.file("build-logic/src/main/resources/license-header.star-block.txt")
 }

 private fun KotlinGradleExtension.configureFormatter() {
@@ -154,22 +129,28 @@ val ratchetBranchName =
 spotless {
  ratchetFrom = "$originalRemoteName/$ratchetBranchName"

-  // 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) {
+  val revertYearOnlyChangesStep =
+    RevertYearOnlyChangesStep(rootProject.rootDir, ratchetFrom!!).create()
+
+  // When building root project, format build-logic files too.
+  // We need this because build-logic is not a subproject of the root project, so a top-level
+  // `spotlessApply` will not trigger `build-logic:spotlessApply`.
+  if (project.path == rootProject.path) {
    kotlinGradle {
      configureFormatter()
-      target("*.kts", "buildSrc/*.kts", "buildSrc/src/*/kotlin/**/*.kts")
+      addStep(revertYearOnlyChangesStep)
+      target("*.kts", "build-logic/*.kts", "build-logic/src/*/kotlin/**/*.kts")
    }
    kotlin {
      ktfmt(libs.versions.ktfmt.get()).googleStyle()
-      target("buildSrc/src/*/kotlin/**/*.kt")
+      target("build-logic/src/*/kotlin/**/*.kt")
      licenseHeaderFile(licenseHeaderFile)
+      addStep(revertYearOnlyChangesStep)
    }
  } else {
    kotlinGradle {
      configureFormatter()
+      addStep(revertYearOnlyChangesStep)
      target("*.kts")
    }
  }
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ for ((key, value) in relocations) {
  }
 }

-val nonRelocations = listOf("com/oracle/truffle/", "org/graalvm/")
+val nonRelocations = listOf("com/oracle/truffle/", "org/graalvm/", "org/jspecify")

 tasks.shadowJar {
  inputs.property("relocations", relocations)
@@ -148,37 +148,36 @@ val testFatJar by

 tasks.check { dependsOn(testFatJar) }

-val validateFatJar by
-  tasks.registering {
-    val outputFile = layout.buildDirectory.file("validateFatJar/result.txt")
-    inputs.files(tasks.shadowJar)
-    inputs.property("nonRelocations", nonRelocations)
-    outputs.file(outputFile)
+val validateFatJar by tasks.registering {
+  val outputFile = layout.buildDirectory.file("validateFatJar/result.txt")
+  inputs.files(tasks.shadowJar)
+  inputs.property("nonRelocations", nonRelocations)
+  outputs.file(outputFile)

-    doLast {
-      val unshadowedFiles = mutableListOf<String>()
-      zipTree(tasks.shadowJar.get().outputs.files.singleFile).visit {
-        val fileDetails = this
-        val path = fileDetails.relativePath.pathString
-        if (
-          !(fileDetails.isDirectory ||
-            path.startsWith("org/pkl/") ||
-            path.startsWith("META-INF/") ||
-            nonRelocations.any { path.startsWith(it) })
-        ) {
-          // don't throw exception inside `visit`
-          // as this gives a misleading "Could not expand ZIP" error message
-          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"))
+  doLast {
+    val unshadowedFiles = mutableListOf<String>()
+    zipTree(tasks.shadowJar.get().outputs.files.singleFile).visit {
+      val fileDetails = this
+      val path = fileDetails.relativePath.pathString
+      if (
+        !(fileDetails.isDirectory ||
+          path.startsWith("org/pkl/") ||
+          path.startsWith("META-INF/") ||
+          nonRelocations.any { path.startsWith(it) })
+      ) {
+        // don't throw exception inside `visit`
+        // as this gives a misleading "Could not expand ZIP" error message
+        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"))
+    }
  }
+}

 tasks.check { dependsOn(validateFatJar) }

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@ 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") {
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -23,25 +23,27 @@ val validatorConfiguration: Configuration =
  configurations.create("validator") {
    resolutionStrategy.eachDependency {
      if (requested.group == "log4j" && requested.name == "log4j") {
-        @Suppress("UnstableApiUsage") useTarget(buildInfo.libs.findLibrary("log4j12Api").get())
+        useTarget(buildInfo.libs.findLibrary("log4j12Api").get())
        because("mitigate critical security vulnerabilities")
      }
    }
  }

 dependencies {
-  @Suppress("UnstableApiUsage")
  validatorConfiguration(buildInfo.libs.findLibrary("nuValidator").get()) {
-    // we only want jetty-util and jetty-util-ajax (with the right version)
-    // couldn't find a more robust way to express this
+    // remove unnecessary dependencies
+    // (some of the requested versions don't even exist on Maven Central)
+    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 = "commons-fileupload")
+    exclude(group = "org.apache.commons", module = "commons-fileupload2-core")
+    exclude(group = "org.apache.commons", module = "commons-fileupload2-jakarta-servlet5")
  }
 }

@@ -0,0 +1,46 @@
+/*
+ * 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
+  }
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * 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.
@@ -47,20 +47,19 @@ fun Task.setupTestStartJavaExecutable(launcher: Provider<JavaLauncher>? = null)
  val outputFile = layout.buildDirectory.file("testStartJavaExecutable/$name")
  outputs.file(outputFile)

-  val execOutput =
-    providers.exec {
-      val executablePath = javaExecutable.get().outputs.files.singleFile
-      if (launcher?.isPresent == true) {
-        commandLine(
-          launcher.get().executablePath.asFile.absolutePath,
-          "-jar",
-          executablePath.absolutePath,
-          "--version",
-        )
-      } else {
-        commandLine(executablePath.absolutePath, "--version")
-      }
+  val execOutput = providers.exec {
+    val executablePath = javaExecutable.get().outputs.files.singleFile
+    if (launcher?.isPresent == true) {
+      commandLine(
+        launcher.get().executablePath.asFile.absolutePath,
+        "-jar",
+        executablePath.absolutePath,
+        "--version",
+      )
+    } else {
+      commandLine(executablePath.absolutePath, "--version")
    }
+  }

  doLast {
    val outputText = execOutput.standardOutput.asText.get()
@@ -72,7 +71,7 @@ fun Task.setupTestStartJavaExecutable(launcher: Provider<JavaLauncher>? = null)
    outputFile.get().asFile.toPath().apply {
      try {
        parent.createDirectories()
-      } catch (ignored: java.nio.file.FileAlreadyExistsException) {}
+      } catch (_: java.nio.file.FileAlreadyExistsException) {}
      writeText("OK")
    }
  }
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -50,20 +50,18 @@ 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"))
+    licenseHeaderFile(
+      rootProject.file("build-logic/src/main/resources/license-header.star-block.txt")
+    )
  }
 }

-tasks.compileKotlin { enabled = false }
-
 tasks.jar {
  manifest {
    attributes +=
@@ -81,19 +79,6 @@ 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
@@ -103,7 +88,6 @@ val truffleJavacArgs =

 tasks.compileJava {
  javaCompiler = info.javaCompiler
-  dependsOn(workAroundKotlinGradlePluginBug)
  options.compilerArgs.addAll(truffleJavacArgs + info.jpmsAddModulesFlags)
 }

@@ -0,0 +1,115 @@
+/*
+ * 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.api.GradleException
+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>()
+
+kotlin {
+  jvmToolchain {
+    languageVersion.set(buildInfo.jdkToolchainVersion)
+    vendor.set(buildInfo.jdkVendor)
+  }
+  compilerOptions {
+    val kotlinTarget = KotlinVersion.fromVersion(libs.versions.kotlinTarget.get())
+    languageVersion.set(kotlinTarget)
+    apiVersion.set(kotlinTarget)
+    jvmTarget = JvmTarget.fromTarget(buildInfo.jvmTarget.toString())
+    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("build-logic/src/main/resources/license-header.star-block.txt")
+    )
+  }
+}
+
+/**
+ * Kotlin modules to guard: fail the build if any dependency resolves to a version higher than
+ * `libs.versions.kotlinTarget`. This includes versions introduced via direct declarations, BOMs,
+ * version catalogs, or constraints.
+ */
+val guardedKotlinModules = setOf(libs.kotlinStdLib.get().module, libs.kotlinReflect.get().module)
+
+/**
+ * Classpath configurations where the above rule applies. Kept narrow to avoid interfering with
+ * Gradle/Kotlin plugin internal configurations.
+ */
+val guardedConfigurations =
+  setOf(
+    configurations.compileClasspath,
+    configurations.runtimeClasspath,
+    configurations.testCompileClasspath,
+    configurations.testRuntimeClasspath,
+  )
+
+guardedConfigurations.forEach { configuration ->
+  configuration.configure {
+    incoming.afterResolve {
+      resolutionResult.allComponents.forEach { component ->
+        val moduleVersion = component.moduleVersion ?: return@forEach
+        if (
+          moduleVersion.module in guardedKotlinModules &&
+            moduleVersion.version.exceedsKotlinTarget()
+        ) {
+          throw GradleException(
+            "Resolved ${moduleVersion.module}:${moduleVersion.version} on configuration $name, " +
+              "which exceeds the allowed Kotlin version ($kotlinTargetVersion)"
+          )
+        }
+      }
+    }
+  }
+}
+
+// also works for version ranges like: [2.3.0,)
+val kotlinVersionRegex = Regex("""(\d+)\.(\d+)(?:\.\d+)?""")
+val kotlinTargetVersion = libs.versions.kotlinTarget.get()
+val targetMajor = kotlinTargetVersion.substringBefore('.').toInt()
+val targetMinor = kotlinTargetVersion.substringAfter('.').toInt()
+
+fun String.exceedsKotlinTarget(): Boolean {
+  val version =
+    kotlinVersionRegex.find(this) ?: throw GradleException("Could not parse Kotlin version: $this")
+  val major = version.groupValues[1].toInt()
+  val minor = version.groupValues[2].toInt()
+  return major > targetMajor || (major == targetMajor && minor > targetMinor)
+}
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import org.gradle.accessors.dm.LibrariesForLibs
+
+plugins { id("pklJavaLibrary") }
+
+val buildInfo = project.extensions.getByType<BuildInfo>()
+
+val libs = the<LibrariesForLibs>()
+
+dependencies {
+  // Kotlin libraries typically expose stdlib types in their public APIs.
+  // Therefore, the stdlib must be available on the consumer's compile classpath,
+  // and "implementation" is not sufficient.
+  api(libs.kotlinStdLib)
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat

 plugins {
  `jvm-test-suite`
-  kotlin("jvm")
+  id("pklKotlinBase")
 }

 val buildInfo = project.extensions.getByType<BuildInfo>()
@@ -27,10 +27,11 @@ 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)
@@ -44,7 +45,7 @@ tasks.withType<Test>().configureEach {
  // enable checking of stdlib return types
  systemProperty("org.pkl.testMode", "true")

-  reports.named("html") { enabled = true }
+  reports.named("html") { required = true }

  testLogging { exceptionFormat = TestExceptionFormat.FULL }

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * 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.
@@ -37,16 +37,15 @@ val stagedLinuxAarch64Executable: Configuration by configurations.creating
 val stagedAlpineLinuxAmd64Executable: Configuration by configurations.creating
 val stagedWindowsAmd64Executable: Configuration by configurations.creating

-val nativeImageClasspath by
-  configurations.creating {
-    extendsFrom(configurations.runtimeClasspath.get())
-    // Ensure native-image version uses GraalVM C SDKs instead of Java FFI or JNA
-    // (comes from artifact `mordant-jvm-graal-ffi`).
-    exclude("com.github.ajalt.mordant", "mordant-jvm-ffm")
-    exclude("com.github.ajalt.mordant", "mordant-jvm-ffm-jvm")
-    exclude("com.github.ajalt.mordant", "mordant-jvm-jna")
-    exclude("com.github.ajalt.mordant", "mordant-jvm-jna-jvm")
-  }
+val nativeImageClasspath by configurations.creating {
+  extendsFrom(configurations.runtimeClasspath.get())
+  // Ensure native-image version uses GraalVM C SDKs instead of Java FFI or JNA
+  // (comes from artifact `mordant-jvm-graal-ffi`).
+  exclude("com.github.ajalt.mordant", "mordant-jvm-ffm")
+  exclude("com.github.ajalt.mordant", "mordant-jvm-ffm-jvm")
+  exclude("com.github.ajalt.mordant", "mordant-jvm-jna")
+  exclude("com.github.ajalt.mordant", "mordant-jvm-jna-jvm")
+}

 val libs = the<LibrariesForLibs>()

@@ -140,65 +139,63 @@ val windowsExecutableAmd64 by

 val assembleNative by tasks.existing

-val testStartNativeExecutable by
-  tasks.registering {
-    dependsOn(assembleNative)
+val testStartNativeExecutable by tasks.registering {
+  dependsOn(assembleNative)

-    // dummy file for up-to-date checking
-    val outputFile = project.layout.buildDirectory.file("testStartNativeExecutable/output.txt")
-    outputs.file(outputFile)
+  // dummy file for up-to-date checking
+  val outputFile = project.layout.buildDirectory.file("testStartNativeExecutable/output.txt")
+  outputs.file(outputFile)

-    val execOutput =
-      providers.exec { commandLine(assembleNative.get().outputs.files.singleFile, "--version") }
+  val execOutput = providers.exec {
+    commandLine(assembleNative.get().outputs.files.singleFile, "--version")
+  }

-    doLast {
-      val outputText = execOutput.standardOutput.asText.get()
-      if (!outputText.contains(buildInfo.pklVersionNonUnique)) {
-        throw GradleException(
-          "Expected version output to contain current version (${buildInfo.pklVersionNonUnique}), but got '$outputText'"
-        )
-      }
-      outputFile.get().asFile.toPath().apply {
-        try {
-          parent.createDirectories()
-        } catch (ignored: java.nio.file.FileAlreadyExistsException) {}
-        writeText("OK")
-      }
+  doLast {
+    val outputText = execOutput.standardOutput.asText.get()
+    if (!outputText.contains(buildInfo.pklVersionNonUnique)) {
+      throw GradleException(
+        "Expected version output to contain current version (${buildInfo.pklVersionNonUnique}), but got '$outputText'"
+      )
+    }
+    outputFile.get().asFile.toPath().apply {
+      try {
+        parent.createDirectories()
+      } catch (_: java.nio.file.FileAlreadyExistsException) {}
+      writeText("OK")
    }
  }
+}

 val requiredGlibcVersion: Version = Version.parse("2.17")

-val checkGlibc by
-  tasks.registering {
-    enabled = buildInfo.os.isLinux && !buildInfo.musl
-    dependsOn(assembleNative)
-    doLast {
-      val exec =
-        providers.exec {
-          commandLine("objdump", "-T", assembleNative.get().outputs.files.singleFile)
+val checkGlibc by tasks.registering {
+  enabled = buildInfo.os.isLinux && !buildInfo.musl
+  dependsOn(assembleNative)
+  doLast {
+    val exec = providers.exec {
+      commandLine("objdump", "-T", assembleNative.get().outputs.files.singleFile)
+    }
+    val output = exec.standardOutput.asText.get()
+    val minimumGlibcVersion =
+      output
+        .split("\n")
+        .mapNotNull { line ->
+          val match = Regex("GLIBC_([.0-9]*)").find(line)
+          match?.groups[1]?.let { Version.parse(it.value) }
        }
-      val output = exec.standardOutput.asText.get()
-      val minimumGlibcVersion =
-        output
-          .split("\n")
-          .mapNotNull { line ->
-            val match = Regex("GLIBC_([.0-9]*)").find(line)
-            match?.groups[1]?.let { Version.parse(it.value) }
-          }
-          .maxOrNull()
-      if (minimumGlibcVersion == null) {
-        throw GradleException(
-          "Could not determine glibc version from executable. objdump output: $output"
-        )
-      }
-      if (minimumGlibcVersion > requiredGlibcVersion) {
-        throw GradleException(
-          "Incorrect glibc version. Found: $minimumGlibcVersion, required: $requiredGlibcVersion"
-        )
-      }
+        .maxOrNull()
+    if (minimumGlibcVersion == null) {
+      throw GradleException(
+        "Could not determine glibc version from executable. objdump output: $output"
+      )
+    }
+    if (minimumGlibcVersion > requiredGlibcVersion) {
+      throw GradleException(
+        "Incorrect glibc version. Found: $minimumGlibcVersion, required: $requiredGlibcVersion"
+      )
    }
  }
+}

 // Expose underlying task's outputs
 private fun <T : Task> Task.wraps(other: TaskProvider<T>) {
@@ -0,0 +1,122 @@
+/*
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+val assembleNativeMacOsAarch64 by tasks.registering { group = "build" }
+
+val assembleNativeMacOsAmd64 by tasks.registering { group = "build" }
+
+val assembleNativeLinuxAarch64 by tasks.registering { group = "build" }
+
+val assembleNativeLinuxAmd64 by tasks.registering { group = "build" }
+
+val assembleNativeAlpineLinuxAmd64 by tasks.registering { group = "build" }
+
+val assembleNativeWindowsAmd64 by tasks.registering { group = "build" }
+
+val testNativeMacOsAarch64 by tasks.registering { group = "verification" }
+
+val testNativeMacOsAmd64 by tasks.registering { group = "verification" }
+
+val testNativeLinuxAarch64 by tasks.registering { group = "verification" }
+
+val testNativeLinuxAmd64 by tasks.registering { group = "verification" }
+
+val testNativeAlpineLinuxAmd64 by tasks.registering { group = "verification" }
+
+val testNativeWindowsAmd64 by tasks.registering { group = "verification" }
+
+val buildInfo = project.extensions.getByType<BuildInfo>()
+
+private fun <T : Task> Task.wraps(other: TaskProvider<T>) {
+  dependsOn(other)
+  outputs.files(other)
+}
+
+val assembleNative by tasks.registering {
+  group = "build"
+
+  if (!buildInfo.isCrossArchSupported && buildInfo.isCrossArch) {
+    throw GradleException("Cross-arch builds are not supported on ${buildInfo.os.name}")
+  }
+
+  when {
+    buildInfo.os.isMacOsX && buildInfo.targetArch == "aarch64" -> {
+      wraps(assembleNativeMacOsAarch64)
+    }
+    buildInfo.os.isMacOsX && buildInfo.targetArch == "amd64" -> {
+      wraps(assembleNativeMacOsAmd64)
+    }
+    buildInfo.os.isLinux && buildInfo.targetArch == "aarch64" -> {
+      wraps(assembleNativeLinuxAarch64)
+    }
+    buildInfo.os.isLinux && buildInfo.targetArch == "amd64" -> {
+      if (buildInfo.musl) wraps(assembleNativeAlpineLinuxAmd64) else wraps(assembleNativeLinuxAmd64)
+    }
+    buildInfo.os.isWindows && buildInfo.targetArch == "amd64" -> {
+      wraps(assembleNativeWindowsAmd64)
+    }
+    else -> {
+      doLast {
+        throw GradleException(
+          "Cannot build targeting ${buildInfo.os.name}/${buildInfo.targetArch} with musl=${buildInfo.musl}"
+        )
+      }
+    }
+  }
+}
+
+val testNative by tasks.registering {
+  group = "verification"
+  dependsOn(assembleNative)
+
+  if (!buildInfo.isCrossArchSupported && buildInfo.isCrossArch) {
+    throw GradleException("Cross-arch builds are not supported on ${buildInfo.os.name}")
+  }
+
+  when {
+    buildInfo.os.isMacOsX && buildInfo.targetArch == "aarch64" -> {
+      dependsOn(testNativeMacOsAarch64)
+    }
+    buildInfo.os.isMacOsX && buildInfo.targetArch == "amd64" -> {
+      dependsOn(testNativeMacOsAmd64)
+    }
+    buildInfo.os.isLinux && buildInfo.targetArch == "aarch64" -> {
+      dependsOn(testNativeLinuxAarch64)
+    }
+    buildInfo.os.isLinux && buildInfo.targetArch == "amd64" -> {
+      if (buildInfo.musl) dependsOn(testNativeAlpineLinuxAmd64) else dependsOn(testNativeLinuxAmd64)
+    }
+    buildInfo.os.isWindows && buildInfo.targetArch == "amd64" -> {
+      dependsOn(testNativeWindowsAmd64)
+    }
+    else -> {
+      doLast {
+        throw GradleException(
+          "Cannot build targeting ${buildInfo.os.name}/${buildInfo.targetArch} with musl=${buildInfo.musl}"
+        )
+      }
+    }
+  }
+}
+
+val checkNative by tasks.registering {
+  group = "verification"
+  dependsOn(testNative)
+}
+
+val buildNative by tasks.registering {
+  group = "build"
+  dependsOn(checkNative)
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * 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.
@@ -24,7 +24,7 @@ spotless {
    target("**/*.pkl")
    addStep(PklFormatterStep(pklFormatter).create())
    licenseHeaderFile(
-      rootProject.file("buildSrc/src/main/resources/license-header.line-comment.txt"),
+      rootProject.file("build-logic/src/main/resources/license-header.line-comment.txt"),
      "/// ",
    )
    // disable ratcheting for Pkl sources
@@ -19,8 +19,8 @@ import org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.PLATFORM
 import org.jetbrains.gradle.ext.ProjectSettings

 plugins {
-  pklAllProjects
-  pklGraalVm
+  id("pklAllProjects")
+  id("pklGraalVm")

  alias(libs.plugins.ideaExt)
  alias(libs.plugins.jmh) apply false
@@ -1,51 +0,0 @@
-/*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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")
-  kotlin("jvm")
-}
-
-// Build configuration.
-val buildInfo = project.extensions.getByType<BuildInfo>()
-
-// Version Catalog library symbols.
-val libs = the<LibrariesForLibs>()
-
-dependencies {
-  // At least some of our kotlin APIs contain Kotlin stdlib types
-  // that aren't compiled away by kotlinc (e.g., `kotlin.Function`).
-  // So let's be conservative and default to `api` for now.
-  // 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}")
-  }
-}
@@ -1,128 +0,0 @@
-/*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-val assembleNativeMacOsAarch64 by tasks.registering { group = "build" }
-
-val assembleNativeMacOsAmd64 by tasks.registering { group = "build" }
-
-val assembleNativeLinuxAarch64 by tasks.registering { group = "build" }
-
-val assembleNativeLinuxAmd64 by tasks.registering { group = "build" }
-
-val assembleNativeAlpineLinuxAmd64 by tasks.registering { group = "build" }
-
-val assembleNativeWindowsAmd64 by tasks.registering { group = "build" }
-
-val testNativeMacOsAarch64 by tasks.registering { group = "verification" }
-
-val testNativeMacOsAmd64 by tasks.registering { group = "verification" }
-
-val testNativeLinuxAarch64 by tasks.registering { group = "verification" }
-
-val testNativeLinuxAmd64 by tasks.registering { group = "verification" }
-
-val testNativeAlpineLinuxAmd64 by tasks.registering { group = "verification" }
-
-val testNativeWindowsAmd64 by tasks.registering { group = "verification" }
-
-val buildInfo = project.extensions.getByType<BuildInfo>()
-
-private fun <T : Task> Task.wraps(other: TaskProvider<T>) {
-  dependsOn(other)
-  outputs.files(other)
-}
-
-val assembleNative by
-  tasks.registering {
-    group = "build"
-
-    if (!buildInfo.isCrossArchSupported && buildInfo.isCrossArch) {
-      throw GradleException("Cross-arch builds are not supported on ${buildInfo.os.name}")
-    }
-
-    when {
-      buildInfo.os.isMacOsX && buildInfo.targetArch == "aarch64" -> {
-        wraps(assembleNativeMacOsAarch64)
-      }
-      buildInfo.os.isMacOsX && buildInfo.targetArch == "amd64" -> {
-        wraps(assembleNativeMacOsAmd64)
-      }
-      buildInfo.os.isLinux && buildInfo.targetArch == "aarch64" -> {
-        wraps(assembleNativeLinuxAarch64)
-      }
-      buildInfo.os.isLinux && buildInfo.targetArch == "amd64" -> {
-        if (buildInfo.musl) wraps(assembleNativeAlpineLinuxAmd64)
-        else wraps(assembleNativeLinuxAmd64)
-      }
-      buildInfo.os.isWindows && buildInfo.targetArch == "amd64" -> {
-        wraps(assembleNativeWindowsAmd64)
-      }
-      else -> {
-        doLast {
-          throw GradleException(
-            "Cannot build targeting ${buildInfo.os.name}/${buildInfo.targetArch} with musl=${buildInfo.musl}"
-          )
-        }
-      }
-    }
-  }
-
-val testNative by
-  tasks.registering {
-    group = "verification"
-    dependsOn(assembleNative)
-
-    if (!buildInfo.isCrossArchSupported && buildInfo.isCrossArch) {
-      throw GradleException("Cross-arch builds are not supported on ${buildInfo.os.name}")
-    }
-
-    when {
-      buildInfo.os.isMacOsX && buildInfo.targetArch == "aarch64" -> {
-        dependsOn(testNativeMacOsAarch64)
-      }
-      buildInfo.os.isMacOsX && buildInfo.targetArch == "amd64" -> {
-        dependsOn(testNativeMacOsAmd64)
-      }
-      buildInfo.os.isLinux && buildInfo.targetArch == "aarch64" -> {
-        dependsOn(testNativeLinuxAarch64)
-      }
-      buildInfo.os.isLinux && buildInfo.targetArch == "amd64" -> {
-        if (buildInfo.musl) dependsOn(testNativeAlpineLinuxAmd64)
-        else dependsOn(testNativeLinuxAmd64)
-      }
-      buildInfo.os.isWindows && buildInfo.targetArch == "amd64" -> {
-        dependsOn(testNativeWindowsAmd64)
-      }
-      else -> {
-        doLast {
-          throw GradleException(
-            "Cannot build targeting ${buildInfo.os.name}/${buildInfo.targetArch} with musl=${buildInfo.musl}"
-          )
-        }
-      }
-    }
-  }
-
-val checkNative by
-  tasks.registering {
-    group = "verification"
-    dependsOn(testNative)
-  }
-
-val buildNative by
-  tasks.registering {
-    group = "build"
-    dependsOn(checkNative)
-  }
@@ -1,6 +1,6 @@
 name: main
 title: Main Project
-version: 0.31.1
-prerelease: false
+version: 0.32.0-dev
+prerelease: true
 nav:
 - nav.adoc
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension

 plugins {
-  pklAllProjects
-  pklKotlinTest
+  id("pklAllProjects")
+  id("pklKotlinTest")
 }

 sourceSets {
@@ -1,61 +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.
-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.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.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-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.0=testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.0=testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.0=testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.0=testRuntimeClasspath
-org.graalvm.sdk:word:25.0.0=testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.0=testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,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.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.8=testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.organicdesign:Paguro:3.10.3=testRuntimeClasspath
-org.snakeyaml:snakeyaml-engine:2.10=testRuntimeClasspath
-empty=annotationProcessor,apiDependenciesMetadata,compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,runtimeClasspath,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
@@ -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.31.1
+:pkl-version-no-suffix: 0.32.0
 // 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

@@ -255,8 +255,7 @@ String literals are enclosed in double quotes:
 "Hello, World!"
 ----

-TIP: Except for a few minor differences footnote:[Pkl's string literals have fewer character escape sequences,
-have stricter rules for line indentation in multiline strings, and do not have a line continuation character.],
+TIP: Except for a few minor differences footnote:[Pkl's string literals have fewer character escape sequences and stricter rules for line indentation in multiline strings.],
 String literals have the same syntax and semantics as in Swift 5. Learn one of them, know both of them!

 Inside a string literal, the following character escape sequences have special meaning:
@@ -362,6 +361,23 @@ str = """
  """
 ----

+To prevent line breaks from becoming part of the string's value, use a backslash (`\`) to end those lines.
+
+[source%tested,{pkl}]
+----
+str = """
+  Although the Dodo is extinct, \
+  the species will be remembered.
+  """
+----
+
+This multiline string is equivalent to the following single-line string:
+
+[source%parsed,{pkl-expr}]
+----
+"Although the Dodo is extinct, the species will be remembered."
+----
+
 [[custom-string-delimiters]]
 === Custom String Delimiters

@@ -0,0 +1,60 @@
+= 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.
+
+=== Removed Java APIs
+
+The following APIs have been removed without replacement.
+
+* `org.pkl.config.java.Config#makeConfig` (pr:https://github.com/apple/pkl/pull/1531[])
+
+.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
@@ -1,6 +1,9 @@
 = 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)

@@ -35,7 +38,6 @@ 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)
@@ -2,6 +2,7 @@

 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]
@@ -52,10 +52,3 @@ 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])
@@ -41,6 +41,7 @@
 * 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]
@@ -1,7 +1,7 @@
 # suppress inspection "UnusedProperty" for whole file

 group=org.pkl-lang
-version=0.31.1
+version=0.32.0

 # google-java-format requires jdk.compiler exports
 org.gradle.jvmargs= \
@@ -0,0 +1,12 @@
+#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
@@ -1,61 +1,69 @@
 [versions] # ordered alphabetically
-assertj = "3.+"
+assertj = "3.27.7"
 checksumPlugin = "1.4.0"
-clikt = "5.+"
-commonMark = "0.+"
-downloadTaskPlugin = "5.6.0"
-geantyref = "1.+"
-googleJavaFormat = "1.25.2"
-# must not use `+` because used in download URL
-# 23.1.x requires JDK 20+
-graalVm = "25.0.0"
+# 5.0.3 is the last version compatible with Kotlin 2.2
+clikt = "5.0.3"
+commonMark = "0.28.0"
+downloadTaskPlugin = "5.7.0"
+errorProne = "2.48.0"
+errorPronePlugin = "5.1.0"
+geantyref = "1.3.16"
 #noinspection UnusedVersionCatalogEntry
-graalVmJdkVersion = "25.0.0"
+googleJavaFormat = "1.35.0"
+# 25.0.2 no longer supports macos-x64
+graalVm = "25.0.1"
+#noinspection UnusedVersionCatalogEntry
+graalVmJdkVersion = "25.0.1"
 # slightly hacky but convenient place so we remember to update the checksum
 #noinspection UnusedVersionCatalogEntry
-graalVmSha256-macos-x64 = "04278cf867d040e29dc71dd7727793f0ea67eb72adce8a35d04b87b57906778d"
+graalVmSha256-macos-x64 = "a3d895b4cd1c783badbd277ec70409806bd4102fca0d2a60dbaeb0bab41aec30"
 #noinspection UnusedVersionCatalogEntry
-graalVmSha256-macos-aarch64 = "c446d5aaeda98660a4c14049d299e9fba72105a007df89f19d27cf3979d37158"
+graalVmSha256-macos-aarch64 = "066339f24a8ab5c161548491a9400f7344e7761a1e46f8979e76c7ef11d5bc76"
 #noinspection UnusedVersionCatalogEntry
-graalVmSha256-linux-x64 = "1862f2ce97387a303cae4c512cb21baf36fafd2457c3cbbc10d87db94b89d3dd"
+graalVmSha256-linux-x64 = "01e39fe1a87f28b842a3e4e3b77be9b544dca3a58fa6e93b924a6106c8bac7fb"
 #noinspection UnusedVersionCatalogEntry
-graalVmSha256-linux-aarch64 = "6c3c8b7617006c5d174d9cf7d357ccfb4bae77a4df1294ee28084fcb6eea8921"
+graalVmSha256-linux-aarch64 = "7aa0b9935a80e67f37c6025678393dbd123bb6f2226811decbc1a13093fc8ae2"
 #noinspection UnusedVersionCatalogEntry
-graalVmSha256-windows-x64 = "33ef1d186b5c1e95465fcc97e637bc26e72d5f2250a8615b9c5d667ed5c17fd0"
-ideaExtPlugin = "1.1.9"
-intellijPlugin = "2.10.1"
-intellij = "2025.2.3"
-javaPoet = "0.+"
+graalVmSha256-windows-x64 = "fde83c5ceec2c75560c747ccd9f314f90e4cf5c5287416e67c4ce442e344ca27"
+# pklGraalVm.gradle.kts assumes this entry exists
+#noinspection UnusedVersionCatalogEntry
+graalVmSha256-windows-aarch64 = "unavailable"
+ideaExtPlugin = "1.4.1"
+javaPoet = "0.14.0"
 javaxInject = "1"
-jansi = "2.+"
-jimfs = "1.+"
-# 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.2"
-jsr305 = "3.+"
-junit = "5.+"
-junitPlatform = "1.+"
-kotlin = "2.2.20"
+jimfs = "1.3.1"
+jline = "4.0.12"
+jmh = "1.37"
+jmhPlugin = "0.7.3"
+jspecify = "1.0.0"
+jsr305 = "3.0.2"
+junit = "6.0.3"
 # 1.7+ generates much more verbose code
-kotlinPoet = "1.6.+"
-kotlinxHtml = "0.11.0"
-kotlinxSerialization = "1.8.0"
-kotlinxCoroutines = "1.+"
-ktfmt = "0.53"
+kotlinPoet = "2.3.0"
+kotlinStdLib = "2.2.21"
+#noinspection UnusedVersionCatalogEntry
+kotlinTarget = "2.2"
+kotlinToolchain = "2.3.20"
+kotlinxHtml = "0.12.0"
+# 1.9.0 is the last version compatible with Kotlin 2.2
+kotlinxSerialization = "1.9.0"
+kotlinxCoroutines = "1.10.2"
+#noinspection UnusedVersionCatalogEntry
+ktfmt = "0.62"
 # replaces nuValidator's log4j dependency
-# something related to log4j-1.2-api is apparently broken in 2.17.2
+# 2.17.1 is the last version compatible with nuValidator
 log4j = "2.17.1"
-msgpack = "0.9.8"
+msgpack = "0.9.11"
 nexusPublishPlugin = "2.0.0"
-nuValidator = "20.+"
-paguro = "3.+"
-shadowPlugin = "9.+"
-slf4j = "1.+"
-snakeYaml = "2.+"
-spotlessPlugin = "6.25.0"
-wiremock = "3.+"
+nullaway = "0.13.2"
+nullawayPlugin = "3.0.0"
+nuValidator = "26.4.2"
+paguro = "3.10.3"
+shadowPlugin = "9.4.1"
+slf4j = "2.0.17"
+snakeYaml = "3.0.1"
+spotlessPlugin = "8.4.0"
+wiremock = "3.13.2"

 [libraries] # ordered alphabetically
 assertj = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" }
@@ -64,29 +72,33 @@ 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" }
-jlineTerminalJansi = { group = "org.jline", name = "jline-terminal-jansi", version.ref = "jline" }
+jlineTerminalJni = { group = "org.jline", name = "jline-terminal-jni", 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" }
-junitLauncher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junitPlatform" }
-kotlinPlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
+#noinspection UnusedVersionCatalogEntry
+junitLauncher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junit" }
+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 = "kotlin" }
-kotlinScripting = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jsr223", version.ref = "kotlin" }
-kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlinReflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlinStdLib" }
+kotlinScripting = { group = "org.jetbrains.kotlin", name = "kotlin-scripting-jsr223", version.ref = "kotlinStdLib" }
+#noinspection UnusedVersionCatalogEntry
+kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlinStdLib" }
 kotlinxHtml = { group = "org.jetbrains.kotlinx", name = "kotlinx-html-jvm", version.ref = "kotlinxHtml" }
 kotlinxSerializationJson = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
 kotlinxCoroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
@@ -95,6 +107,9 @@ 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" }
@@ -112,9 +127,12 @@ 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 = "kotlin" }
+kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinToolchain" }
 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" }
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -1,7 +1,7 @@
 #!/bin/sh

 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 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/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/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,7 +114,6 @@ case "$( uname )" in                #(
  NONSTOP* )        nonstop=true ;;
 esac

-CLASSPATH="\\\"\\\""


 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ 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" )

@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
        "$@"

@@ -70,11 +70,10 @@ 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%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*

 :end
@rem End local scope for the variables with windows NT shell
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 plugins {
-  pklAllProjects
+  id("pklAllProjects")
  `java-platform`
  `maven-publish`
  signing
@@ -1,145 +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.
-com.ethlo.time:itu:1.10.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-annotations:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-core:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-databind:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.fasterxml.jackson:jackson-bom:2.19.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-core-jvm:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-core:5.0.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-jvm:5.0.3=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown:5.0.3=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt:5.0.3=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,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core-jvm:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core:3.0.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown:3.0.1=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant:3.0.1=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,testImplementationDependenciesMetadata,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.36.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.guava:failureaccess:1.0.3=testCompileClasspath,testImplementationDependenciesMetadata,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,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.j2objc:j2objc-annotations:3.0.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.jayway.jsonpath:json-path:2.9.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.networknt:json-schema-validator:1.5.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-commons-fileupload:commons-fileupload:1.6.0=testCompileClasspath,testImplementationDependenciesMetadata,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.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,testImplementationDependenciesMetadata,testRuntimeClasspath
-net.minidev:accessors-smart:2.5.0=testRuntimeClasspath
-net.minidev:json-smart:2.5.0=testRuntimeClasspath
-net.sf.jopt-simple:jopt-simple:5.0.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apache.httpcomponents.client5:httpclient5:5.5=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apache.httpcomponents.core5:httpcore5-h2:5.3.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apache.httpcomponents.core5:httpcore5:5.3.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-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.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty.http2:http2-hpack:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,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,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-client:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-client:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-java-server:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-alpn-server:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-bom:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-client:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-proxy:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlet:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-servlets:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-webapp:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.eclipse.jetty:jetty-xml:11.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.fusesource.jansi:jansi:2.4.2=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.polyglot:polyglot:25.0.0=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.0=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.0=compileClasspath,compileOnlyDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:jniutils:25.0.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.0=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.0=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.truffle:truffle-compiler:25.0.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.graalvm.truffle:truffle-runtime:25.0.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,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:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,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:3.23.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jline:jline-reader:3.23.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jline:jline-terminal-jansi:3.23.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jline:jline-terminal:3.23.0=compileClasspath,implementationDependenciesMetadata,nativeImageClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.8=nativeImageClasspath,runtimeClasspath,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,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.snakeyaml:snakeyaml-engine:2.10=nativeImageClasspath,runtimeClasspath,testRuntimeClasspath
-org.wiremock:wiremock:3.13.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.xmlunit:xmlunit-core:2.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.xmlunit:xmlunit-legacy:2.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.xmlunit:xmlunit-placeholders:2.10.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.yaml:snakeyaml:2.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-empty=annotationProcessor,intransitiveDependenciesMetadata,javaExecutable,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,stagedAlpineLinuxAmd64Executable,stagedLinuxAarch64Executable,stagedLinuxAmd64Executable,stagedMacAarch64Executable,stagedMacAmd64Executable,stagedWindowsAmd64Executable,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,14 +18,14 @@ import java.io.OutputStream
 import org.gradle.kotlin.dsl.support.serviceOf

 plugins {
-  pklAllProjects
-  pklKotlinLibrary
-  pklPublishLibrary
-  pklJavaExecutable
-  pklNativeExecutable
+  id("pklAllProjects")
+  id("pklKotlinLibrary")
+  id("pklPublishLibrary")
+  id("pklJavaExecutable")
+  id("pklNativeExecutable")
  `maven-publish`

-  // already on build script class path (see buildSrc/build.gradle.kts),
+  // already on build script class path (see build-logic/build.gradle.kts),
  // hence must only specify plugin ID here
  id(libs.plugins.shadow.get().pluginId)

@@ -56,10 +56,9 @@ dependencies {
  api(projects.pklCommonsCli)

  implementation(projects.pklCommons)
-  implementation(libs.jansi)
  implementation(libs.jlineReader)
  implementation(libs.jlineTerminal)
-  implementation(libs.jlineTerminalJansi)
+  implementation(libs.jlineTerminalJni)
  implementation(projects.pklServer)
  implementation(projects.pklFormatter)
  implementation(libs.clikt)
@@ -47,7 +47,7 @@ constructor(
  private val errWriter: Writer = System.err.writer(),
 ) : CliCommand(CliBaseOptions()) {
  private fun format(contents: String): String {
-    return Formatter().format(contents, grammarVersion)
+    return Formatter(grammarVersion).format(contents)
  }

  private fun writeErrLine(error: String) {
@@ -20,7 +20,6 @@ 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
@@ -52,7 +51,7 @@ class PklHighlighter : Highlighter {
 }

 internal class Repl(workingDir: Path, private val server: ReplServer, private val color: Boolean) {
-  private val terminal = TerminalBuilder.builder().apply { jansi(true) }.build()
+  private val terminal = TerminalBuilder.builder().apply { jni(true) }.build()
  private val history = DefaultHistory()
  private val reader =
    LineReaderBuilder.builder()
@@ -249,14 +248,20 @@ internal class Repl(workingDir: Path, private val server: ReplServer, private va
  }

  private fun highlight(str: String): String {
-    val ansi = Ansi.ansi()
-    var normal = true
+    // Inserting ANSI codes into a string that may already contain ANSI codes is problematic.
+    // This code preserves existing behavior but should eventually be removed.
+    val builder = StringBuilder()
+    var bold = false
    for (part in str.split("`", "```")) {
-      ansi.a(part)
-      normal = !normal
-      if (!normal) ansi.bold() else ansi.boldOff()
+      if (bold) {
+        builder.append("\u001B[1m")
+        builder.append(part)
+        builder.append("\u001B[22m")
+      } else {
+        builder.append(part)
+      }
+      bold = !bold
    }
-    ansi.reset()
-    return ansi.toString()
+    return builder.toString()
  }
 }
@@ -1,85 +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.
-com.github.ajalt.clikt:clikt-core-jvm:5.0.3=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.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown:5.0.3=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt:5.0.3=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,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core-jvm:3.0.1=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.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant:3.0.1=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.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.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-net.java.dev.jna:jna:5.14.0=runtimeClasspath,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-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.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,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:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,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.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.8=runtimeClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath
-org.snakeyaml:snakeyaml-engine:2.10=runtimeClasspath,testRuntimeClasspath
-empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
 * limitations under the License.
 */
 plugins {
-  pklAllProjects
-  pklKotlinLibrary
-  pklPublishLibrary
-  pklJavaExecutable
+  id("pklAllProjects")
+  id("pklKotlinLibrary")
+  id("pklPublishLibrary")
+  id("pklJavaExecutable")
 }

 dependencies {
-  // CliJavaCodeGeneratorOptions exposes CliBaseOptions
+  // CliJavaCodeGeneratorOptions exposes pkl-commons-cli and pkl-base
  api(projects.pklCommonsCli)
+  api(projects.pklCore)

  implementation(projects.pklCommons)
-  implementation(projects.pklCore)
  implementation(libs.javaPoet)

  testImplementation(projects.pklConfigJava)
@@ -56,7 +56,7 @@ publishing {
          """
          Java source code generator that generates corresponding Java classes for Pkl classes,
          simplifying consumption of Pkl configuration as statically typed Java objects.
-        """
+          """
            .trimIndent()
        )
      }
@@ -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(Object::class.java)
+    private val OBJECT = ClassName.get(Any::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(Object::class.java, "obj")
+          .addParameter(Any::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(Object::class.java, "value")
+      .addParameter(Any::class.java, "value")
      .addStatement("builder.append(\"\\n  \").append(name).append(\" = \")")
      .addStatement(
        "\$T lines = \$T.toString(value).split(\"\\n\")",
@@ -1,86 +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.
-com.github.ajalt.clikt:clikt-core-jvm:5.0.3=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.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown:5.0.3=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt:5.0.3=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,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core-jvm:3.0.1=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.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant:3.0.1=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,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.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-net.java.dev.jna:jna:5.14.0=runtimeClasspath,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-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.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.0=runtimeClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:2.2.20=compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jsr223:2.2.20=testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm-host:2.2.20=testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,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:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,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.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.8=runtimeClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.organicdesign:Paguro:3.10.3=runtimeClasspath,testRuntimeClasspath
-org.snakeyaml:snakeyaml-engine:2.10=runtimeClasspath,testRuntimeClasspath
-empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
 * limitations under the License.
 */
 plugins {
-  pklAllProjects
-  pklKotlinLibrary
-  pklPublishLibrary
-  pklJavaExecutable
+  id("pklAllProjects")
+  id("pklKotlinLibrary")
+  id("pklPublishLibrary")
+  id("pklJavaExecutable")
 }

 publishing {
@@ -29,7 +29,7 @@ publishing {
          """
          Kotlin source code generator that generates corresponding Kotlin classes for Pkl classes,
          simplifying consumption of Pkl configuration as statically typed Kotlin objects.
-        """
+          """
            .trimIndent()
        )
      }
@@ -1,96 +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.
-com.github.ajalt.clikt:clikt-core-jvm:5.0.3=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.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.clikt:clikt-markdown:5.0.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,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,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-core-jvm:3.0.1=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.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=runtimeClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.ajalt.mordant:mordant-markdown:3.0.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,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.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-net.java.dev.jna:jna:5.14.0=runtimeClasspath,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-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.0=svmClasspath
-org.graalvm.espresso:espresso-svm:25.0.0=svmClasspath
-org.graalvm.nativeimage:native-image-base:25.0.0=svmClasspath
-org.graalvm.nativeimage:objectfile:25.0.0=svmClasspath
-org.graalvm.nativeimage:pointsto:25.0.0=svmClasspath
-org.graalvm.nativeimage:svm-capnproto-runtime:25.0.0=svmClasspath
-org.graalvm.nativeimage:svm-configure:25.0.0=svmClasspath
-org.graalvm.nativeimage:svm:25.0.0=svmClasspath
-org.graalvm.nativeimage:truffle-runtime-svm:25.0.0=svmClasspath
-org.graalvm.polyglot:polyglot:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.sdk:jniutils:25.0.0=svmClasspath
-org.graalvm.sdk:nativeimage-libgraal:25.0.0=svmClasspath
-org.graalvm.sdk:nativeimage:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.0=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-compiler:25.0.0=svmClasspath
-org.graalvm.truffle:truffle-runtime:25.0.0=svmClasspath
-org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathSvm,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,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:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,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=implementationDependenciesMetadata,runtimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.8=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.organicdesign:Paguro:3.10.3=runtimeClasspath,svmClasspath,testRuntimeClasspath
-org.snakeyaml:snakeyaml-engine:2.10=runtimeClasspath,svmClasspath,testRuntimeClasspath
-empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,signatures,sourcesJar,svmAnnotationProcessor,svmApiDependenciesMetadata,svmCompileClasspath,svmCompileOnlyDependenciesMetadata,svmImplementationDependenciesMetadata,svmIntransitiveDependenciesMetadata,svmKotlinScriptDefExtensions,svmRuntimeClasspath,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 * limitations under the License.
 */
 plugins {
-  pklAllProjects
-  pklKotlinLibrary
-  pklPublishLibrary
+  id("pklAllProjects")
+  id("pklKotlinLibrary")
+  id("pklPublishLibrary")
 }

 val svmClasspath: Configuration by configurations.creating
@@ -24,6 +24,8 @@ 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
@@ -113,8 +115,8 @@ class CliCommandTest {
      .resolve("PklProject")
      .writeText(
        """
-      amends "pkl:Project"
-    """
+        amends "pkl:Project"
+        """
          .trimIndent()
      )
    cmd.parse(arrayOf("--working-dir=$tempDir"))
@@ -129,8 +131,8 @@ class CliCommandTest {
      .resolve("PklProject")
      .writeText(
        """
-      amends "pkl:Project"
-    """
+        amends "pkl:Project"
+        """
          .trimIndent()
      )
    cmd.parse(arrayOf("--working-dir=$tempDir"))
@@ -148,15 +150,15 @@ class CliCommandTest {
      .resolve("PklProject")
      .writeText(
        """
-      amends "pkl:Project"
-      
-      package {
-        name = "foo"
-        baseUri = "package://example.com/foo"
-        version = "0.0.1"
-        packageZipUrl = "https://example.com/foo@\(version).zip"
-      }
-    """
+        amends "pkl:Project"
+
+        package {
+          name = "foo"
+          baseUri = "package://example.com/foo"
+          version = "0.0.1"
+          packageZipUrl = "https://example.com/foo@\(version).zip"
+        }
+        """
          .trimIndent()
      )

@@ -187,14 +189,14 @@ class CliCommandTest {
      .resolve("PklProject")
      .writeText(
        """
-      amends "pkl:Project"
+        amends "pkl:Project"

-      dependencies {
-        ["foo"] {
-          uri = "package://example.com/foo@1.2.3"
+        dependencies {
+          ["foo"] {
+            uri = "package://example.com/foo@1.2.3"
+          }
        }
-      }
-    """
+        """
          .trimIndent()
      )
    cmd.parse(arrayOf("--working-dir=$tempDir"))
@@ -207,7 +209,7 @@ class CliCommandTest {
  val projectWithAllEvaluatorSettings =
    """
    amends "pkl:Project"
-    
+
    evaluatorSettings {
      externalProperties { ["foo"] = "bar" }
      env { ["foo"] = "bar" }
@@ -236,10 +238,12 @@ 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"))
@@ -1,52 +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.
-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.17.7=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
-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.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,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:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,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.junit.jupiter:junit-jupiter-api:5.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:5.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.8=compileClasspath
-org.opentest4j:opentest4j:1.3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 import java.security.MessageDigest

 plugins {
-  pklAllProjects
-  pklKotlinLibrary
+  id("pklAllProjects")
+  id("pklKotlinLibrary")
 }

 // note: no need to publish this library
@@ -1,51 +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.
-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.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-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.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,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:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,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.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.14.0=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 * limitations under the License.
 */
 plugins {
-  pklAllProjects
-  pklKotlinLibrary
-  pklPublishLibrary
+  id("pklAllProjects")
+  id("pklKotlinLibrary")
+  id("pklPublishLibrary")
 }

 publishing {
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * 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.
@@ -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 = Object()
+  private val lock = Any()

  operator fun getValue(thisValue: This, property: KProperty<*>): Return =
    synchronized(lock) { values.getOrPut(thisValue) { thisValue.initializer() } }
@@ -1,86 +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.
-com.github.ajalt.clikt:clikt-core-jvm:5.0.3=pklCodegenJava
-com.github.ajalt.clikt:clikt-core:5.0.3=pklCodegenJava
-com.github.ajalt.clikt:clikt-jvm:5.0.3=pklCodegenJava
-com.github.ajalt.clikt:clikt-markdown-jvm:5.0.3=pklCodegenJava
-com.github.ajalt.clikt:clikt-markdown:5.0.3=pklCodegenJava
-com.github.ajalt.clikt:clikt:5.0.3=pklCodegenJava
-com.github.ajalt.colormath:colormath-jvm:3.6.0=pklCodegenJava
-com.github.ajalt.colormath:colormath:3.6.0=pklCodegenJava
-com.github.ajalt.mordant:mordant-core-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-core:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-ffm-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-ffm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-graal-ffi-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-graal-ffi:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-jna-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm-jna:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-markdown-jvm:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant-markdown:3.0.1=pklCodegenJava
-com.github.ajalt.mordant:mordant:3.0.1=pklCodegenJava
-com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable
-com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolvable
-com.palantir.javapoet:javapoet:0.7.0=pklCodegenJava
-io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
-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,testImplementationDependenciesMetadata,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,testImplementationDependenciesMetadata
-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.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:collections:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:graal-sdk:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:nativeimage:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.graalvm.sdk:word:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.graalvm.truffle:truffle-api:25.0.0=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.20=pklCodegenJava,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.20=pklCodegenJava,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,pklCodegenJava,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,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.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.14.0=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
-org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.msgpack:msgpack-core:0.9.8=compileClasspath,pklCodegenJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,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,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,shadow,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,10 +14,11 @@
 * limitations under the License.
 */
 plugins {
-  pklAllProjects
-  pklJavaLibrary
-  pklFatJar
-  pklPublishLibrary
+  id("pklAllProjects")
+  id("pklJavaLibrary")
+  id("pklFatJar")
+  id("pklPublishLibrary")
+  id("pklJSpecify")
  signing
 }

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,18 +17,17 @@ package org.pkl.config.java;

 import java.io.InputStream;
 import java.lang.reflect.Type;
-import java.util.Map;
+import org.jspecify.annotations.Nullable;
 import org.pkl.config.java.mapper.ConversionException;
 import org.pkl.config.java.mapper.ValueMapper;
-import org.pkl.core.Composite;
 import org.pkl.core.Evaluator;
-import org.pkl.core.PklBinaryDecoder;

 /**
 * A root, intermediate, or leaf node in a configuration tree. Child nodes can be obtained by name
 * using {@link #get(String)}. To consume the node's composite or scalar value, convert the value to
 * the desired Java type, using one of the provided {@link #as} methods.
 */
+@SuppressWarnings({"DeprecatedIsStillUsed"})
 public interface Config {
  /**
   * The dot-separated name of this node. For example, the node reached using {@code
@@ -55,7 +54,7 @@ public interface Config {
   *
   * @throws ConversionException if the value cannot be converted to the given type
   */
-  <T> T as(Class<T> type);
+  <T extends @Nullable Object> T as(Class<T> type);

  /**
   * Converts this node's value to the given {@link Type}.
@@ -64,59 +63,60 @@ public interface Config {
   *
   * @throws ConversionException if the value cannot be converted to the given type
   */
-  <T> T as(Type type);
+  <T extends @Nullable Object> T as(Type type);

  /**
   * Converts this node's value to the given {@link JavaType}.
   *
   * @throws ConversionException if the value cannot be converted to the given type
   */
-  <T> T as(JavaType<T> type);
+  <T extends @Nullable Object> T as(JavaType<T> type);

  /**
-   * Decode a config from the supplied byte array.
+   * Decodes a config from the supplied byte array.
   *
-   * @return the encoded config
+   * @return the decoded config
+   * @deprecated Use {@code ConfigDecoderBuilder...build().decode(bytes)} instead. For a direct
+   *     equivalent, use {@code ConfigDecoder.preconfigured().setValueMapper(mapper).decode(bytes)}.
   */
+  @Deprecated(forRemoval = true)
  static Config fromPklBinary(byte[] bytes, ValueMapper mapper) {
-    return makeConfig(PklBinaryDecoder.decode(bytes), mapper);
+    return ConfigDecoder.preconfigured().setValueMapper(mapper).decode(bytes);
  }

  /**
-   * Decode a config from the supplied byte array using a preconfigured {@link ValueMapper}.
+   * Decodes a config from the supplied byte array using a preconfigured {@link ValueMapper}.
   *
-   * @return the encoded config
+   * @return the decoded config
+   * @deprecated Use {@code ConfigDecoder.preconfigured().decode(bytes)} instead.
   */
+  @Deprecated(forRemoval = true)
  static Config fromPklBinary(byte[] bytes) {
-    return fromPklBinary(bytes, ValueMapper.preconfigured());
+    return ConfigDecoder.preconfigured().decode(bytes);
  }

  /**
-   * Decode a config from the supplied {@link InputStream} using a preconfigured {@link
+   * Decodes a config from the supplied {@link InputStream} using a preconfigured {@link
   * ValueMapper}.
   *
-   * @return the encoded config
+   * @return the decoded config
+   * @deprecated Use {@code ConfigDecoderBuilder...build().decode(inputStream)} instead. For a
+   *     direct equivalent, use {@code
+   *     ConfigDecoder.preconfigured().setValueMapper(mapper).decode(inputStream)}.
   */
+  @Deprecated(forRemoval = true)
  static Config fromPklBinary(InputStream inputStream, ValueMapper mapper) {
-    return makeConfig(PklBinaryDecoder.decode(inputStream), mapper);
+    return ConfigDecoder.preconfigured().setValueMapper(mapper).decode(inputStream);
  }

  /**
-   * Decode a config from the supplied {@link InputStream}.
+   * Decodes a config from the supplied {@link InputStream}.
   *
-   * @return the encoded config
+   * @return the decoded config
+   * @deprecated Use {@code ConfigDecoder.preconfigured().decode(inputStream)} instead.
   */
+  @Deprecated(forRemoval = true)
  static Config fromPklBinary(InputStream inputStream) {
-    return fromPklBinary(inputStream, ValueMapper.preconfigured());
-  }
-
-  static Config makeConfig(Object decoded, ValueMapper mapper) {
-    if (decoded instanceof Composite composite) {
-      return new CompositeConfig("", mapper, composite);
-    }
-    if (decoded instanceof Map<?, ?> map) {
-      return new MapConfig("", mapper, map);
-    }
-    return new LeafConfig("", mapper, decoded);
+    return ConfigDecoder.preconfigured().decode(inputStream);
  }
 }
@@ -0,0 +1,62 @@
+/*
+ * 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.config.java;
+
+import java.io.InputStream;
+import org.pkl.config.java.mapper.ValueMapper;
+
+/** Decodes Pkl binary data into {@link Config} objects. */
+public interface ConfigDecoder {
+
+  /**
+   * Returns a preconfigured decoder that uses {@link ValueMapper#preconfigured()}.
+   *
+   * <p>For more control over configuration, use {@link ConfigDecoderBuilder}.
+   *
+   * @return a preconfigured decoder
+   */
+  static ConfigDecoder preconfigured() {
+    return ConfigDecoderBuilder.preconfigured().build();
+  }
+
+  ValueMapper getValueMapper();
+
+  /**
+   * Returns a copy of this decoder with the supplied value mapper.
+   *
+   * @param mapper the value mapper to use
+   * @return a decoder with the supplied value mapper
+   */
+  ConfigDecoder setValueMapper(ValueMapper mapper);
+
+  /**
+   * Decodes configuration from the supplied byte array.
+   *
+   * @param bytes the data to decode
+   * @return the decoded configuration
+   */
+  Config decode(byte[] bytes);
+
+  /**
+   * Decodes configuration from the supplied input stream.
+   *
+   * <p>This method does not close the stream; the caller is responsible for closing it.
+   *
+   * @param inputStream the data to decode
+   * @return the decoded configuration
+   */
+  Config decode(InputStream inputStream);
+}
@@ -0,0 +1,79 @@
+/*
+ * 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.config.java;
+
+import org.pkl.config.java.mapper.ValueMapperBuilder;
+
+/**
+ * Builder for {@link ConfigDecoder} instances.
+ *
+ * <p>Use {@link #preconfigured()} to obtain a preconfigured builder, or {@link #unconfigured()} for
+ * full control over its configuration.
+ */
+public final class ConfigDecoderBuilder {
+  private ValueMapperBuilder mapperBuilder;
+
+  private ConfigDecoderBuilder(ValueMapperBuilder mapperBuilder) {
+    this.mapperBuilder = mapperBuilder;
+  }
+
+  /**
+   * Returns a preconfigured builder that uses {@link ValueMapperBuilder#preconfigured()}.
+   *
+   * @return a preconfigured builder
+   */
+  public static ConfigDecoderBuilder preconfigured() {
+    return new ConfigDecoderBuilder(ValueMapperBuilder.preconfigured());
+  }
+
+  /**
+   * Returns an unconfigured builder that uses {@link ValueMapperBuilder#unconfigured()}.
+   *
+   * @return an unconfigured builder
+   */
+  public static ConfigDecoderBuilder unconfigured() {
+    return new ConfigDecoderBuilder(ValueMapperBuilder.unconfigured());
+  }
+
+  /**
+   * Returns the value mapper builder used by this decoder builder.
+   *
+   * @return the value mapper builder
+   */
+  public ValueMapperBuilder getValueMapperBuilder() {
+    return mapperBuilder;
+  }
+
+  /**
+   * Sets the value mapper builder used by this decoder builder.
+   *
+   * @param mapperBuilder the value mapper builder to use
+   * @return this builder
+   */
+  public ConfigDecoderBuilder setValueMapperBuilder(ValueMapperBuilder mapperBuilder) {
+    this.mapperBuilder = mapperBuilder;
+    return this;
+  }
+
+  /**
+   * Builds a {@link ConfigDecoder} using the current configuration.
+   *
+   * @return the configured decoder
+   */
+  public ConfigDecoder build() {
+    return new ConfigDecoderImpl(mapperBuilder.build());
+  }
+}
@@ -0,0 +1,48 @@
+/*
+ * 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.config.java;
+
+import java.io.InputStream;
+import org.pkl.config.java.mapper.ValueMapper;
+import org.pkl.core.PklBinaryDecoder;
+
+final class ConfigDecoderImpl implements ConfigDecoder {
+  private final ValueMapper mapper;
+
+  ConfigDecoderImpl(ValueMapper mapper) {
+    this.mapper = mapper;
+  }
+
+  @Override
+  public ValueMapper getValueMapper() {
+    return mapper;
+  }
+
+  @Override
+  public ConfigDecoder setValueMapper(ValueMapper mapper) {
+    return new ConfigDecoderImpl(mapper);
+  }
+
+  @Override
+  public Config decode(byte[] bytes) {
+    return ConfigUtils.createConfig(PklBinaryDecoder.decode(bytes), mapper);
+  }
+
+  @Override
+  public Config decode(InputStream inputStream) {
+    return ConfigUtils.createConfig(PklBinaryDecoder.decode(inputStream), mapper);
+  }
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
+import org.jspecify.annotations.Nullable;
 import org.pkl.config.java.mapper.ValueMapperBuilder;
 import org.pkl.core.EvaluatorBuilder;
 import org.pkl.core.SecurityManager;
@@ -28,7 +29,6 @@ import org.pkl.core.StackFrameTransformer;
 import org.pkl.core.http.HttpClient;
 import org.pkl.core.project.DeclaredDependencies;
 import org.pkl.core.project.Project;
-import org.pkl.core.util.Nullable;

 /** A builder for {@link ConfigEvaluator}s. */
@SuppressWarnings({"UnusedReturnValue", "unused"})
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 */
 package org.pkl.config.java;

+import static org.pkl.config.java.ConfigUtils.createConfig;
+
 import org.pkl.config.java.mapper.ValueMapper;
 import org.pkl.core.Evaluator;
 import org.pkl.core.ModuleSource;
@@ -37,13 +39,13 @@ final class ConfigEvaluatorImpl implements ConfigEvaluator {
  @Override
  public Config evaluateOutputValue(ModuleSource moduleSource) {
    var value = evaluator.evaluateOutputValue(moduleSource);
-    return Config.makeConfig(value, mapper);
+    return createConfig(value, mapper);
  }

  @Override
  public Config evaluateExpression(ModuleSource moduleSource, String expression) {
    var value = evaluator.evaluateExpression(moduleSource, expression);
-    return Config.makeConfig(value, mapper);
+    return createConfig(value, mapper);
  }

  @Override
@@ -0,0 +1,34 @@
+/*
+ * 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.config.java;
+
+import java.util.Map;
+import org.pkl.config.java.mapper.ValueMapper;
+import org.pkl.core.Composite;
+
+final class ConfigUtils {
+  private ConfigUtils() {}
+
+  static Config createConfig(Object value, ValueMapper mapper) {
+    if (value instanceof Composite composite) {
+      return new CompositeConfig("", mapper, composite);
+    }
+    if (value instanceof Map<?, ?> map) {
+      return new MapConfig("", mapper, map);
+    }
+    return new LeafConfig("", mapper, value);
+  }
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@ package org.pkl.config.java;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.*;
+import org.jspecify.annotations.Nullable;
 import org.pkl.config.java.mapper.Types;
 import org.pkl.core.Pair;
-import org.pkl.core.util.Nullable;

 /**
 * Runtime representation of a possibly parameterized Java type. Factory methods are provided to
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ * Copyright © 2024-2026 Apple Inc. and the Pkl project authors. All rights reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@ import java.io.UncheckedIOException;
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
+import org.jspecify.annotations.Nullable;
 import org.pkl.config.java.InvalidMappingException;
 import org.pkl.core.PClassInfo;
 import org.pkl.core.util.IoUtils;
-import org.pkl.core.util.Nullable;

 /**
 * Describes mappings of Pkl class names to their corresponding Java classes.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dependabot[bot]	4aa2cd0fc1	Bump com.squareup:kotlinpoet from 1.6.0 to 2.3.0 Bumps [com.squareup:kotlinpoet](https://github.com/square/kotlinpoet) from 1.6.0 to 2.3.0. - [Release notes](https://github.com/square/kotlinpoet/releases) - [Changelog](https://github.com/square/kotlinpoet/blob/main/docs/changelog.md) - [Commits](https://github.com/square/kotlinpoet/compare/1.6.0...2.3.0) --- updated-dependencies: - dependency-name: com.squareup:kotlinpoet dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-23 15:16:03 +00:00
Jen Basch	e07abb7311	SPICE-0028: Add support for multi-line string line continuations (#1507 ) SPICE: https://github.com/apple/pkl-evolution/pull/31	2026-04-21 10:29:52 -07:00
dependabot[bot]	d85f06be27	Bump org.snakeyaml:snakeyaml-engine from 2.10 to 3.0.1 (#1538 ) Bumps [org.snakeyaml:snakeyaml-engine](https://bitbucket.org/snakeyaml/snakeyaml-engine) from 2.10 to 3.0.1. - [Commits](https://bitbucket.org/snakeyaml/snakeyaml-engine/branches/compare/snakeyaml-engine-3.0.1..snakeyaml-engine-2.10) --- updated-dependencies: - dependency-name: org.snakeyaml:snakeyaml-engine dependency-version: 3.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dan Chao <dan.chao@apple.com>	2026-04-20 22:28:57 -07:00
Lucas Shadler	d4dacd5a0f	Implement gradle configuration cache support (#1500 ) Modern versions of Gradle support configuration caching to prevent the gradual increase of project size to affect the overall developer experience of Gradle builds. To prepare the PKL project, and specificall pkl-gradle, for configuration support, we introduce an integration test to vet configuration cache rules, and then perform the necessary updates to provide configuration cache support.	2026-04-20 22:02:13 -07:00
dependabot[bot]	7b70a44272	Bump com.uber.nullaway:nullaway from 0.13.1 to 0.13.2 (#1540 ) Bumps [com.uber.nullaway:nullaway](https://github.com/uber/NullAway) from 0.13.1 to 0.13.2. - [Release notes](https://github.com/uber/NullAway/releases) - [Changelog](https://github.com/uber/NullAway/blob/master/CHANGELOG.md) - [Commits](uber/NullAway@v0.13.1...v0.13.2) --- updated-dependencies: - dependency-name: com.uber.nullaway:nullaway dependency-version: 0.13.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-20 11:30:30 -07:00
Daniel Chao	a33e431433	Enable codeql scanning (#1532 ) This enables security vulnerability scanning using CodeQL.	2026-04-20 11:28:31 -07:00
Daniel Chao	4058f391a3	Fix dependabot (#1537 ) Looks like `directory` is a required property; we should also fix our schema but that's orthogonal to this actual fix.	2026-04-20 11:17:31 -07:00
odenix	7a75ab57f5	pkl-config-java: Replace Config.fromPklBinary() with ConfigDecoder (#1533 ) Motivation: - `Config` mixes configuration representation with decoding logic - `Config.fromPklBinary()` does not scale as decoding gains options (e.g., binary versions or formats) - The decoding API is inconsistent with `ConfigEvaluator` Changes: - Introduce `ConfigDecoder` (with builder) and move `Config.fromPklBinary()` logic into it - Deprecate `Config.fromPklBinary()` methods for removal - Add `ConfigDecoder.forKotlin()` extension function - Update and improve tests Result: - Decoding is separated from `Config` and exposed via a dedicated API - Decoding can evolve independently (e.g., adding options such as binary versions or supporting new formats) - Evaluation and decoding APIs follow a consistent design	2026-04-20 11:09:42 -07:00
Daniel Chao	07c68239b9	Remove lockfiles, manage Gradle dependencies with Dependabot (#1535 ) Dependabot currently does not update lockfiles in multi-module projects (see https://github.com/dependabot/dependabot-core/issues/14633) To work around this issue, we will simply remove our lockfiles, and change our version catalog to use fully specified versions. The removal of lockfiles introduces two issues: 1. It is less visible what our dependency graph is 2. Our builds are potentially non-reproducible To work around this, two mitigations are in place: 1. Enable `failOnDynamicVersions()`, which causes Gradle to fail the build if any dependencies declare a version range 2. Enable GitHub dependency submission, which provides insight into the project SBOM	2026-04-20 09:29:33 -07:00
Daniel Chao	9046221e03	Fix dependency scopes (#1534 ) Fixes the following pom.xml issues: 1. pkl-doc and pkl-codegen-java sets the wrong dependency scopes for pkl-commons-cli/pkl-base 2. pkl-config-kotlin sets the wrong dependency scope for pkl-config-java-all Closes #1293 Closes #1517	2026-04-20 08:54:49 -07:00
odenix	2e49a319b3	pkl-gradle: Migrate nullness to jSpecify (#1530 )	2026-04-17 12:34:54 -07:00
Daniel Chao	b1a5d8c915	Remove Config.makeConfig (#1531 ) This doesn't really make sense as part of the `Config` API. We can maybe make class `ConfigUtils` public, but, I don't know how useful it is anyways; it's more of an implementation detail.	2026-04-17 11:19:02 -07:00
odenix	1571d72111	pkl-config-java: Migrate nullness to jSpecify (#1528 )	2026-04-17 08:56:12 -07:00
Daniel Chao	2dd0e2de21	Only include runtimeClasspath and compileClasspath dependencies (#1529 )	2026-04-16 17:09:08 -07:00
odenix	8103b7759f	pkl-executor: Migrate nullness to jSpecify (#1527 ) Annotating SPI classes is binary compatible (forward and backward).	2026-04-16 15:02:40 -07:00
Islon Scherer	03a641354e	Add nullability check to pkl-formatter (#1526 )	2026-04-16 08:37:56 -07:00
Jen Basch	eeb0970dc4	Fix bug where reusing a `pklbinary#Renderer` could result in incorrect output (#1525 )	2026-04-15 23:12:36 -07:00
Daniel Chao	a8500b6b03	Add dependency submission (#1523 ) This adds jobs to add Gradle dependencies to [GitHub's dependency submission API](https://docs.github.com/en/code-security/how-tos/secure-your-supply-chain/secure-your-dependencies/using-the-dependency-submission-api), and to review when these dependencies change.	2026-04-15 22:21:17 -07:00
odenix	4faf35a66a	Gradle: Replace legacy buildSrc mechanism with included build (#1524 ) Motivation: buildSrc is a special-case legacy mechanism. Gradle recommends using an included build named build-logic instead: https://docs.gradle.org/current/userguide/best_practices_structuring_builds.html#favor_composite_builds Changes: - Rename buildSrc/ to build-logic/ - triggers reformatting - Replace occurrences of "buildSrc" with "build-logic" - Include the build-logic build in the main build (via settings.gradle.kts) - Apply convention plugins via plugin IDs instead of type-safe accessors - small tradeoff compared to buildSrc Result: - Faster and more isolated builds - Build logic behaves like a normal build, making it easier to evolve and reason about --------- Co-authored-by: Daniel Chao <dan.chao@apple.com>	2026-04-15 21:37:10 -07:00
odenix	04a9cc90d2	Improve build logic for Kotlin (#1520 ) - Enforce Kotlin version via resolution rule (replaces BOM) - fail if kotlin-stdlib/kotlin-reflect exceed target version - Replace kotlin-stdlib-jdk8 with kotlin-stdlib (jdk7/8 are now shims) - Port pkl-core annotation processor to Java (with Codex) - removes kotlin-stdlib from its compile classpath for better dependency hygiene (Java module) - Downgrade clikt for Kotlin 2.2 compatibility - Upgrade kotlinx-serialization --------- Co-authored-by: Daniel Chao <dan.chao@apple.com>	2026-04-15 09:02:42 -07:00
Islon Scherer	2e0b4a3a97	Fix gradle build issue during spotlessCheck (#1521 )	2026-04-15 16:06:14 +02:00
odenix	1ba54f11a9	pkl-parser: Migrate nullness to JSpecify (#1515 )	2026-04-14 12:17:17 -07:00
odenix	2d4286ee7b	Upgrade JVM toolchain to 25 and Kotlin toolchain to 2.3.20 (#1516 ) Motivation - Enable correct NullAway analysis - Pick up toolchain fixes and improvements Toolchains - Require JDK 25 for JVM toolchain (keep Java 17 runtime compatibility) - Require Kotlin 2.3.20 for Kotlin toolchain (keep Kotlin 2.2 runtime compatibility) - Require JDK 25 for Gradle daemon JVM (via gradle-daemon-jvm.properties) - Fix javac and kotlinc warnings from toolchain upgrades CI - Bump GitHub workflows to JDK 25 Building Kotlin - Bump Kotlin language level to 2.2 to match stdlib version - Consolidate build logic into pklKotlinBase.gradle.kts - Adopt modern Kotlin plugin syntax - Fix new kotlinc warnings - Update ktfmt to 0.62 - first version compatible with Kotlin 2.3.20 - changes formatting compared to 0.61 - Replace dependency resolution rule with BOM alignment - rule was too broad and interfered with toolchain/runtime separation Testing - Expand matrix to JDK 25 (LTS) and 26 - Ensure each matrix task can be run independently - Fix KotlinCodeGeneratorsTest and EmbeddedExecutorsTest on affected JDKs - Disable one test in CliCommandTest on affected JDKs (failure cause unknown) Compatibility fixes - Fix reflective access in DocGenerator on affected JDKs Build fixes - Fix misuse of `task.enabled` vs. `report.required` - Fix `gradlew tasks` on Windows - Downgrade Spotless to 8.3.0 to (hopefully) work around sporadic NoClassDefFoundError Result - NullAway runs correctly - Broader JDK test coverage - More reproducible and potentially faster builds	2026-04-14 11:57:09 -07:00
Daniel Chao	20f403e751	Add spotless formatter step to revert copyright year only changes (#1518 ) This avoids an issue where, during the course of development, a file is touched, thus modifying the copyright year. Then, undoing the previous change does not undo the copyright year change.	2026-04-14 09:02:31 -07:00
Daniel Chao	7f173cc8e8	Fix stdlib lockfile (#1519 ) Kotlin isn't a dependency of pkl-formatter anymore.	2026-04-14 08:38:30 -07:00
Islon Scherer	1d74e2a869	Move pkl-formatter to Java (#1514 )	2026-04-14 16:29:42 +02:00
odenix	4620992743	pkl-parser: Represent "no children" as an empty list instead of null (#1513 ) Motivation: Facilitate the use of the NullAway checker as part of moving to JSpecify. Changes: - represent "no children" as `List.of()` instead of null - remove obsolete `children != null` assertions - NullAway intentionally ignores such assertions - remove "no children" special-casing where no longer necessary Result: - cleaner code with similar performance - removed a barrier to using the NullAway checker	2026-04-09 08:05:34 -07:00
odenix	2cfd0a0d28	Update JLine to 4.x (#1511 ) - Remove dependency org.fusesource.jansi:jansi - In 4.x, org.fusesource.jansi:jansi was replaced with org.jline:jansi. Instead of adding this new dependency, this commit replaces Pkl’s single Jansi usage with custom code that preserves existing behavior. Fixing existing ANSI quirks is left for a future PR. - Replace jline-terminal-ansi with jline-terminal-jni - In 4.x, only -jni and -ffm are available (-ffm requires Java 22+) - Configure native-image build for jline-terminal-jni As updating JLine is delicate, I manually tested `pkl repl` and `jpkl repl` on Windows 11 (using Windows Terminal) and on Ubuntu, and found no issues. However, I do not have access to a macOS machine.	2026-04-08 16:25:39 -07:00
odenix	fdeb568343	Clean up Kotlin code in buildSrc/ (#1512 ) - fix most IntelliJ warnings (regex refactoring was done by IDE) - replace hardcoded JVM target versions with BuildInfo.jvmTarget	2026-04-08 16:09:37 -07:00
Daniel Chao	ff6f7223d3	Remove intellij plugin (#1510 ) This plugin is being moved to pkl-project-commons. Closes #1491 See https://github.com/apple/pkl-project-commons/pull/75	2026-04-08 13:46:23 -07:00
Daniel Chao	aca5a32f8e	Bump license year (#1504 )	2026-04-08 08:13:58 -07:00
odenix	24e69fd1e2	Improve Parser implementation (#1508 ) - Make leaf AST classes final - Make protected Lexer fields private and add getter - Split Parser into Parser and ParserImpl - Using a fresh ParserImpl instance per parse simplifies reasoning (important) and makes the Parser API thread-safe (nice to have) - Split GenericParser into GenericParser and GenericParserImpl - Same motivation as for Parser Some of these changes will facilitate the move to JSpecify, which has proven challenging for this package.	2026-04-08 08:13:39 -07:00
odenix	e793f4bd04	Update ktfmt to 0.61 (#1509 )	2026-04-07 14:49:01 -07:00
odenix	09435af54f	Improve Formatter API (#1505 ) - pass `GrammarVersion` to constructor instead of passing it to each `format` method - replace `format(Path): String` with `format(Reader, Appendable)` - instead of picking which overloads besides `format(String): String` might be useful, offer a single generalized method that streams input and output - add `@Throws(IOException::class)` to ensure that Java callers can catch this exception - deprecate old methods	2026-04-07 14:16:12 -07:00
odenix	99cbd07518	Update GraalVM to 25.0.1 (#1506 ) The latest version (25.0.2) no longer supports macos-x64.	2026-04-07 13:21:19 -07:00
Daniel Chao	8b892f9409	Bump Gradle to 9.4.1 (#1502 )	2026-04-07 08:32:43 -07:00
odenix	7dedddcdb1	Update Gradle plugins (#1503 )	2026-04-07 06:48:31 -07:00
odenix	623912eca0	Update msgpack to 0.9.11 and slf4j to 2.x (#1501 )	2026-04-06 22:00:07 -07:00
odenix	dcd60b8194	Update nu-validator from 20.x to 26.x (#1499 ) Also fix incorrect heading level in two Pkldoc tests, as this issue is now flagged by nu-validator.	2026-04-06 19:25:00 -07:00
odenix	1251843169	Update Kotlin dependencies (#1498 )	2026-04-06 12:06:43 -07:00
Daniel Chao	9868c11e5a	Disable flaky test (#1497 ) Disabling for now due to #1493	2026-04-06 11:39:00 -07:00
odenix	0835c6da82	Update JUnit to 6.x (#1496 )	2026-04-06 11:15:55 -07:00
odenix	a8c66938e6	Update dependencies (#1492 ) Update dependencies by running `./gradlew updateDependencyLocks`. Most of the updated dependencies are test dependencies.	2026-04-06 08:22:06 -07:00
Luke Daley	8e7eb2bd96	Fix data race in MessagePack encoder for concurrent server sends (#1486 )	2026-04-04 14:26:16 -07:00
odenix	58033598c7	Fix Javadoc and kotlinc warnings (#1490 )	2026-04-03 14:32:34 -07:00
Islon Scherer	bc503d4d60	Make the build work on jdk 25 (#1483 ) The old version of googleJavaFormat we were using called some deprecated function.	2026-03-31 09:38:36 +02:00
Jen Basch	82afa8b90b	Port 0.31.1 changelog to main (#1476 ) Co-authored-by: Islon Scherer <i_desouzascherer@apple.com>	2026-03-26 09:41:01 -07:00
Islon Scherer	dc5504749a	Disable gradle cache for release builds (#1474 )	2026-03-26 16:54:10 +01:00
Jen Basch	a9c890e2f9	Do not activate power assertions when a single union member containing a type constraint fails (#1462 ) Prior to this change, this code would activate powers assertions / instrumentation permanently: ```pkl foo: String(contains("a")) \| String(contains("b")) = "boo" ``` This is because the `contains("a")` constraint would fail, triggering power assertions, but the subsequent check of the union's `contains("b")` branch would succeed. As observed in #1419, once instrumentation is enabled, all subsequent evaluation slows significantly. As with #1419, the fix here is to disable power assertions via `VmLocalContext` until we know that all union members failed type checking; then, each member is re-executed with power assertions allowed to provide the improved user-facing error.	2026-03-25 11:52:37 -07:00
Jen Basch	f23c37a993	Prevent `--multiple-file-output-path` writes from following symlinks outside the target directory (#1467 )	2026-03-25 11:50:20 -07:00
Jen Basch	cdc6fa8aec	Prevent I/O when checking UNC paths against `--root-dir` (#1466 ) Test on [windows] please	2026-03-25 11:40:51 -07:00
Jen Basch	1104f12362	Allow custom/external resources to be "not found" (#1471 ) This allows custom/external resources to produce `null` values for nullable reads (`read?`) Ref: https://github.com/apple/pkl-go/issues/157	2026-03-24 12:43:44 -07:00
Jen Basch	cce84d7ccc	Correct SecurityManager check for HTTP(S) module URIs (#1463 )	2026-03-23 07:43:07 -07:00
Jen Basch	a6db476c70	Fix module reflection when instrumentation is active (#1464 )	2026-03-23 07:42:40 -07:00
splint-disk-8i	3f3271d3b1	Update deprecated OpenJDK links in DEVELOPMENT.adoc (#1468 ) Fixes broken links and grammar in DEVELOPMENT.adoc: - Mailing list URL: openjdk.java.net → openjdk.org (old domain returns 301) - Truffle FAQ link: old OpenJDK wiki is gone (404) — replaced with current GraalVM Truffle docs - Grammar: "enables to run" → "enables you to run" - Grammar: "jenv use specific" → "jenv uses specific"	2026-03-16 10:27:12 -07:00
dependabot[bot]	46da9cb33a	Bump actions/create-github-app-token from 2.2.1 to 2.2.2 (#1469 )	2026-03-16 09:55:09 -07:00
Jen Basch	3eda3b197e	Bump pkl.impl.ghactions to version 1.5.0 (#1460 )	2026-03-03 17:59:39 -08:00
Jen Basch	0e685591eb	Respect `--omit-project-settings` for all evaluator options (#1459 )	2026-03-03 16:23:42 -08:00
dependabot[bot]	51bb1a5c7e	Bump gradle/actions from 5.0.1 to 5.0.2 (#1456 )	2026-03-02 09:00:50 -08:00
layla	7c5a80a584	Fix typo: recieve to receive (#1455 )	2026-03-01 13:43:29 -08:00
Kushal Pisavadia	f9b880be85	Fix command `typealias` unwrapping in `resolveType` (#1449 ) The loop unwraps nullables and constraints but breaks straight away after a `typealias`. This means the nullable is missed. Removing the `break` fixes it. ## Exception ``` org.pkl.core.PklException: –– Pkl Error –– Command option property `foo` has unsupported type `String?`. 11 \| foo: OptionalString ^^^^^^^^^^^^^^^^^^^ at <unknown> (file:///var/folders/xh/lmp1n6qj4m13t53cfmbqnkwh0000gn/T/junit-1378070630576324311/cmd.pkl) Use a supported type or define a transformEach and/or transformAll function ```	2026-02-27 13:33:00 -08:00
Jen Basch	7119526245	Fix typo in 0.31 release notes (#1450 )	2026-02-27 13:18:10 -08:00
Kushal Pisavadia	64ea7951db	Fix stream double-consumption in `CommandSpecParser` (#1448 ) The `choices` stream was consumed eagerly for metavar construction, then captured in a lambda for later validation—which promptly fell over with `IllegalStateException`. Materialise to a `List` straightaway.	2026-02-27 10:04:32 +00:00
Islon Scherer	cac3e483b5	Start next dev iteration	2026-02-26 09:51:27 -08:00
Islon Scherer	4d35f18309	Prepare 0.31.0 release	2026-02-26 09:51:27 -08:00