Changed listOfNotNull to listOf, because was still learning Kotlin when I wrote the initial ones.

Author: lagergren

build-logic/aggregator/src/main/kotlin/org.xtclang.build.aggregator.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 private class XdkBuildAggregator(project: Project) : Runnable {
     companion object {
         private val lifeCycleTasks =
-            listOfNotNull(ASSEMBLE_TASK_NAME, BUILD_TASK_NAME, CHECK_TASK_NAME, CLEAN_TASK_NAME)
+            listOf(ASSEMBLE_TASK_NAME, BUILD_TASK_NAME, CHECK_TASK_NAME, CLEAN_TASK_NAME)
     }
 
     private val prefix = "[${project.name}]"

build-logic/common-plugins/src/main/kotlin/GitHubPackages.kt

@@ -32,11 +32,11 @@ class GitHubPackages(project: Project) : XdkProjectBuildLogic(project) {
         private const val GITHUB_USER_RO_DEFAULT_VALUE = "xtclang-bot"
         private const val GITHUB_TOKEN_RO_DEFAULT_VALUE = "Z2hwX0ZjNGRWeDhNYmxPcnZDYWZrRW96Q0NrQXAzaVZ5RjBUb0NheAo="
 
-        val publishTaskPrefixes = listOfNotNull("list", "delete")
-        val publishTaskSuffixesRemote = listOfNotNull("AllRemotePublications")
-        val publishTaskSuffixesLocal = listOfNotNull("AllLocalPublications")
+        val publishTaskPrefixes = listOf("list", "delete")
+        val publishTaskSuffixesRemote = listOf("AllRemotePublications")
+        val publishTaskSuffixesLocal = listOf("AllLocalPublications")
 
-        fun restHeaders(token: String): List<Pair<String, String>> = listOfNotNull(
+        fun restHeaders(token: String): List<Pair<String, String>> = listOf(
             "Accept" to "application/vnd.github+json",
             "X-GitHub-Api-Version" to "2022-11-28",
             "Authorization" to "Bearer $token")

build-logic/common-plugins/src/main/kotlin/XdkDistribution.kt

@@ -16,7 +16,7 @@ class XdkDistribution(project: Project): XdkProjectBuildLogic(project) {
         private val currentOs = OperatingSystem.current()
         private val isCiEnabled = System.getenv(CI) == "true"
 
-        val distributionTasks = listOfNotNull("distTar", "distZip")
+        val distributionTasks = listOf("distTar", "distZip", "distExe")
     }
 
     init {

build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 
 private val xdk = gradle.includedBuild("xdk")
 private val plugin = gradle.includedBuild("plugin")
-private val includedBuildsWithPublications = listOfNotNull(xdk, plugin)
+private val includedBuildsWithPublications = listOf(xdk, plugin)
 
 /**
  * Installation and distribution tasks that aggregate publishable/distributable included

javatools/build.gradle.kts

@@ -124,7 +124,7 @@ val sanityCheckJar by tasks.registering {
 
         DebugBuild.verifyJarFileContents(
             project,
-            listOfNotNull(
+            listOf(
                 "implicit.x", // verify the implicits are in the jar
                 "org/xvm/tool/Compiler", // verify the javatools package is in there, including Compiler and Runner
                 "org/xvm/tool/Runner",

lib_ecstasy/build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
     alias(libs.plugins.xtc)
 }
 
-val xdkTurtle by configurations.registering {
+val xdkTurtleConsumer by configurations.registering {
     isCanBeResolved = true
     isCanBeConsumed = false
     attributes {
@@ -24,11 +24,19 @@ val xdkTurtle by configurations.registering {
     }
 }
 
+val xdkUnicodeConsumer by configurations.registering {
+    isCanBeResolved = true
+    isCanBeConsumed = false
+    attributes {
+        attribute(CATEGORY_ATTRIBUTE, objects.named(LIBRARY))
+        attribute(LIBRARY_ELEMENTS_ATTRIBUTE, objects.named("unicodeDir"))
+    }
+}
+
 dependencies {
-    // TODO: Find out why xdkJavaTools is not an unstable API, while xdkTurtle and xdkUnicode are.
     xdkJavaTools(libs.javatools)
     @Suppress("UnstableApiUsage")
-    xdkTurtle(libs.javatools.turtle) // A dependency declaration like this works equally well if we are working with an included build/project or with an artifact. This is exactly what we want.
+    xdkTurtleConsumer(libs.javatools.turtle) // A dependency declaration like this works equally well if we are working with an included build/project or with an artifact. This is exactly what we want.
 }
 
 val compileXtc by tasks.existing(XtcCompileTask::class) {
@@ -45,15 +53,7 @@ sourceSets {
     main {
         xtc {
             // mack.x is in a different project, and does not build on its own, hence we add it to the lib_ecstasy source set instead.
-            srcDir(xdkTurtle)
+            srcDir(xdkTurtleConsumer)
         }
-        //resources {
-            // Skip the local unicode files if we are in "rebuild unicode" mode.
-            //if (xdkBuild.rebuildUnicode()) {
-            //    exclude("**/ecstasy/text**")
-            //}
-        //}
     }
 }
-
-// TODO Add resource processing for unicode

plugin/build.gradle.kts

@@ -78,7 +78,7 @@ gradlePlugin {
             displayName = getXdkProperty("$pprefix.plugin.display.name")
             description = getXdkProperty("$pprefix.plugin.description")
             logger.info("$prefix Configuring gradlePlugin; pluginId=$pluginId, implementationClass=$implementationClass, displayName=$displayName, description=$description")
-            tags = listOfNotNull("xtc", "language", "ecstasy", "xdk")
+            tags = listOf("xtc", "language", "ecstasy", "xdk")
         }
     }
 }

