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-06-11 16:23:01 +02:00 · 2026-04-14 11:57:09 -07:00
parent 20f403e751
commit 2d4286ee7b
49 changed files with 1347 additions and 1096 deletions
@@ -6,9 +6,9 @@ com.google.errorprone:error_prone_annotations:2.28.0=swiftExportClasspathResolva
 io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation
 io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable
 io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable
-net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
-org.assertj:assertj-core:3.27.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
+org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
+org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath
 org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration
 org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration
@@ -20,45 +20,55 @@ org.graalvm.sdk:graal-sdk:25.0.1=testRuntimeClasspath
 org.graalvm.sdk:nativeimage:25.0.1=testRuntimeClasspath
 org.graalvm.sdk:word:25.0.1=testRuntimeClasspath
 org.graalvm.truffle:truffle-api:25.0.1=testRuntimeClasspath
-org.jetbrains.kotlin:abi-tools-api:2.2.21=kotlinInternalAbiValidation
-org.jetbrains.kotlin:abi-tools:2.2.21=kotlinInternalAbiValidation
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.21=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.21=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.21=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.21=kotlinBuildToolsApiClasspath
-org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.21=kotlinKlibCommonizerClasspath
-org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.21=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools-api:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:abi-tools:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:kotlin-bom:2.2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-cri-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-client:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.20=kotlinInternalAbiValidation
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.20=kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20=kotlinInternalAbiValidation
 org.jetbrains.kotlin:kotlin-native-prebuilt:2.0.21=kotlinNativeBundleConfiguration
-org.jetbrains.kotlin:kotlin-reflect:2.2.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
-org.jetbrains.kotlin:kotlin-scripting-common:2.2.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.21=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:2.2.21=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-reflect:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.2.21=swiftExportClasspathResolvable
+org.jetbrains.kotlin:kotlin-script-runtime:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-scripting-common:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.20=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21=testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21=testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.2.21=swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath
+org.jetbrains.kotlin:kotlin-tooling-core:2.3.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath
 org.jetbrains.kotlin:swift-export-embeddable:2.2.21=swiftExportClasspathResolvable
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable
 org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable
 org.jetbrains:annotations:13.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable,testCompileClasspath,testRuntimeClasspath
-org.jspecify:jspecify:1.0.0=testCompileClasspath,testImplementationDependenciesMetadata
-org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:6.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:6.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+org.jspecify:jspecify:1.0.0=testCompileClasspath
+org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:6.0.3=testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath
-org.junit:junit-bom:6.0.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath
 org.msgpack:msgpack-core:0.9.11=testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.organicdesign:Paguro:3.10.3=testRuntimeClasspath
 org.pkl-lang:pkl-config-java-all:0.25.0=pklHistoricalDistributions
-org.slf4j:slf4j-api:2.0.17=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-org.slf4j:slf4j-simple:2.0.17=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-simple:2.0.17=testCompileClasspath,testRuntimeClasspath
 org.snakeyaml:snakeyaml-engine:2.10=testRuntimeClasspath
-empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,pklDistributionCurrent,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
+empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,pklDistributionCurrent,signatures,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,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,7 +20,6 @@ plugins {
  pklAllProjects
  pklJavaLibrary
  pklPublishLibrary
-  pklKotlinTest
 }

 val pklDistributionCurrent: Configuration by configurations.creating
