build: replace delegates and fix multiple build warnings (#5465)

Author: DanySK

alchemist-composeui/build.gradle.kts

@@ -26,7 +26,7 @@ kotlin {
     }
 
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(libs.bundles.compose)
             }

alchemist-factories-generator/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 
 kotlin {
     sourceSets {
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
                 api(alchemist("api"))
                 implementation(libs.ksp.api)

alchemist-full/build.gradle.kts

@@ -56,7 +56,7 @@ application {
 }
 
 // Shadow Jar
-tasks.withType<ShadowJar> {
+tasks.withType<ShadowJar>().configureEach {
     manifest {
         attributes(
             mapOf(
@@ -82,23 +82,28 @@ tasks.withType<ShadowJar> {
     mergeServiceFiles()
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
     destinationDirectory.set(rootProject.layout.buildDirectory.map { it.dir("shadow") })
-    // Run the jar and check the output
-    val minJavaVersion: String by properties
-    val javaExecutable = javaToolchains.launcherFor { languageVersion.set(JavaLanguageVersion.of(minJavaVersion)) }
-        .map { it.executablePath.asFile.absolutePath }
-    val testShadowJar = testShadowJar(javaExecutable, archiveFile)
-    testShadowJar.configure {
-        dependsOn(this@withType)
-    }
-    this.finalizedBy(testShadowJar)
-    tasks.assemble.configure { dependsOn(testShadowJar) }
 }
 
+val javaExecutable = javaToolchains.launcherFor {
+    languageVersion.set(
+        providers.gradleProperty("minJavaVersion").map(JavaLanguageVersion::of),
+    )
+}
+
+val testShadowJar = testShadowJar(
+    javaExecutable.map { it.executablePath.asFile.absolutePath },
+    tasks.shadowJar.flatMap { it.archiveFile },
+)
+testShadowJar.configure { dependsOn(tasks.shadowJar) }
+tasks.shadowJar.configure { finalizedBy(testShadowJar) }
+tasks.assemble.configure { dependsOn(testShadowJar) }
+
 // Disable distTar and distZip
-val toDisable = with(tasks) {
-    listOf(distTar, distZip, jpackage, shadowDistZip, shadowDistTar).map { it.name }
+with(tasks) {
+    listOf(distTar, distZip, jpackage, shadowDistZip, shadowDistTar).forEach {
+        it.configure { enabled = false }
+    }
 }
-tasks.matching { it.name in toDisable }.configureEach { enabled = false }
 
 sealed interface PackagingMethod
 
@@ -171,19 +176,22 @@ private fun String.extractVersionComponents(): SemVerExtracted {
 
 private val packageDestinationDir = rootProject.layout.buildDirectory.dir("package").directoryProperty
 private val baseVersion: Provider<String> = provider { rootProject.version.toString() }
+
 private fun ImageType.formatVersion(version: String): String = when (this) {
     MSI, EXE -> version.substringBefore('-')
     DMG, PKG -> version.extractVersionComponents().asMangledVersion()
     RPM -> version.replace('-', '.')
     else -> version
 }
+
 private val rpmFileName: Provider<String> =
     baseVersion.map { "${rootProject.name}-${RPM.formatVersion(it)}-1.x86_64.rpm" }
+
 private val rpmFileProvider: RegularFileProperty = rpmFileName.flatMap { fileName ->
     packageDestinationDir.file(fileName)
 }.fileProperty
 
-val generatePKGBUILD by tasks.registering {
+val generatePKGBUILD = tasks.register("generatePKGBUILD") {
     group = "Distribution"
     description = "Generates a valid PKGBUILD by replacing values in the template file"
     if (validFormats.none { it is ValidPackaging && it.format == RPM }) {
@@ -232,6 +240,7 @@ val generatePKGBUILD by tasks.registering {
         outputDir.resolve("PKGBUILD").writeText(pkgbuildContent)
     }
 }
+
 tasks.assemble.configure { dependsOn(generatePKGBUILD) }
 
 val packageTasks = validFormats.filterIsInstance<ValidPackaging>().map { packaging: ValidPackaging ->
@@ -279,7 +288,7 @@ val packageTasks = validFormats.filterIsInstance<ValidPackaging>().map { packagi
 
 tasks.assemble.configure { dependsOn(packageTasks) }
 
-tasks.withType<AbstractArchiveTask> {
+tasks.withType<AbstractArchiveTask>().configureEach {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
@@ -309,6 +318,7 @@ private val Provider<Directory>.directoryProperty get(): DirectoryProperty = obj
     it.set(this)
     it.disallowChanges()
 }
+
 private val Provider<RegularFile>.fileProperty get(): RegularFileProperty = objects.fileProperty().also {
     it.set(this)
     it.disallowChanges()

alchemist-graphql/build.gradle.kts

@@ -22,20 +22,20 @@ plugins {
 
 kotlin {
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(libs.apollo.runtime)
                 implementation(libs.kotlin.coroutines.core)
                 implementation(libs.kotlin.stdlib)
                 implementation(libs.kotlinx.serialization.json)
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
             }
         }
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
                 api(alchemist("api"))
                 api(alchemist("graphql-surrogates"))
@@ -47,7 +47,7 @@ kotlin {
                 implementation(libs.bundles.ktor.server)
             }
         }
-        val jvmTest by getting {
+        jvmTest {
             dependencies {
                 implementation(libs.kotest.assertions.core)
                 implementation(libs.kotest.runner)
@@ -58,7 +58,7 @@ kotlin {
                 implementation(alchemist("test"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
                 implementation(libs.kotlinx.atomicfu.runtime)
             }

alchemist-web-renderer/build.gradle.kts

@@ -27,7 +27,7 @@ kotlin {
         }
     }
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(libs.kotlin.stdlib)
                 implementation(libs.kotlinx.serialization.json)
@@ -36,13 +36,13 @@ kotlin {
                 implementation(libs.redux.kotlin.threadsafe)
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(libs.kotlin.test)
                 implementation(libs.kotlin.coroutines.test)
             }
         }
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
                 api(alchemist("api"))
                 implementation(incarnation("sapere"))
@@ -52,15 +52,15 @@ kotlin {
                 implementation(libs.resourceloader)
             }
         }
-        val jvmTest by getting {
+        jvmTest {
             dependencies {
                 implementation(libs.ktor.server.test.host)
                 implementation(alchemist("euclidean-geometry"))
                 implementation(alchemist("implementationbase"))
                 implementation(alchemist("test"))
             }
         }
-        val jsMain by getting {
+        jsMain {
             dependencies {
                 implementation(libs.bundles.ktor.client)
                 implementation(libs.bundles.kotlin.react)

build.gradle.kts

@@ -22,7 +22,6 @@ import kotlinx.coroutines.runBlocking
 import org.danilopianini.gradle.mavencentral.portal.PublishPortalDeployment
 import org.gradle.api.internal.ConventionTask
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.jetbrains.dokka.gradle.AbstractDokkaTask
 import org.jetbrains.dokka.gradle.tasks.DokkaBaseTask
 
 plugins {
@@ -34,8 +33,6 @@ plugins {
     alias(libs.plugins.hugo)
 }
 
-val minJavaVersion: String by properties
-
 allprojects {
 
     with(rootProject.libs.plugins) {
@@ -46,7 +43,7 @@ allprojects {
     }
 
     multiJvm {
-        jvmVersionForCompilation.set(minJavaVersion.toInt())
+        jvmVersionForCompilation.set(providers.gradleProperty("minJavaVersion").map(String::toInt))
         maximumSupportedJvmVersion.set(latestJava)
         if (isInCI && (isWindows || isMac)) {
             /*
@@ -96,21 +93,10 @@ allprojects {
         enabled = false
     }
 
-    /*
-     * Work around:
-     * Task ':...:dokkaJavadoc' uses this output of task ':...:jar' without declaring an explicit or implicit dependency.
-     * This can lead to incorrect results being produced, depending on what order the tasks are executed.
-     */
-    tasks.withType<AbstractDokkaTask>().configureEach {
-        allprojects.forEach { otherProject ->
-            dependsOn(otherProject.tasks.withType<org.gradle.jvm.tasks.Jar>().matching { it.name == "jar" })
-        }
-    }
-
     if (isInCI) {
         signing {
-            val signingKey: String? by project
-            val signingPassword: String? by project
+            val signingKey = project.findProperty("signingKey")?.toString()
+            val signingPassword = project.findProperty("signingPassword")?.toString()
             useInMemoryPgpKeys(signingKey, signingPassword)
         }
     }
@@ -148,7 +134,7 @@ allprojects {
  */
 evaluationDependsOnChildren()
 
-val dokkaGlobalClasspath by configurations.creating
+val dokkaGlobalClasspath = configurations.create("dokkaGlobalClasspath")
 dependencies {
     // Depend on subprojects whose presence is necessary to run
     listOf("api", "engine", "loading").forEach { api(alchemist(it)) } // Execution requirements
@@ -167,7 +153,7 @@ dependencies {
     dokkaGlobalClasspath(alchemist("full"))
 }
 
-val checkMavenCentralPortalPluginClasspath by tasks.registering {
+val checkMavenCentralPortalPluginClasspath = tasks.register("checkMavenCentralPortalPluginClasspath") {
     group = LifecycleBasePlugin.VERIFICATION_GROUP
     description = "Checks that the Maven Central Portal publishing plugin can upload to a local fake endpoint."
     val outputFile = layout.buildDirectory.file("reports/checkMavenCentralPortalPluginClasspath/result.txt")
@@ -260,15 +246,16 @@ fun Project.dokkaCopyTask(destination: String): Copy.() -> Unit = {
     into(File(websiteDir, "reference/$destination"))
 }
 
-val copyGlobalDokkaInTheWebsite by tasks.registering(Copy::class, dokkaCopyTask("kdoc"))
-val copyModuleDokkaInTheWebsite by tasks.registering(Copy::class, alchemist("full").dokkaCopyTask("kdoc-modules"))
+val copyGlobalDokkaInTheWebsite = tasks.register<Copy>("copyGlobalDokkaInTheWebsite", dokkaCopyTask("kdoc"))
+val copyModuleDokkaInTheWebsite =
+    tasks.register<Copy>("copyModuleDokkaInTheWebsite", alchemist("full").dokkaCopyTask("kdoc-modules"))
 
 tasks.hugoBuild.configure {
     outputDirectory = websiteDir
     finalizedBy(copyGlobalDokkaInTheWebsite, copyModuleDokkaInTheWebsite)
 }
 
-val performWebsiteStringReplacements by tasks.registering {
+val performWebsiteStringReplacements = tasks.register("performWebsiteStringReplacements") {
     dependsOn(copyGlobalDokkaInTheWebsite, copyModuleDokkaInTheWebsite)
     doLast {
         val index = File(websiteDir, "index.html")

buildSrc/src/main/kotlin/dokka-convention.gradle.kts

@@ -17,20 +17,10 @@ import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 import org.jetbrains.dokka.gradle.tasks.DokkaBaseTask
 
-/*
- * Copyright (C) 2010-2024, Danilo Pianini and contributors
- * listed, for each module, in the respective subproject's build.gradle.kts file.
- *
- * This file is part of Alchemist, and is distributed under the terms of the
- * GNU General Public License, with a linking exception,
- * as described in the file LICENSE in the Alchemist distribution's top directory.
- */
 plugins {
     id("org.jetbrains.dokka")
 }
 
-val minJavaVersion: String by properties
-
 val fetchEngine: Executor = Executors.newCachedThreadPool()
 
 dokka {
@@ -40,7 +30,7 @@ dokka {
     dokkaSourceSets.configureEach {
         enableKotlinStdLibDocumentationLink.set(true)
         enableJdkDocumentationLink.set(true)
-        jdkVersion.set(minJavaVersion.toInt())
+        jdkVersion.set(providers.gradleProperty("minJavaVersion").map(String::toInt))
         skipDeprecated.set(false)
         skipEmptyPackages.set(true)
         /*
@@ -54,10 +44,10 @@ dokka {
             .forEach { (path, file) ->
                 sourceLink {
                     localDirectory.set(file)
-                    val project = if (project == rootProject) "" else project.name
+                    val projectPath = if (project == rootProject) "" else project.name
                     val url = "https://github.com/AlchemistSimulator/Alchemist/${
                         currentCommitHash?.let { "tree/$it" } ?: "blob/master"
-                    }/$project/$path"
+                    }/$projectPath/$path"
                     remoteUrl.set(uri(url))
                     remoteLineSuffix.set("#L")
                 }
@@ -94,6 +84,5 @@ dokka {
 }
 
 tasks.withType<DokkaBaseTask>().configureEach {
-    timeout.set(Duration.ofMinutes(5))
+    timeout.set(Duration.ofMinutes(15))
 }
-

buildSrc/src/main/kotlin/kotlin-multiplatform-convention.gradle.kts

@@ -36,14 +36,14 @@ kotlin {
         val alchemistApi = alchemist("api")
         val alchemistMaintenanceTooling = alchemist("maintenance-tooling")
         val isNotRootRootProject = project != alchemistMaintenanceTooling && project != alchemistApi
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 if (isNotRootRootProject) {
                     implementation(alchemist("maintenance-tooling"))
                 }
             }
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 val kotlinTest by catalog
                 val kotestAssertionsCore by catalog
@@ -53,14 +53,14 @@ kotlin {
                 implementation(kotestFrameworkEngine)
             }
         }
-        val jvmMain by getting {
+        jvmMain {
             dependencies {
                 if (isNotRootRootProject) {
                     implementation(alchemistApi)
                 }
             }
         }
-        val jvmTest by getting {
+        jvmTest {
             dependencies {
                 val `kotest-runner` by catalog
                 implementation(`kotest-runner`)