plugin/src/main/java/org/xtclang/plugin/tasks/XtcCompileTask.java

@@ -114,18 +114,20 @@ public final String getJavaLauncherClassName() {
 
     /**
      * Add an output Filename mapping.
-     * TODO Why does IntelliJ think these are unused? Check that it doesn't lead to any unknown dependency problems for the Plugin.
      */
+    @SuppressWarnings("unused") // No, IntelliJ. It's not.
     public void outputFilename(final String from, final String to) {
         outputFilenames.add(from);
         outputFilenames.add(to);
     }
 
+    @SuppressWarnings("unused") // No, IntelliJ. It's not.
     public void outputFilename(final Pair<String, String> pair) {
         outputFilenames.add(pair.getFirst());
         outputFilenames.add(pair.getSecond());
     }
 
+    @SuppressWarnings("unused") // No, IntelliJ. It's not.
     public void outputFilename(final Provider<String> from, final Provider<String> to) {
         outputFilenames.add(from);
         outputFilenames.add(to);

xdk/build.gradle.kts

@@ -43,16 +43,6 @@ val xdkProvider by configurations.registering {
     }
 }
 
-val xtcUnicodeConsumer by configurations.registering {
-    isCanBeResolved = true
-    isCanBeConsumed = false
-    // TODO: Can likely remove these.
-    attributes {
-        attribute(CATEGORY_ATTRIBUTE, objects.named(LIBRARY))
-        attribute(LIBRARY_ELEMENTS_ATTRIBUTE, objects.named("unicodeDir"))
-    }
-}
-
 dependencies {
     xdkJavaTools(libs.javatools)
     xtcModule(libs.xdk.ecstasy)
@@ -316,7 +306,7 @@ val installLocalDist by tasks.registering {
         listOf("xcc", "xec", "xtc").forEach {
             val symLink = File(binDir, it)
             logger.info("$prefix Copying launcher '$it' -> '${launcherExe.asFile}' (on Windows, this may require developer mode settings).")
-            Files.copy(symLink.toPath(), launcherExe.asFile.toPath())
+            Files.copy(launcherExe.asFile.toPath(), symLink.toPath())
         }
     }
 }

xdk/settings.gradle.kts

@@ -17,7 +17,7 @@ val xdkProjectPath = rootDir
 /**
  * The explicit XDK subprojects that are built for each library included in the XDK.
  */
-listOfNotNull(
+listOf(
     "lib_ecstasy",
     "lib_collections",
     "lib_aggregate",