Run spotless apply

2026-07-15 09:32:56 +02:00 · 2024-07-01 09:08:06 -07:00
parent 7a9b571f6e
commit 8c1c10528f
127 changed files with 5325 additions and 3450 deletions
@@ -1,3 +1,18 @@
+/**
+ * Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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.apache.tools.ant.filters.ReplaceTokens

 plugins {
@@ -12,13 +27,7 @@ plugins {

 val generatorSourceSet = sourceSets.register("generator")

-sourceSets {
-  main {
-    java {
-      srcDir(file("generated/antlr"))
-    }
-  }
-}
+sourceSets { main { java { srcDir(file("generated/antlr")) } } }

 idea {
  module {
@@ -51,16 +60,14 @@ dependencies {
  implementation(libs.truffleApi)
  implementation(libs.graalSdk)

-  implementation(libs.paguro) {
-    exclude(group = "org.jetbrains", module = "annotations")
-  }
+  implementation(libs.paguro) { exclude(group = "org.jetbrains", module = "annotations") }

  implementation(libs.snakeYaml)
-  
+
  implementation(libs.jansi)

  testImplementation(projects.pklCommonsTest)
-  
+
  add("generatorImplementation", libs.javaPoet)
  add("generatorImplementation", libs.truffleApi)
  add("generatorImplementation", libs.kotlinStdLib)
@@ -73,11 +80,14 @@ publishing {
    named<MavenPublication>("library") {
      pom {
        url.set("https://github.com/apple/pkl/tree/main/pkl-core")
-        description.set("""
+        description.set(
+          """
          Core implementation of the Pkl configuration language.
          Includes Java APIs for embedding the language into JVM applications,
          and for building libraries and tools on top of the language.
-        """.trimIndent())
+        """
+            .trimIndent()
+        )
      }
    }
  }
@@ -97,63 +107,52 @@ tasks.generateGrammarSource {
  outputDirectory = file("generated/antlr/org/pkl/core/parser/antlr")
 }

-tasks.compileJava {
-  dependsOn(tasks.generateGrammarSource)
-}
+tasks.compileJava { dependsOn(tasks.generateGrammarSource) }

-tasks.sourcesJar {
-  dependsOn(tasks.generateGrammarSource)
-}
+tasks.sourcesJar { dependsOn(tasks.generateGrammarSource) }

-tasks.generateTestGrammarSource {
-  enabled = false
-}
-tasks.named("generateGeneratorGrammarSource") {
-  enabled = false
-}
+tasks.generateTestGrammarSource { enabled = false }
+
+tasks.named("generateGeneratorGrammarSource") { enabled = false }

 // Satisfy expectations of IntelliJ ANTLR plugin,
 // which can't otherwise cope with our ANTLR setup.
-val makeIntelliJAntlrPluginHappy by tasks.registering(Copy::class) {
-  dependsOn(tasks.generateGrammarSource)
-  into("src/main/antlr")
-  from("generated/antlr/org/pkl/core/parser/antlr") {
-    include("PklLexer.tokens")
+val makeIntelliJAntlrPluginHappy by
+  tasks.registering(Copy::class) {
+    dependsOn(tasks.generateGrammarSource)
+    into("src/main/antlr")
+    from("generated/antlr/org/pkl/core/parser/antlr") { include("PklLexer.tokens") }
  }
-}

 tasks.processResources {
  inputs.property("version", buildInfo.pklVersion)
  inputs.property("commitId", buildInfo.commitId)

  filesMatching("org/pkl/core/Release.properties") {
-    val stdlibModules = fileTree("$rootDir/stdlib") { 
-      include("*.pkl") 
-      exclude("doc-package-info.pkl")
-    }.map { "pkl:" + it.nameWithoutExtension } 
-      .sortedBy { it.lowercase() }
-    
-    filter<ReplaceTokens>("tokens" to mapOf(
-        "version" to buildInfo.pklVersion,
-        "commitId" to buildInfo.commitId,
-        "stdlibModules" to stdlibModules.joinToString(",")
-    ))
+    val stdlibModules =
+      fileTree("$rootDir/stdlib") {
+          include("*.pkl")
+          exclude("doc-package-info.pkl")
+        }
+        .map { "pkl:" + it.nameWithoutExtension }
+        .sortedBy { it.lowercase() }
+
+    filter<ReplaceTokens>(
+      "tokens" to
+        mapOf(
+          "version" to buildInfo.pklVersion,
+          "commitId" to buildInfo.commitId,
+          "stdlibModules" to stdlibModules.joinToString(",")
+        )
+    )
  }

-  into("org/pkl/core/stdlib") {
-    from("$rootDir/stdlib") {
-      include("*.pkl")
-    }
-  }
+  into("org/pkl/core/stdlib") { from("$rootDir/stdlib") { include("*.pkl") } }
 }

-tasks.compileJava {
-  options.generatedSourceOutputDirectory.set(file("generated/truffle"))
-}
+tasks.compileJava { options.generatedSourceOutputDirectory.set(file("generated/truffle")) }

-tasks.compileKotlin {
-  enabled = false
-}
+tasks.compileKotlin { enabled = false }

 tasks.test {
  configureTest()
@@ -166,52 +165,58 @@ tasks.test {
  }
 }

-val testJavaExecutable by tasks.registering(Test::class) {
-  configureExecutableTest("LanguageSnippetTestsEngine")
-  classpath =
-    // compiled test classes
-    sourceSets.test.get().output +
-    // java executable
-    javaExecutableConfiguration +
-    // test-only dependencies
-    // (test dependencies that are also main dependencies must already be contained in java executable;
-    // to verify that we don't want to include them here)
-    (configurations.testRuntimeClasspath.get() - configurations.runtimeClasspath.get())
-}
+val testJavaExecutable by
+  tasks.registering(Test::class) {
+    configureExecutableTest("LanguageSnippetTestsEngine")
+    classpath =
+      // compiled test classes
+      sourceSets.test.get().output +
+        // java executable
+        javaExecutableConfiguration +
+        // test-only dependencies
+        // (test dependencies that are also main dependencies must already be contained in java
+        // executable;
+        // to verify that we don't want to include them here)
+        (configurations.testRuntimeClasspath.get() - configurations.runtimeClasspath.get())
+  }

-tasks.check {
-  dependsOn(testJavaExecutable)
-}
+tasks.check { dependsOn(testJavaExecutable) }

-val testMacExecutableAmd64 by tasks.registering(Test::class) {
-  dependsOn(":pkl-cli:macExecutableAmd64")
-  configureExecutableTest("MacAmd64LanguageSnippetTestsEngine")
-}
+val testMacExecutableAmd64 by
+  tasks.registering(Test::class) {
+    dependsOn(":pkl-cli:macExecutableAmd64")
+    configureExecutableTest("MacAmd64LanguageSnippetTestsEngine")
+  }

-val testMacExecutableAarch64 by tasks.registering(Test::class) {
-  dependsOn(":pkl-cli:macExecutableAarch64")
-  configureExecutableTest("MacAarch64LanguageSnippetTestsEngine")
-}
+val testMacExecutableAarch64 by
+  tasks.registering(Test::class) {
+    dependsOn(":pkl-cli:macExecutableAarch64")
+    configureExecutableTest("MacAarch64LanguageSnippetTestsEngine")
+  }

-val testLinuxExecutableAmd64 by tasks.registering(Test::class) {
-  dependsOn(":pkl-cli:linuxExecutableAmd64")
-  configureExecutableTest("LinuxAmd64LanguageSnippetTestsEngine")
-}
+val testLinuxExecutableAmd64 by
+  tasks.registering(Test::class) {
+    dependsOn(":pkl-cli:linuxExecutableAmd64")
+    configureExecutableTest("LinuxAmd64LanguageSnippetTestsEngine")
+  }

-val testLinuxExecutableAarch64 by tasks.registering(Test::class) {
-  dependsOn(":pkl-cli:linuxExecutableAarch64")
-  configureExecutableTest("LinuxAarch64LanguageSnippetTestsEngine")
-}
+val testLinuxExecutableAarch64 by
+  tasks.registering(Test::class) {
+    dependsOn(":pkl-cli:linuxExecutableAarch64")
+    configureExecutableTest("LinuxAarch64LanguageSnippetTestsEngine")
+  }

-val testAlpineExecutableAmd64 by tasks.registering(Test::class) {
-  dependsOn(":pkl-cli:alpineExecutableAmd64")
-  configureExecutableTest("AlpineLanguageSnippetTestsEngine")
-}
+val testAlpineExecutableAmd64 by
+  tasks.registering(Test::class) {
+    dependsOn(":pkl-cli:alpineExecutableAmd64")
+    configureExecutableTest("AlpineLanguageSnippetTestsEngine")
+  }

-val testWindowsExecutableAmd64 by tasks.registering(Test::class) {
-  dependsOn(":pkl-cli:windowsExecutableAmd64")
-  configureExecutableTest("WindowsLanguageSnippetTestsEngine")
-}
+val testWindowsExecutableAmd64 by
+  tasks.registering(Test::class) {
+    dependsOn(":pkl-cli:windowsExecutableAmd64")
+    configureExecutableTest("WindowsLanguageSnippetTestsEngine")
+  }

 tasks.testNative {
  when {
@@ -249,13 +254,16 @@ spotless {
 }

 private fun Test.configureTest() {
-  inputs.dir("src/test/files/LanguageSnippetTests/input")
+  inputs
+    .dir("src/test/files/LanguageSnippetTests/input")
    .withPropertyName("languageSnippetTestsInput")
    .withPathSensitivity(PathSensitivity.RELATIVE)
-  inputs.dir("src/test/files/LanguageSnippetTests/input-helper")
+  inputs
+    .dir("src/test/files/LanguageSnippetTests/input-helper")
    .withPropertyName("languageSnippetTestsInputHelper")
    .withPathSensitivity(PathSensitivity.RELATIVE)
-  inputs.dir("src/test/files/LanguageSnippetTests/output")
+  inputs
+    .dir("src/test/files/LanguageSnippetTests/output")
    .withPropertyName("languageSnippetTestsOutput")
    .withPathSensitivity(PathSensitivity.RELATIVE)
 }
@@ -264,7 +272,5 @@ private fun Test.configureExecutableTest(engineName: String) {
  configureTest()
  testClassesDirs = files(tasks.test.get().testClassesDirs)
  classpath = tasks.test.get().classpath
-  useJUnitPlatform {
-    includeEngines(engineName)
-  }
+  useJUnitPlatform { includeEngines(engineName) }
 }