Migrate Gradle deprecations (#1745)

bench/bench.gradle.kts

@@ -19,8 +19,8 @@ plugins {
   id("me.champeau.jmh")
 }
 
-val truffle: Configuration by configurations.creating
+val truffle: Configuration = configurations.create("truffle")
-val graal: Configuration by configurations.creating
+val graal: Configuration = configurations.create("graal")
 
 dependencies {
   jmh(projects.pklCore)

build-logic/src/main/kotlin/PklPublishing.kt

@@ -63,58 +63,60 @@ fun Project.configurePklPomMetadata() {
 
 /** Configures POM validation task to check for unresolved versions and snapshots in releases. */
 fun Project.configurePomValidation() {
-  val validatePom by tasks.registering {
+  val validatePom =
-    if (tasks.findByName("generatePomFileForLibraryPublication") == null) {
+    tasks.register("validatePom") {
-      return@registering
+      if (tasks.findByName("generatePomFileForLibraryPublication") == null) {
-    }
+        return@register
-    val generatePomFileForLibraryPublication by tasks.existing(GenerateMavenPom::class)
+      }
-    val outputFile =
+      val generatePomFileForLibraryPublication =
-      layout.buildDirectory.file("validatePom") // dummy output to satisfy up-to-date check
+        tasks.named<GenerateMavenPom>("generatePomFileForLibraryPublication")
+      val outputFile =
+        layout.buildDirectory.file("validatePom") // dummy output to satisfy up-to-date check
 
-    dependsOn(generatePomFileForLibraryPublication)
+      dependsOn(generatePomFileForLibraryPublication)
-    inputs.file(generatePomFileForLibraryPublication.get().destination)
+      inputs.file(generatePomFileForLibraryPublication.get().destination)
-    outputs.file(outputFile)
+      outputs.file(outputFile)
 
-    doLast {
+      doLast {
-      outputFile.get().asFile.delete()
+        outputFile.get().asFile.delete()
 
-      val pomFile = generatePomFileForLibraryPublication.get().destination
+        val pomFile = generatePomFileForLibraryPublication.get().destination
-      assert(pomFile.exists())
+        assert(pomFile.exists())
 
-      val text = pomFile.readText()
+        val text = pomFile.readText()
 
-      run {
+        run {
-        val unresolvedVersion = Regex("<version>.*[+,()\\[\\]].*</version>")
+          val unresolvedVersion = Regex("<version>.*[+,()\\[\\]].*</version>")
-        val matches = unresolvedVersion.findAll(text).toList()
+          val matches = unresolvedVersion.findAll(text).toList()
-        if (matches.isNotEmpty()) {
+          if (matches.isNotEmpty()) {
-          throw org.gradle.api.GradleException(
+            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>()
+        val buildInfo = project.extensions.getByType<BuildInfo>()
-      if (buildInfo.isReleaseBuild) {
+        if (buildInfo.isReleaseBuild) {
-        val snapshotVersion = Regex("<version>.*-SNAPSHOT</version>")
+          val snapshotVersion = Regex("<version>.*-SNAPSHOT</version>")
-        val matches = snapshotVersion.findAll(text).toList()
+          val matches = snapshotVersion.findAll(text).toList()
-        if (matches.isNotEmpty()) {
+          if (matches.isNotEmpty()) {
-          throw org.gradle.api.GradleException(
+            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) }
 }

build-logic/src/main/kotlin/pklAllProjects.gradle.kts

@@ -79,7 +79,7 @@ plugins.withType(MavenPublishPlugin::class).configureEach {
   }
 }
 
-val allDependencies by tasks.registering(DependencyReportTask::class)
+val allDependencies = tasks.register<DependencyReportTask>("allDependencies")
 
 tasks.withType(Test::class).configureEach {
   System.getProperty("testReportsDir")?.let { reportsDir ->

build-logic/src/main/kotlin/pklFatJar.gradle.kts

@@ -132,8 +132,8 @@ tasks.shadowJar {
 
 shadow { addShadowVariantIntoJavaComponent = false }
 
-val testFatJar by
+val testFatJar =
-  tasks.registering(Test::class) {
+  tasks.register<Test>("testFatJar") {
     testClassesDirs = files(tasks.test.get().testClassesDirs)
     classpath =
       // compiled test classes
@@ -148,47 +148,48 @@ val testFatJar by
 
 tasks.check { dependsOn(testFatJar) }
 
-val validateFatJar by tasks.registering {
+val validateFatJar =
-  val outputFile = layout.buildDirectory.file("validateFatJar/result.txt")
+  tasks.register("validateFatJar") {
-  inputs.files(tasks.shadowJar)
+    val outputFile = layout.buildDirectory.file("validateFatJar/result.txt")
-  inputs.property("nonRelocations", nonRelocations)
+    inputs.files(tasks.shadowJar)
-  outputs.file(outputFile)
+    inputs.property("nonRelocations", nonRelocations)
+    outputs.file(outputFile)
 
-  doLast {
+    doLast {
-    val unshadowedFiles = mutableListOf<String>()
+      val unshadowedFiles = mutableListOf<String>()
-    zipTree(tasks.shadowJar.get().outputs.files.singleFile).visit {
+      zipTree(tasks.shadowJar.get().outputs.files.singleFile).visit {
-      val fileDetails = this
+        val fileDetails = this
-      val path = fileDetails.relativePath.pathString
+        val path = fileDetails.relativePath.pathString
-      if (
+        if (
-        !(fileDetails.isDirectory ||
+          !(fileDetails.isDirectory ||
-          path.startsWith("org/pkl/") ||
+            path.startsWith("org/pkl/") ||
-          path.startsWith("META-INF/") ||
+            path.startsWith("META-INF/") ||
-          nonRelocations.any { path.startsWith(it) })
+            nonRelocations.any { path.startsWith(it) })
-      ) {
+        ) {
-        // don't throw exception inside `visit`
+          // don't throw exception inside `visit`
-        // as this gives a misleading "Could not expand ZIP" error message
+          // as this gives a misleading "Could not expand ZIP" error message
-        unshadowedFiles.add(path)
+          unshadowedFiles.add(path)
+        }
+      }
+      if (unshadowedFiles.isEmpty()) {
+        outputFile.get().asFile.writeText("SUCCESS")
+      } else {
+        outputFile.get().asFile.writeText("FAILURE")
+        throw GradleException("Found unshadowed files:\n" + unshadowedFiles.joinToString("\n"))
       }
     }
-    if (unshadowedFiles.isEmpty()) {
-      outputFile.get().asFile.writeText("SUCCESS")
-    } else {
-      outputFile.get().asFile.writeText("FAILURE")
-      throw GradleException("Found unshadowed files:\n" + unshadowedFiles.joinToString("\n"))
-    }
   }
-}
 
 tasks.check { dependsOn(validateFatJar) }
 
-val resolveSourcesJars by
+val resolveSourcesJars =
-  tasks.registering(ResolveSourcesJars::class) {
+  tasks.register<ResolveSourcesJars>("resolveSourcesJars") {
     configuration.set(configurations.runtimeClasspath)
     outputDir.set(layout.buildDirectory.dir("resolveSourcesJars"))
   }
 
-val fatSourcesJar by
+val fatSourcesJar =
-  tasks.registering(MergeSourcesJars::class) {
+  tasks.register<MergeSourcesJars>("fatSourcesJar") {
     plugins.withId("pklJavaLibrary") { inputJars.from(tasks.named("sourcesJar")) }
     inputJars.from(firstPartySourcesJarsConfiguration)
     inputJars.from(resolveSourcesJars.map { fileTree(it.outputDir) })
@@ -213,7 +214,7 @@ publishing {
       artifact(fatSourcesJar.flatMap { it.outputJar.asFile }) { classifier = "sources" }
 
       plugins.withId("pklJavaLibrary") {
-        val javadocJar by tasks.existing(Jar::class)
+        val javadocJar = tasks.named<Jar>("javadocJar")
         // Javadoc Jar is not fat (didn't invest effort)
         artifact(javadocJar.flatMap { it.archiveFile }) { classifier = "javadoc" }
       }

build-logic/src/main/kotlin/pklGraalVm.gradle.kts

@@ -21,11 +21,15 @@ plugins { id("de.undercouch.download") }
 val buildInfo = project.extensions.getByType<BuildInfo>()
 
 // tries to minimize chance of corruption by download-to-temp-file-and-move
-val downloadGraalVmAarch64 by
+val downloadGraalVmAarch64 =
-  tasks.registering(Download::class) { configureDownloadGraalVm(buildInfo.graalVmAarch64) }
+  tasks.register<Download>("downloadGraalVmAarch64") {
+    configureDownloadGraalVm(buildInfo.graalVmAarch64)
+  }
 
-val downloadGraalVmAmd64 by
+val downloadGraalVmAmd64 =
-  tasks.registering(Download::class) { configureDownloadGraalVm(buildInfo.graalVmAmd64) }
+  tasks.register<Download>("downloadGraalVmAmd64") {
+    configureDownloadGraalVm(buildInfo.graalVmAmd64)
+  }
 
 fun Download.configureDownloadGraalVm(graalvm: BuildInfo.GraalVm) {
   onlyIf { !graalvm.installDir.exists() }
@@ -37,14 +41,14 @@ fun Download.configureDownloadGraalVm(graalvm: BuildInfo.GraalVm) {
   tempAndMove(true)
 }
 
-val verifyGraalVmAarch64 by
+val verifyGraalVmAarch64 =
-  tasks.registering(Verify::class) {
+  tasks.register<Verify>("verifyGraalVmAarch64") {
     configureVerifyGraalVm(buildInfo.graalVmAarch64)
     dependsOn(downloadGraalVmAarch64)
   }
 
-val verifyGraalVmAmd64 by
+val verifyGraalVmAmd64 =
-  tasks.registering(Verify::class) {
+  tasks.register<Verify>("verifyGraalVmAmd64") {
     configureVerifyGraalVm(buildInfo.graalVmAmd64)
     dependsOn(downloadGraalVmAmd64)
   }
@@ -60,15 +64,15 @@ fun Verify.configureVerifyGraalVm(graalvm: BuildInfo.GraalVm) {
 }
 
 @Suppress("unused")
-val installGraalVmAarch64 by
+val installGraalVmAarch64 =
-  tasks.registering(InstallGraalVm::class) {
+  tasks.register<InstallGraalVm>("installGraalVmAarch64") {
     dependsOn(verifyGraalVmAarch64)
     graalVm = buildInfo.graalVmAarch64
   }
 
 @Suppress("unused")
-val installGraalVmAmd64 by
+val installGraalVmAmd64 =
-  tasks.registering(InstallGraalVm::class) {
+  tasks.register<InstallGraalVm>("installGraalVmAmd64") {
     dependsOn(verifyGraalVmAmd64)
     graalVm = buildInfo.graalVmAmd64
   }

build-logic/src/main/kotlin/pklHtmlValidator.gradle.kts

@@ -47,8 +47,8 @@ dependencies {
   }
 }
 
-val validateHtml by
+val validateHtml =
-  tasks.registering(JavaExec::class) {
+  tasks.register<JavaExec>("validateHtml") {
     val resultFile = layout.buildDirectory.file("validateHtml/result.txt")
     inputs.files(htmlValidator.sources)
     outputs.file(resultFile)

build-logic/src/main/kotlin/pklJavaExecutable.gradle.kts

@@ -26,8 +26,8 @@ plugins {
 val executableSpec = project.extensions.create("executable", ExecutableSpec::class.java)
 val buildInfo = project.extensions.getByType<BuildInfo>()
 
-val javaExecutable by
+val javaExecutable =
-  tasks.registering(ExecutableJar::class) {
+  tasks.register<ExecutableJar>("javaExecutable") {
     group = "build"
     dependsOn(tasks.jar)
     inJar = tasks.shadowJar.flatMap { it.archiveFile }
@@ -77,7 +77,8 @@ fun Task.setupTestStartJavaExecutable(launcher: Provider<JavaLauncher>? = null)
   }
 }
 
-val testStartJavaExecutable by tasks.registering { setupTestStartJavaExecutable() }
+val testStartJavaExecutable =
+  tasks.register("testStartJavaExecutable") { setupTestStartJavaExecutable() }
 
 // Setup `testStartJavaExecutable` tasks for multi-JDK testing.
 val testStartJavaExecutableOnOtherJdks =

build-logic/src/main/kotlin/pklNativeExecutable.gradle.kts

@@ -30,22 +30,26 @@ plugins {
 val executableSpec = project.extensions.getByType<ExecutableSpec>()
 val buildInfo = project.extensions.getByType<BuildInfo>()
 
-val stagedMacAmd64Executable: Configuration by configurations.creating
+val stagedMacAmd64Executable: Configuration = configurations.create("stagedMacAmd64Executable")
-val stagedMacAarch64Executable: Configuration by configurations.creating
+val stagedMacAarch64Executable: Configuration = configurations.create("stagedMacAarch64Executable")
-val stagedLinuxAmd64Executable: Configuration by configurations.creating
+val stagedLinuxAmd64Executable: Configuration = configurations.create("stagedLinuxAmd64Executable")
-val stagedLinuxAarch64Executable: Configuration by configurations.creating
+val stagedLinuxAarch64Executable: Configuration =
-val stagedAlpineLinuxAmd64Executable: Configuration by configurations.creating
+  configurations.create("stagedLinuxAarch64Executable")
-val stagedWindowsAmd64Executable: Configuration by configurations.creating
+val stagedAlpineLinuxAmd64Executable: Configuration =
+  configurations.create("stagedAlpineLinuxAmd64Executable")
+val stagedWindowsAmd64Executable: Configuration =
+  configurations.create("stagedWindowsAmd64Executable")
 
-val nativeImageClasspath by configurations.creating {
+val nativeImageClasspath =
-  extendsFrom(configurations.runtimeClasspath.get())
+  configurations.create("nativeImageClasspath") {
-  // Ensure native-image version uses GraalVM C SDKs instead of Java FFI or JNA
+    extendsFrom(configurations.runtimeClasspath.get())
-  // (comes from artifact `mordant-jvm-graal-ffi`).
+    // Ensure native-image version uses GraalVM C SDKs instead of Java FFI or JNA
-  exclude("com.github.ajalt.mordant", "mordant-jvm-ffm")
+    // (comes from artifact `mordant-jvm-graal-ffi`).
-  exclude("com.github.ajalt.mordant", "mordant-jvm-ffm-jvm")
+    exclude("com.github.ajalt.mordant", "mordant-jvm-ffm")
-  exclude("com.github.ajalt.mordant", "mordant-jvm-jna")
+    exclude("com.github.ajalt.mordant", "mordant-jvm-ffm-jvm")
-  exclude("com.github.ajalt.mordant", "mordant-jvm-jna-jvm")
+    exclude("com.github.ajalt.mordant", "mordant-jvm-jna")
-}
+    exclude("com.github.ajalt.mordant", "mordant-jvm-jna-jvm")
+  }
 
 val libs = the<LibrariesForLibs>()
 
@@ -85,32 +89,32 @@ private fun NativeImageBuild.setClasspath() {
   classpath.from(nativeImageClasspath)
 }
 
-val macExecutableAmd64 by
+val macExecutableAmd64 =
-  tasks.registering(NativeImageBuild::class) {
+  tasks.register<NativeImageBuild>("macExecutableAmd64") {
     imageName = executableSpec.name.map { "$it-macos-amd64" }
     mainClass = executableSpec.mainClass
     amd64()
     setClasspath()
   }
 
-val macExecutableAarch64 by
+val macExecutableAarch64 =
-  tasks.registering(NativeImageBuild::class) {
+  tasks.register<NativeImageBuild>("macExecutableAarch64") {
     imageName = executableSpec.name.map { "$it-macos-aarch64" }
     mainClass = executableSpec.mainClass
     aarch64()
     setClasspath()
   }
 
-val linuxExecutableAmd64 by
+val linuxExecutableAmd64 =
-  tasks.registering(NativeImageBuild::class) {
+  tasks.register<NativeImageBuild>("linuxExecutableAmd64") {
     imageName = executableSpec.name.map { "$it-linux-amd64" }
     mainClass = executableSpec.mainClass
     amd64()
     setClasspath()
   }
 
-val linuxExecutableAarch64 by
+val linuxExecutableAarch64 =
-  tasks.registering(NativeImageBuild::class) {
+  tasks.register<NativeImageBuild>("linuxExecutableAarch64") {
     imageName = executableSpec.name.map { "$it-linux-aarch64" }
     mainClass = executableSpec.mainClass
     aarch64()
@@ -120,8 +124,8 @@ val linuxExecutableAarch64 by
     extraNativeImageArgs.add("-H:PageSize=65536")
   }
 
-val alpineExecutableAmd64 by
+val alpineExecutableAmd64 =
-  tasks.registering(NativeImageBuild::class) {
+  tasks.register<NativeImageBuild>("alpineExecutableAmd64") {
     imageName = executableSpec.name.map { "$it-alpine-linux-amd64" }
     mainClass = executableSpec.mainClass
     amd64()
@@ -129,73 +133,75 @@ val alpineExecutableAmd64 by
     extraNativeImageArgs.addAll(listOf("--static", "--libc=musl"))
   }
 
-val windowsExecutableAmd64 by
+val windowsExecutableAmd64 =
-  tasks.registering(NativeImageBuild::class) {
+  tasks.register<NativeImageBuild>("windowsExecutableAmd64") {
     imageName = executableSpec.name.map { "$it-windows-amd64" }
     mainClass = executableSpec.mainClass
     amd64()
     setClasspath()
   }
 
-val assembleNative by tasks.existing
+val assembleNative = tasks.named("assembleNative")
 
-val testStartNativeExecutable by tasks.registering {
+val testStartNativeExecutable =
-  dependsOn(assembleNative)
+  tasks.register("testStartNativeExecutable") {
+    dependsOn(assembleNative)
 
-  // dummy file for up-to-date checking
+    // dummy file for up-to-date checking
-  val outputFile = project.layout.buildDirectory.file("testStartNativeExecutable/output.txt")
+    val outputFile = project.layout.buildDirectory.file("testStartNativeExecutable/output.txt")
-  outputs.file(outputFile)
+    outputs.file(outputFile)
 
-  val execOutput = providers.exec {
+    val execOutput = providers.exec {
-    commandLine(assembleNative.get().outputs.files.singleFile, "--version")
+      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 {
+    doLast {
-        parent.createDirectories()
+      val outputText = execOutput.standardOutput.asText.get()
-      } catch (_: java.nio.file.FileAlreadyExistsException) {}
+      if (!outputText.contains(buildInfo.pklVersionNonUnique)) {
-      writeText("OK")
+        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 {
+val checkGlibc =
-  enabled = buildInfo.os.isLinux && !buildInfo.musl
+  tasks.register("checkGlibc") {
-  dependsOn(assembleNative)
+    enabled = buildInfo.os.isLinux && !buildInfo.musl
-  doLast {
+    dependsOn(assembleNative)
-    val exec = providers.exec {
+    doLast {
-      commandLine("objdump", "-T", assembleNative.get().outputs.files.singleFile)
+      val exec = providers.exec {
-    }
+        commandLine("objdump", "-T", assembleNative.get().outputs.files.singleFile)
-    val output = exec.standardOutput.asText.get()
+      }
-    val minimumGlibcVersion =
+      val output = exec.standardOutput.asText.get()
-      output
+      val minimumGlibcVersion =
-        .split("\n")
+        output
-        .mapNotNull { line ->
+          .split("\n")
-          val match = Regex("GLIBC_([.0-9]*)").find(line)
+          .mapNotNull { line ->
-          match?.groups[1]?.let { Version.parse(it.value) }
+            val match = Regex("GLIBC_([.0-9]*)").find(line)
-        }
+            match?.groups[1]?.let { Version.parse(it.value) }
-        .maxOrNull()
+          }
-    if (minimumGlibcVersion == null) {
+          .maxOrNull()
-      throw GradleException(
+      if (minimumGlibcVersion == null) {
-        "Could not determine glibc version from executable. objdump output: $output"
+        throw GradleException(
-      )
+          "Could not determine glibc version from executable. objdump output: $output"
-    }
+        )
-    if (minimumGlibcVersion > requiredGlibcVersion) {
+      }
-      throw GradleException(
+      if (minimumGlibcVersion > requiredGlibcVersion) {
-        "Incorrect glibc version. Found: $minimumGlibcVersion, required: $requiredGlibcVersion"
+        throw GradleException(
-      )
+          "Incorrect glibc version. Found: $minimumGlibcVersion, required: $requiredGlibcVersion"
+        )
+      }
     }
   }
-}
 
 // Expose underlying task's outputs
 private fun <T : Task> Task.wraps(other: TaskProvider<T>) {
@@ -203,19 +209,24 @@ private fun <T : Task> Task.wraps(other: TaskProvider<T>) {
   outputs.files(other)
 }
 
-val testNative by tasks.existing { dependsOn(testStartNativeExecutable, checkGlibc) }
+val testNative = tasks.named("testNative") { dependsOn(testStartNativeExecutable, checkGlibc) }
 
-val assembleNativeMacOsAarch64 by tasks.existing { wraps(macExecutableAarch64) }
+val assembleNativeMacOsAarch64 =
+  tasks.named("assembleNativeMacOsAarch64") { wraps(macExecutableAarch64) }
 
-val assembleNativeMacOsAmd64 by tasks.existing { wraps(macExecutableAmd64) }
+val assembleNativeMacOsAmd64 = tasks.named("assembleNativeMacOsAmd64") { wraps(macExecutableAmd64) }
 
-val assembleNativeLinuxAarch64 by tasks.existing { wraps(linuxExecutableAarch64) }
+val assembleNativeLinuxAarch64 =
+  tasks.named("assembleNativeLinuxAarch64") { wraps(linuxExecutableAarch64) }
 
-val assembleNativeLinuxAmd64 by tasks.existing { wraps(linuxExecutableAmd64) }
+val assembleNativeLinuxAmd64 =
+  tasks.named("assembleNativeLinuxAmd64") { wraps(linuxExecutableAmd64) }
 
-val assembleNativeAlpineLinuxAmd64 by tasks.existing { wraps(alpineExecutableAmd64) }
+val assembleNativeAlpineLinuxAmd64 =
+  tasks.named("assembleNativeAlpineLinuxAmd64") { wraps(alpineExecutableAmd64) }
 
-val assembleNativeWindowsAmd64 by tasks.existing { wraps(windowsExecutableAmd64) }
+val assembleNativeWindowsAmd64 =
+  tasks.named("assembleNativeWindowsAmd64") { wraps(windowsExecutableAmd64) }
 
 publishing {
   publications {

build-logic/src/main/kotlin/pklNativeLifecycle.gradle.kts

@@ -13,29 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-val assembleNativeMacOsAarch64 by tasks.registering { group = "build" }
+val assembleNativeMacOsAarch64 = tasks.register("assembleNativeMacOsAarch64") { group = "build" }
 
-val assembleNativeMacOsAmd64 by tasks.registering { group = "build" }
+val assembleNativeMacOsAmd64 = tasks.register("assembleNativeMacOsAmd64") { group = "build" }
 
-val assembleNativeLinuxAarch64 by tasks.registering { group = "build" }
+val assembleNativeLinuxAarch64 = tasks.register("assembleNativeLinuxAarch64") { group = "build" }
 
-val assembleNativeLinuxAmd64 by tasks.registering { group = "build" }
+val assembleNativeLinuxAmd64 = tasks.register("assembleNativeLinuxAmd64") { group = "build" }
 
-val assembleNativeAlpineLinuxAmd64 by tasks.registering { group = "build" }
+val assembleNativeAlpineLinuxAmd64 =
+  tasks.register("assembleNativeAlpineLinuxAmd64") { group = "build" }
 
-val assembleNativeWindowsAmd64 by tasks.registering { group = "build" }
+val assembleNativeWindowsAmd64 = tasks.register("assembleNativeWindowsAmd64") { group = "build" }
 
-val testNativeMacOsAarch64 by tasks.registering { group = "verification" }
+val testNativeMacOsAarch64 = tasks.register("testNativeMacOsAarch64") { group = "verification" }
 
-val testNativeMacOsAmd64 by tasks.registering { group = "verification" }
+val testNativeMacOsAmd64 = tasks.register("testNativeMacOsAmd64") { group = "verification" }
 
-val testNativeLinuxAarch64 by tasks.registering { group = "verification" }
+val testNativeLinuxAarch64 = tasks.register("testNativeLinuxAarch64") { group = "verification" }
 
-val testNativeLinuxAmd64 by tasks.registering { group = "verification" }
+val testNativeLinuxAmd64 = tasks.register("testNativeLinuxAmd64") { group = "verification" }
 
-val testNativeAlpineLinuxAmd64 by tasks.registering { group = "verification" }
+val testNativeAlpineLinuxAmd64 =
+  tasks.register("testNativeAlpineLinuxAmd64") { group = "verification" }
 
-val testNativeWindowsAmd64 by tasks.registering { group = "verification" }
+val testNativeWindowsAmd64 = tasks.register("testNativeWindowsAmd64") { group = "verification" }
 
 val buildInfo = project.extensions.getByType<BuildInfo>()
 
@@ -44,79 +46,85 @@ private fun <T : Task> Task.wraps(other: TaskProvider<T>) {
   outputs.files(other)
 }
 
-val assembleNative by tasks.registering {
+val assembleNative =
-  group = "build"
+  tasks.register("assembleNative") {
+    group = "build"
 
-  if (!buildInfo.isCrossArchSupported && buildInfo.isCrossArch) {
+    if (!buildInfo.isCrossArchSupported && buildInfo.isCrossArch) {
-    throw GradleException("Cross-arch builds are not supported on ${buildInfo.os.name}")
+      throw GradleException("Cross-arch builds are not supported on ${buildInfo.os.name}")
-  }
+    }
 
-  when {
+    when {
-    buildInfo.os.isMacOsX && buildInfo.targetArch == "aarch64" -> {
+      buildInfo.os.isMacOsX && buildInfo.targetArch == "aarch64" -> {
-      wraps(assembleNativeMacOsAarch64)
+        wraps(assembleNativeMacOsAarch64)
-    }
+      }
-    buildInfo.os.isMacOsX && buildInfo.targetArch == "amd64" -> {
+      buildInfo.os.isMacOsX && buildInfo.targetArch == "amd64" -> {
-      wraps(assembleNativeMacOsAmd64)
+        wraps(assembleNativeMacOsAmd64)
-    }
+      }
-    buildInfo.os.isLinux && buildInfo.targetArch == "aarch64" -> {
+      buildInfo.os.isLinux && buildInfo.targetArch == "aarch64" -> {
-      wraps(assembleNativeLinuxAarch64)
+        wraps(assembleNativeLinuxAarch64)
-    }
+      }
-    buildInfo.os.isLinux && buildInfo.targetArch == "amd64" -> {
+      buildInfo.os.isLinux && buildInfo.targetArch == "amd64" -> {
-      if (buildInfo.musl) wraps(assembleNativeAlpineLinuxAmd64) else wraps(assembleNativeLinuxAmd64)
+        if (buildInfo.musl) wraps(assembleNativeAlpineLinuxAmd64)
-    }
+        else wraps(assembleNativeLinuxAmd64)
-    buildInfo.os.isWindows && buildInfo.targetArch == "amd64" -> {
+      }
-      wraps(assembleNativeWindowsAmd64)
+      buildInfo.os.isWindows && buildInfo.targetArch == "amd64" -> {
-    }
+        wraps(assembleNativeWindowsAmd64)
-    else -> {
+      }
-      doLast {
+      else -> {
-        throw GradleException(
+        doLast {
-          "Cannot build targeting ${buildInfo.os.name}/${buildInfo.targetArch} with musl=${buildInfo.musl}"
+          throw GradleException(
-        )
+            "Cannot build targeting ${buildInfo.os.name}/${buildInfo.targetArch} with musl=${buildInfo.musl}"
+          )
+        }
       }
     }
   }
-}
 
-val testNative by tasks.registering {
+val testNative =
-  group = "verification"
+  tasks.register("testNative") {
-  dependsOn(assembleNative)
+    group = "verification"
+    dependsOn(assembleNative)
 
-  if (!buildInfo.isCrossArchSupported && buildInfo.isCrossArch) {
+    if (!buildInfo.isCrossArchSupported && buildInfo.isCrossArch) {
-    throw GradleException("Cross-arch builds are not supported on ${buildInfo.os.name}")
+      throw GradleException("Cross-arch builds are not supported on ${buildInfo.os.name}")
-  }
+    }
 
-  when {
+    when {
-    buildInfo.os.isMacOsX && buildInfo.targetArch == "aarch64" -> {
+      buildInfo.os.isMacOsX && buildInfo.targetArch == "aarch64" -> {
-      dependsOn(testNativeMacOsAarch64)
+        dependsOn(testNativeMacOsAarch64)
-    }
+      }
-    buildInfo.os.isMacOsX && buildInfo.targetArch == "amd64" -> {
+      buildInfo.os.isMacOsX && buildInfo.targetArch == "amd64" -> {
-      dependsOn(testNativeMacOsAmd64)
+        dependsOn(testNativeMacOsAmd64)
-    }
+      }
-    buildInfo.os.isLinux && buildInfo.targetArch == "aarch64" -> {
+      buildInfo.os.isLinux && buildInfo.targetArch == "aarch64" -> {
-      dependsOn(testNativeLinuxAarch64)
+        dependsOn(testNativeLinuxAarch64)
-    }
+      }
-    buildInfo.os.isLinux && buildInfo.targetArch == "amd64" -> {
+      buildInfo.os.isLinux && buildInfo.targetArch == "amd64" -> {
-      if (buildInfo.musl) dependsOn(testNativeAlpineLinuxAmd64) else dependsOn(testNativeLinuxAmd64)
+        if (buildInfo.musl) dependsOn(testNativeAlpineLinuxAmd64)
-    }
+        else dependsOn(testNativeLinuxAmd64)
-    buildInfo.os.isWindows && buildInfo.targetArch == "amd64" -> {
+      }
-      dependsOn(testNativeWindowsAmd64)
+      buildInfo.os.isWindows && buildInfo.targetArch == "amd64" -> {
-    }
+        dependsOn(testNativeWindowsAmd64)
-    else -> {
+      }
-      doLast {
+      else -> {
-        throw GradleException(
+        doLast {
-          "Cannot build targeting ${buildInfo.os.name}/${buildInfo.targetArch} with musl=${buildInfo.musl}"
+          throw GradleException(
-        )
+            "Cannot build targeting ${buildInfo.os.name}/${buildInfo.targetArch} with musl=${buildInfo.musl}"
+          )
+        }
       }
     }
   }
-}
 
-val checkNative by tasks.registering {
+val checkNative =
-  group = "verification"
+  tasks.register("checkNative") {
-  dependsOn(testNative)
+    group = "verification"
-}
+    dependsOn(testNative)
+  }
 
-val buildNative by tasks.registering {
+val buildNative =
-  group = "build"
+  tasks.register("buildNative") {
-  dependsOn(checkNative)
+    group = "build"
-}
+    dependsOn(checkNative)
+  }

build-logic/src/main/kotlin/pklSpotlessFormat.gradle.kts

@@ -15,7 +15,7 @@
  */
 plugins { id("com.diffplug.spotless") }
 
-val pklFormatter by configurations.creating
+val pklFormatter = configurations.create("pklFormatter")
 
 dependencies { pklFormatter(rootProject.project("pkl-formatter")) }
 

build.gradle.kts

@@ -37,7 +37,8 @@ nexusPublishing {
   }
 }
 
-val configureLateInitAnnotation by tasks.registering(ConfigureLateInitAnnotation::class)
+val configureLateInitAnnotation =
+  tasks.register<ConfigureLateInitAnnotation>("configureLateInitAnnotation")
 
 idea {
   project {
@@ -53,9 +54,9 @@ idea {
   }
 }
 
-val clean by tasks.existing { delete(layout.buildDirectory) }
+val clean = tasks.named("clean") { delete(layout.buildDirectory) }
 
-val printVersion by tasks.registering { doFirst { println(buildInfo.pklVersion) } }
+val printVersion = tasks.register("printVersion") { doFirst { println(buildInfo.pklVersion) } }
 
 val message =
   """

pkl-cli/pkl-cli.gradle.kts

@@ -83,8 +83,8 @@ tasks.shadowJar {
   exclude("module-info.*")
 }
 
-val testJavaExecutable by
+val testJavaExecutable =
-  tasks.registering(Test::class) {
+  tasks.register<Test>("testJavaExecutable") {
     testClassesDirs = tasks.test.get().testClassesDirs
     classpath =
       // compiled test classes
@@ -138,7 +138,7 @@ fun Exec.useRootDirAndSuppressOutput() {
 
 // 0.28 Preparing for JDK21 toolchains revealed that `testStartJavaExecutable` may pass, even though
 // the evaluator fails. To catch this, we eval a simple expression using the fat jar.
-val testEvalJavaExecutable by
+val testEvalJavaExecutable =
   setupJavaExecutableRun("testEvalJavaExecutable", evalTestFlags) { useRootDirAndSuppressOutput() }
 
 // Run the same evaluator tests on all configured JDK test versions.

pkl-commons-cli/pkl-commons-cli.gradle.kts

@@ -19,10 +19,11 @@ plugins {
   id("pklPublishLibrary")
 }
 
-val svmClasspath: Configuration by configurations.creating
+val svmClasspath: Configuration = configurations.create("svmClasspath")
 
 // used by pklNativeExecutable.gradle.kts
-@Suppress("unused") val svm: SourceSet by sourceSets.creating { compileClasspath = svmClasspath }
+@Suppress("unused")
+val svm: SourceSet = sourceSets.create("svm") { compileClasspath = svmClasspath }
 
 dependencies {
   api(projects.pklCore)

pkl-commons-test/pkl-commons-test.gradle.kts

@@ -37,7 +37,7 @@ dependencies {
  * These packages are used by PackageServer to serve assets when running LanguageSnippetTests and
  * PackageResolversTest.
  */
-val createTestPackages by tasks.registering
+val createTestPackages = tasks.register("createTestPackages")
 
 // make sure that declaring a dependency on this project suffices to have test fixtures generated
 tasks.processResources {
@@ -92,8 +92,8 @@ val keystoreName = "localhost.p12"
 val keystoreFile = keystoreDir.map { it.file(keystoreName) }
 val certsFileName = "localhost.pem"
 
-val generateKeys by
+val generateKeys =
-  tasks.registering(JavaExec::class) {
+  tasks.register<JavaExec>("generateKeys") {
     outputs.file(keystoreFile)
     mainClass.set("sun.security.tools.keytool.Main")
     args =
@@ -117,8 +117,8 @@ val generateKeys by
     }
   }
 
-val exportCerts by
+val exportCerts =
-  tasks.registering(JavaExec::class) {
+  tasks.register<JavaExec>("exportCerts") {
     val outputFile = keystoreDir.map { it.file(certsFileName) }
     dependsOn(generateKeys)
     inputs.file(keystoreFile)

pkl-config-kotlin/pkl-config-kotlin.gradle.kts

@@ -19,11 +19,11 @@ plugins {
   id("pklPublishLibrary")
 }
 
-val pklConfigJava: Configuration by configurations.creating
+val pklConfigJava: Configuration = configurations.create("pklConfigJava")
 
-val pklConfigJavaAll: Configuration by configurations.creating
+val pklConfigJavaAll: Configuration = configurations.create("pklConfigJavaAll")
 
-val pklCodegenKotlin: Configuration by configurations.creating
+val pklCodegenKotlin: Configuration = configurations.create("pklCodegenKotlin")
 
 val buildInfo = project.extensions.getByType<BuildInfo>()
 
@@ -49,8 +49,8 @@ dependencies {
   testImplementation(libs.geantyref)
 }
 
-val generateTestConfigClasses by
+val generateTestConfigClasses =
-  tasks.registering(JavaExec::class) {
+  tasks.register<JavaExec>("generateTestConfigClasses") {
     val outputDir = layout.buildDirectory.dir("testConfigClasses")
     outputs.dir(outputDir)
     inputs.dir("src/test/resources/codegenPkl")

pkl-core/pkl-core.gradle.kts

@@ -35,9 +35,10 @@ val externalReaderFixtureSourceSet: NamedDomainObjectProvider<SourceSet> =
     runtimeClasspath += sourceSets.test.get().output + sourceSets.test.get().runtimeClasspath
   }
 
-val externalReaderFixtureImplementation: Configuration by configurations.getting {
+val externalReaderFixtureImplementation: Configuration =
-  extendsFrom(configurations.testImplementation.get())
+  configurations.getByName("externalReaderFixtureImplementation") {
-}
+    extendsFrom(configurations.testImplementation.get())
+  }
 
 idea {
   module {

pkl-doc/pkl-doc.gradle.kts

@@ -78,8 +78,8 @@ tasks.test {
   inputs.dir("src/test/files/SinglePackageTest/output")
 }
 
-val testNativeExecutable by
+val testNativeExecutable =
-  tasks.registering(Test::class) {
+  tasks.register<Test>("testNativeExecutable") {
     dependsOn(tasks.assembleNative)
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
@@ -91,8 +91,8 @@ val testNativeExecutable by
     filter { includeTestsMatching("org.pkl.doc.NativeExecutableTest") }
   }
 
-val testJavaExecutable by
+val testJavaExecutable =
-  tasks.registering(Test::class) {
+  tasks.register<Test>("testJavaExecutable") {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 

pkl-executor/pkl-executor.gradle.kts

@@ -23,8 +23,8 @@ plugins {
   id("pklJSpecify")
 }
 
-val pklDistributionCurrent: Configuration by configurations.creating
+val pklDistributionCurrent: Configuration = configurations.create("pklDistributionCurrent")
-val pklHistoricalDistributions: Configuration by configurations.creating
+val pklHistoricalDistributions: Configuration = configurations.create("pklHistoricalDistributions")
 
 // Because pkl-executor doesn't depend on other Pkl modules
 // (nor has overlapping dependencies that could cause a version conflict),
@@ -66,37 +66,39 @@ publishing {
 
 sourceSets { main { java { srcDir("src/main/java") } } }
 
-val prepareHistoricalDistributions by tasks.registering {
+val prepareHistoricalDistributions =
-  val outputDir = layout.buildDirectory.dir("pklHistoricalDistributions")
+  tasks.register("prepareHistoricalDistributions") {
-  inputs.files(pklHistoricalDistributions.files)
+    val outputDir = layout.buildDirectory.dir("pklHistoricalDistributions")
-  outputs.dir(outputDir)
+    inputs.files(pklHistoricalDistributions.files)
-  doLast {
+    outputs.dir(outputDir)
-    val distributionDir = outputDir.get().asFile.toPath().also(Files::createDirectories)
+    doLast {
-    for (file in pklHistoricalDistributions.files) {
+      val distributionDir = outputDir.get().asFile.toPath().also(Files::createDirectories)
-      val target = distributionDir.resolve(file.name)
+      for (file in pklHistoricalDistributions.files) {
-      // Create normal files on Windows, symlink on macOS/linux (need admin privileges to create
+        val target = distributionDir.resolve(file.name)
-      // symlinks on Windows)
+        // Create normal files on Windows, symlink on macOS/linux (need admin privileges to create
-      if (buildInfo.os.isWindows) {
+        // symlinks on Windows)
-        if (!Files.isRegularFile(target, LinkOption.NOFOLLOW_LINKS)) {
+        if (buildInfo.os.isWindows) {
-          if (Files.exists(target)) {
+          if (!Files.isRegularFile(target, LinkOption.NOFOLLOW_LINKS)) {
-            Files.delete(target)
+            if (Files.exists(target)) {
+              Files.delete(target)
+            }
+            Files.copy(file.toPath(), target)
           }
-          Files.copy(file.toPath(), target)
+        } else {
-        }
+          if (!Files.isSymbolicLink(target)) {
-      } else {
+            if (Files.exists(target)) {
-        if (!Files.isSymbolicLink(target)) {
+              Files.delete(target)
-          if (Files.exists(target)) {
+            }
-            Files.delete(target)
+            Files.createSymbolicLink(target, file.toPath())
           }
-          Files.createSymbolicLink(target, file.toPath())
         }
       }
     }
   }
-}
 
-val prepareTest by tasks.registering {
+val prepareTest =
-  dependsOn(pklDistributionCurrent, prepareHistoricalDistributions)
+  tasks.register("prepareTest") {
-}
+    dependsOn(pklDistributionCurrent, prepareHistoricalDistributions)
+  }
 
 tasks.test { dependsOn(prepareTest) }

pkl-gradle/pkl-gradle.gradle.kts

@@ -69,12 +69,12 @@ sourceSets {
 // Then the path to the jar file and the toolchain's `java` binary
 // are injected into tests as properties.
 
-val externalReader by sourceSets.creating {}
+val externalReader = sourceSets.create("externalReader") {}
 
 dependencies { "externalReaderImplementation"(libs.msgpack) }
 
-val externalReaderJar by
+val externalReaderJar =
-  tasks.registering(Jar::class) {
+  tasks.register<Jar>("externalReaderJar") {
     description = "Builds an external reader executable jar file"
     archiveBaseName = "external-reader"
     archiveVersion = ""

pkl-server/pkl-server.gradle.kts

@@ -36,38 +36,38 @@ private fun Test.configureNativeTest() {
   include("**/NativeServerTest.*")
 }
 
-val testMacExecutableAarch64 by
+val testMacExecutableAarch64 =
-  tasks.registering(Test::class) {
+  tasks.register<Test>("testMacExecutableAarch64") {
     dependsOn(":pkl-cli:macExecutableAarch64")
     configureNativeTest()
   }
 
-val testMacExecutableAmd64 by
+val testMacExecutableAmd64 =
-  tasks.registering(Test::class) {
+  tasks.register<Test>("testMacExecutableAmd64") {
     dependsOn(":pkl-cli:macExecutableAmd64")
     configureNativeTest()
   }
 
-val testLinuxExecutableAmd64 by
+val testLinuxExecutableAmd64 =
-  tasks.registering(Test::class) {
+  tasks.register<Test>("testLinuxExecutableAmd64") {
     dependsOn(":pkl-cli:linuxExecutableAmd64")
     configureNativeTest()
   }
 
-val testLinuxExecutableAarch64 by
+val testLinuxExecutableAarch64 =
-  tasks.registering(Test::class) {
+  tasks.register<Test>("testLinuxExecutableAarch64") {
     dependsOn(":pkl-cli:linuxExecutableAarch64")
     configureNativeTest()
   }
 
-val testAlpineExecutableAmd64 by
+val testAlpineExecutableAmd64 =
-  tasks.registering(Test::class) {
+  tasks.register<Test>("testAlpineExecutableAmd64") {
     dependsOn(":pkl-cli:alpineExecutableAmd64")
     configureNativeTest()
   }
 
-val testWindowsExecutableAmd64 by
+val testWindowsExecutableAmd64 =
-  tasks.registering(Test::class) {
+  tasks.register<Test>("testWindowsExecutableAmd64") {
     dependsOn(":pkl-cli:windowsExecutableAmd64")
     configureNativeTest()
   }

pkl-tools/pkl-tools.gradle.kts

@@ -25,9 +25,9 @@ plugins {
   signing
 }
 
-val placeholder: SourceSet by sourceSets.creating
+val placeholder = sourceSets.create("placeholder")
 
-val firstPartySourcesJars by configurations.existing
+val firstPartySourcesJars = configurations.named("firstPartySourcesJars")
 
 // Note: pkl-tools cannot (easily) contain pkl-config-kotlin
 // because pkl-tools ships with a shaded Kotlin stdlib.
@@ -55,12 +55,13 @@ dependencies {
 
 // TODO: need to figure out how to properly generate javadoc here.
 // For now, we'll include a placeholder javadoc jar.
-val javadocPlaceholder by tasks.registering(Javadoc::class) { source = placeholder.allJava }
+val javadocPlaceholder =
+  tasks.register<Javadoc>("javadocPlaceholder") { source = placeholder.allJava }
 
 java { withJavadocJar() }
 
-val javadocJar by
+val javadocJar =
-  tasks.existing(Jar::class) {
+  tasks.named<Jar>("javadocJar") {
     from(javadocPlaceholder)
     archiveBaseName.set("pkl-tools-all")
     archiveClassifier.set("javadoc")
@@ -105,8 +106,8 @@ private fun Exec.configureTestStartFatJar(launcher: Provider<JavaLauncher>) {
   }
 }
 
-val testStartFatJar by
+val testStartFatJar =
-  tasks.registering(Exec::class) { configureTestStartFatJar(buildInfo.javaTestLauncher) }
+  tasks.register<Exec>("testStartFatJar") { configureTestStartFatJar(buildInfo.javaTestLauncher) }
 
 tasks.validateFatJar { dependsOn(testStartFatJar) }
 

stdlib/stdlib.gradle.kts

@@ -24,8 +24,8 @@ plugins {
 
 // create and publish a self-contained stdlib archive
 // purpose is to provide non-jvm tools/projects with a versioned stdlib
-val stdlibZip by
+val stdlibZip =
-  tasks.registering(Zip::class) {
+  tasks.register<Zip>("stdlibZip") {
     destinationDirectory.set(layout.buildDirectory.dir("libs"))
     archiveBaseName.set("pkl-stdlib")
     archiveVersion.set(project.version as String)