@@ -55,7 +54,7 @@ publishing {
        description.set(
          """
          Library for executing Pkl code in a sandboxed environment.
-        """
+          """
            .trimIndent()
        )
      }
@@ -65,37 +64,37 @@ publishing {

 sourceSets { main { java { srcDir("src/main/java") } } }

-val prepareHistoricalDistributions by
-  tasks.registering {
-    val outputDir = layout.buildDirectory.dir("pklHistoricalDistributions")
-    inputs.files(pklHistoricalDistributions.files)
-    outputs.dir(outputDir)
-    doLast {
-      val distributionDir = outputDir.get().asFile.toPath().also(Files::createDirectories)
-      for (file in pklHistoricalDistributions.files) {
-        val target = distributionDir.resolve(file.name)
-        // Create normal files on Windows, symlink on macOS/linux (need admin privileges to create
-        // symlinks on Windows)
-        if (buildInfo.os.isWindows) {
-          if (!Files.isRegularFile(target, LinkOption.NOFOLLOW_LINKS)) {
-            if (Files.exists(target)) {
-              Files.delete(target)
-            }
-            Files.copy(file.toPath(), target)
+val prepareHistoricalDistributions by tasks.registering {
+  val outputDir = layout.buildDirectory.dir("pklHistoricalDistributions")
+  inputs.files(pklHistoricalDistributions.files)
+  outputs.dir(outputDir)
+  doLast {
+    val distributionDir = outputDir.get().asFile.toPath().also(Files::createDirectories)
+    for (file in pklHistoricalDistributions.files) {
+      val target = distributionDir.resolve(file.name)
+      // Create normal files on Windows, symlink on macOS/linux (need admin privileges to create
+      // symlinks on Windows)
+      if (buildInfo.os.isWindows) {
+        if (!Files.isRegularFile(target, LinkOption.NOFOLLOW_LINKS)) {
+          if (Files.exists(target)) {
+            Files.delete(target)
          }
-        } else {
-          if (!Files.isSymbolicLink(target)) {
-            if (Files.exists(target)) {
-              Files.delete(target)
-            }
-            Files.createSymbolicLink(target, file.toPath())
+          Files.copy(file.toPath(), target)
+        }
+      } else {
+        if (!Files.isSymbolicLink(target)) {
+          if (Files.exists(target)) {
+            Files.delete(target)
          }
+          Files.createSymbolicLink(target, file.toPath())
        }
      }
    }
  }
+}

-val prepareTest by
-  tasks.registering { dependsOn(pklDistributionCurrent, prepareHistoricalDistributions) }
+val prepareTest by tasks.registering {
+  dependsOn(pklDistributionCurrent, prepareHistoricalDistributions)
+}

 tasks.test { dependsOn(prepareTest) }
@@ -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.
@@ -48,7 +48,15 @@ class EmbeddedExecutorTest {
    private val executor: Executor,
    private val spiOptionsVersion: Int,
    private val name: String,
+    /**
+     * The maximum JVM version this executor is compatible with, e.g., because the Pkl
+     * distribution's Truffle version does not support newer versions.
+     */
+    private val maxJvmVersion: Int,
  ) {
+    val isCompatibleWithCurrentJvm: Boolean
+      get() = Runtime.version().feature() <= maxJvmVersion
+
    fun evaluatePath(modulePath: Path, optionSpec: ExecutorOptions.Builder.() -> Unit): String {
      val options =
        ExecutorOptions.builder().apply(optionSpec).spiOptionsVersion(spiOptionsVersion).build()
@@ -60,21 +68,22 @@ class EmbeddedExecutorTest {

  companion object {
    @JvmStatic
-    private val allTestExecutors: List<TestExecutor> by lazy {
+    private val compatibleTestExecutors: List<TestExecutor> by lazy {
      listOf(
-        TestExecutor(executor1_1.value, 1, "SpiOptions1, Executor1, Distribution1"),
+          TestExecutor(executor1_1.value, 1, "SpiOptions1, Executor1, Distribution1", 21),

-        // This context has a pkl-executor version that is lower than the distribution version.
-        TestExecutor(executor1_2.value, 1, "SpiOptions1, Executor1, Distribution2"),
-        TestExecutor(executor2_1.value, 1, "SpiOptions1, Executor2, Distribution1"),
-        TestExecutor(executor2_1.value, 3, "SpiOptions3, Executor2, Distribution1"),
-        TestExecutor(executor2_2.value, 1, "SpiOptions1, Executor2, Distribution2"),
-        TestExecutor(executor2_2.value, 3, "SpiOptions3, Executor2, Distribution2"),
-      )
+          // This context has a pkl-executor version that is lower than the distribution version.
+          TestExecutor(executor1_2.value, 1, "SpiOptions1, Executor1, Distribution2", 99),
+          TestExecutor(executor2_1.value, 1, "SpiOptions1, Executor2, Distribution1", 21),
+          TestExecutor(executor2_1.value, 3, "SpiOptions3, Executor2, Distribution1", 21),
+          TestExecutor(executor2_2.value, 1, "SpiOptions1, Executor2, Distribution2", 99),
+          TestExecutor(executor2_2.value, 3, "SpiOptions3, Executor2, Distribution2", 99),
+        )
+        .filter(TestExecutor::isCompatibleWithCurrentJvm)
    }

    private val currentExecutor: TestExecutor by lazy {
-      TestExecutor(executor2_2.value, -1, "currentExecutor")
+      TestExecutor(executor2_2.value, -1, "currentExecutor", 99)
    }

    // A pkl-executor library that supports ExecutorSpiOptions up to v1
@@ -151,8 +160,8 @@ class EmbeddedExecutorTest {
    assertThat(
        EmbeddedExecutor.extractMinPklVersion(
          """
-      @ModuleInfo { minPklVersion = "1.2.3" }
-    """
+          @ModuleInfo { minPklVersion = "1.2.3" }
+          """
            .trimIndent()
        )
      )
@@ -161,8 +170,8 @@ class EmbeddedExecutorTest {
    assertThat(
        EmbeddedExecutor.extractMinPklVersion(
          """
-      @ModuleInfo{minPklVersion="1.2.3"}
-    """
+          @ModuleInfo{minPklVersion="1.2.3"}
+          """
            .trimIndent()
        )
      )
@@ -171,8 +180,8 @@ class EmbeddedExecutorTest {
    assertThat(
        EmbeddedExecutor.extractMinPklVersion(
          """
-      @ModuleInfo   {   minPklVersion   =   "1.2.3"   }
-    """
+          @ModuleInfo   {   minPklVersion   =   "1.2.3"   }
+          """
            .trimIndent()
        )
      )
@@ -181,10 +190,10 @@ class EmbeddedExecutorTest {
    assertThat(
        EmbeddedExecutor.extractMinPklVersion(
          """
-      @ModuleInfo {
-          minPklVersion = "1.2.3"
-      }
-    """
+          @ModuleInfo {
+              minPklVersion = "1.2.3"
+          }
+          """
            .trimIndent()
        )
      )
@@ -193,11 +202,11 @@ class EmbeddedExecutorTest {
    assertThat(
        EmbeddedExecutor.extractMinPklVersion(
          """
-      @ModuleInfo {
-          author = "foo@bar.apple.com"
-          minPklVersion = "1.2.3"
-      }
-    """
+          @ModuleInfo {
+              author = "foo@bar.apple.com"
+              minPklVersion = "1.2.3"
+          }
+          """
            .trimIndent()
        )
      )
@@ -206,11 +215,11 @@ class EmbeddedExecutorTest {
    assertThat(
        EmbeddedExecutor.extractMinPklVersion(
          """
-      @ModuleInfo {
-          minPklVersion = "1.2.3"
-          author = "foo@bar.apple.com"
-      }
-    """
+          @ModuleInfo {
+              minPklVersion = "1.2.3"
+              author = "foo@bar.apple.com"
+          }
+          """
            .trimIndent()
        )
      )
@@ -239,7 +248,7 @@ class EmbeddedExecutorTest {
  }

  @ParameterizedTest
-  @MethodSource("getAllTestExecutors")
+  @MethodSource("getCompatibleTestExecutors")
  fun `evaluate a module that is missing a ModuleInfo annotation`(
    executor: TestExecutor,
    @TempDir tempDir: Path,
@@ -249,10 +258,10 @@ class EmbeddedExecutorTest {
      .toFile()
      .writeText(
        """
-      module test
+        module test

-      x = 1
-    """
+        x = 1
+        """
          .trimIndent()
      )

@@ -270,7 +279,7 @@ class EmbeddedExecutorTest {
  }

  @ParameterizedTest
-  @MethodSource("getAllTestExecutors")
+  @MethodSource("getCompatibleTestExecutors")
  fun `evaluate a module that requests an incompatible Pkl version`(
    executor: TestExecutor,
    @TempDir tempDir: Path,
@@ -280,11 +289,11 @@ class EmbeddedExecutorTest {
      .toFile()
      .writeText(
        """
-      @ModuleInfo { minPklVersion = "99.99.99" }
-      module test
+        @ModuleInfo { minPklVersion = "99.99.99" }
+        module test

-      x = 1
-    """
+        x = 1
+        """
          .trimIndent()
      )

@@ -302,7 +311,7 @@ class EmbeddedExecutorTest {
  }

  @ParameterizedTest
-  @MethodSource("getAllTestExecutors")
+  @MethodSource("getCompatibleTestExecutors")
  fun `evaluate a module that reads environment variables and external properties`(
    executor: TestExecutor,
    @TempDir tempDir: Path,
@@ -312,12 +321,12 @@ class EmbeddedExecutorTest {
      .toFile()
      .writeText(
        """
-      @ModuleInfo { minPklVersion = "0.11.0" }
-      module test
+        @ModuleInfo { minPklVersion = "0.11.0" }
+        module test

-      x = read("env:ENV_VAR")
-      y = read("prop:property")
-    """
+        x = read("env:ENV_VAR")
+        y = read("prop:property")
+        """
          .trimIndent()
      )

@@ -333,16 +342,16 @@ class EmbeddedExecutorTest {
    assertThat(result.trim())
      .isEqualTo(
        """
-      x = "ENV_VAR"
-      y = "property"
-    """
+        x = "ENV_VAR"
+        y = "property"
+        """
          .trimIndent()
          .trim()
      )
  }

  @ParameterizedTest
-  @MethodSource("getAllTestExecutors")
+  @MethodSource("getCompatibleTestExecutors")
  fun `evaluate a module that depends on another module`(
    executor: TestExecutor,
    @TempDir tempDir: Path,
@@ -352,13 +361,13 @@ class EmbeddedExecutorTest {
      .toFile()
      .writeText(
        """
-      @ModuleInfo { minPklVersion = "0.11.0" }
-      amends "template.pkl"
+        @ModuleInfo { minPklVersion = "0.11.0" }
+        amends "template.pkl"

-      foo {
-        bar = 42
-      }
-    """
+        foo {
+          bar = 42
+        }
+        """
          .trimIndent()
      )

@@ -367,12 +376,12 @@ class EmbeddedExecutorTest {
      .toFile()
      .writeText(
        """
-      foo: Foo
+        foo: Foo

-      class Foo {
-        bar: Int
-      }
-    """
+        class Foo {
+          bar: Int
+        }
+        """
          .trimIndent()
      )

@@ -385,28 +394,28 @@ class EmbeddedExecutorTest {
    assertThat(result.trim())
      .isEqualTo(
        """
-      foo {
-        bar = 42
-      }
-    """
+        foo {
+          bar = 42
+        }
+        """
          .trimIndent()
          .trim()
      )
  }

  @ParameterizedTest
-  @MethodSource("getAllTestExecutors")
+  @MethodSource("getCompatibleTestExecutors")
  fun `evaluate a module whose evaluation fails`(executor: TestExecutor, @TempDir tempDir: Path) {
    val pklFile = tempDir.resolve("test.pkl")
    pklFile
      .toFile()
      .writeText(
        """
-      @ModuleInfo { minPklVersion = "0.11.0" }
-      module test
+        @ModuleInfo { minPklVersion = "0.11.0" }
+        module test

-      foo = throw("ouch")
-    """
+        foo = throw("ouch")
+        """
          .trimIndent()
      )

@@ -427,7 +436,7 @@ class EmbeddedExecutorTest {
  }

  @ParameterizedTest
-  @MethodSource("getAllTestExecutors")
+  @MethodSource("getCompatibleTestExecutors")
  fun `evaluate a module whose project evaluation fails`(
    executor: TestExecutor,
    @TempDir tempDir: Path,
@@ -443,11 +452,11 @@ class EmbeddedExecutorTest {
      .toFile()
      .writeText(
        """
-      amends "pkl:Project"
-      dependencies {
-        ["myDep"] = import("../nonexistent/PklProject")
-      }
-    """
+        amends "pkl:Project"
+        dependencies {
+          ["myDep"] = import("../nonexistent/PklProject")
+        }
+        """
          .trimIndent()
      )

@@ -456,11 +465,11 @@ class EmbeddedExecutorTest {
      .toFile()
      .writeText(
        """
-      @ModuleInfo { minPklVersion = "0.11.0" }
-      module test
+        @ModuleInfo { minPklVersion = "0.11.0" }
+        module test

-      foo = "bar"
-    """
+        foo = "bar"
+        """
          .trimIndent()
      )

@@ -485,20 +494,20 @@ class EmbeddedExecutorTest {
  }

  @ParameterizedTest
-  @MethodSource("getAllTestExecutors")
+  @MethodSource("getCompatibleTestExecutors")
  fun `time out a module`(executor: TestExecutor, @TempDir tempDir: Path) {
    val pklFile = tempDir.resolve("test.pkl")
    pklFile
      .toFile()
      .writeText(
        """
-      @ModuleInfo { minPklVersion = "0.11.0" }
-      module test
+        @ModuleInfo { minPklVersion = "0.11.0" }
+        module test

-      x = fib(100)
+        x = fib(100)

-      function fib(n) = if (n < 2) n else fib(n - 1) + fib(n - 2)
-    """
+        function fib(n) = if (n < 2) n else fib(n - 1) + fib(n - 2)
+        """
          .trimIndent()
      )

@@ -523,13 +532,13 @@ class EmbeddedExecutorTest {
      .toFile()
      .writeText(
        """
-      @ModuleInfo { minPklVersion = "0.24.0" }
-      module MyModule
+        @ModuleInfo { minPklVersion = "0.24.0" }
+        module MyModule

-      import "package://localhost:0/birds@0.5.0#/Bird.pkl"
+        import "package://localhost:0/birds@0.5.0#/Bird.pkl"

-      chirpy = new Bird { name = "Chirpy"; favoriteFruit { name = "Orange" } }
-    """
+        chirpy = new Bird { name = "Chirpy"; favoriteFruit { name = "Orange" } }
+        """
          .trimIndent()
      )
    val result =
@@ -545,13 +554,13 @@ class EmbeddedExecutorTest {
    assertThat(result.trim())
      .isEqualTo(
        """
-      chirpy {
-        name = "Chirpy"
-        favoriteFruit {
-          name = "Orange"
+        chirpy {
+          name = "Chirpy"
+          favoriteFruit {
+            name = "Orange"
+          }
        }
-      }
-    """
+        """
          .trimIndent()
      )

@@ -566,7 +575,7 @@ class EmbeddedExecutorTest {
      """
      @ModuleInfo { minPklVersion = "0.29.0" }
      result = import("https://example.com/foo.pkl")
-    """
+      """
        .trimIndent()
    )
    assertThatCode {
@@ -582,7 +591,7 @@ class EmbeddedExecutorTest {
  }

  @ParameterizedTest
-  @MethodSource("getAllTestExecutors")
+  @MethodSource("getCompatibleTestExecutors")
  @DisabledOnOs(OS.WINDOWS, disabledReason = "Can't populate legacy cache dir on Windows")
  fun `evaluate a project dependency`(executor: TestExecutor, @TempDir tempDir: Path) {
    val cacheDir = tempDir.resolve("packages")
@@ -595,12 +604,12 @@ class EmbeddedExecutorTest {
      .toFile()
      .writeText(
        """
-      amends "pkl:Project"
-      
-      dependencies {
-        ["birds"] { uri = "package://localhost:0/birds@0.5.0" }
-      }
-    """
+        amends "pkl:Project"
+
+        dependencies {
+          ["birds"] { uri = "package://localhost:0/birds@0.5.0" }
+        }
+        """
          .trimIndent()
      )
    val dollar = '$'
@@ -638,11 +647,11 @@ class EmbeddedExecutorTest {
        """
        @ModuleInfo { minPklVersion = "0.24.0" }
        module myModule
-        
+
        import "@birds/catalog/Swallow.pkl"
-        
+
        result = Swallow
-      """
+        """
          .trimIndent()
      )
    val result =
@@ -655,14 +664,14 @@ class EmbeddedExecutorTest {
    assertThat(result)
      .isEqualTo(
        """
-      result {
-        name = "Swallow"
-        favoriteFruit {
-          name = "Apple"
+        result {
+          name = "Swallow"
+          favoriteFruit {
+            name = "Apple"
+          }
        }
-      }
-      
-    """
+
+        """
          .trimIndent()
      )
  }