chore: Gradle 8.3-rc1 update and misc refactorings

Author: sureshg

build.gradle.kts

@@ -5,5 +5,6 @@ plugins {
 }
 
 // Multi module single coverage report
-// tasks.dokkaHtmlMultiModule { moduleName = project.name }
 dependencies { project.subprojects.forEach { kover(it) } }
+
+tasks.dokkaHtmlMultiModule { moduleName = "Kotlin Multiplatform Playground!" }

common/src/commonMain/kotlin/dev/suresh/Greeting.kt

@@ -34,7 +34,7 @@ class Greeting {
 
   private fun kotlinxTests(): String {
     val ba = "Kotlinx".encodeToByteArray()
-    val bs1 = ByteString(ba)
+    val bs1 = ByteString(data = ba)
     val bs2 = "IO".encodeToByteString()
 
     val bs = buildByteString {

gradle.properties

@@ -3,6 +3,7 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.daemon=false
 org.gradle.configureondemand=true
+org.gradle.configuration-cache=false
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
 # org.gradle.welcome=never

gradle/build-logic/common-plugins/build.gradle.kts

@@ -1,8 +1,11 @@
+@file:Suppress("UnstableApiUsage")
+
 import org.jetbrains.kotlin.gradle.dsl.*
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   `kotlin-dsl`
+  embeddedKotlin("plugin.serialization")
   alias(libs.plugins.jte)
   alias(libs.plugins.bestpractices)
   // alias(libs.plugins.kotlin.dsl)

gradle/build-logic/common-plugins/src/main/kotlin/common/KotlinExtns.kt

@@ -95,6 +95,7 @@ fun JavaToolchainSpec.configureJvmToolchain() {
 
 context(Project)
 fun JavaCompile.configureJavac() {
+  modularity.inferModulePath = true
   options.apply {
     encoding = "UTF-8"
     release = javaRelease

gradle/build-logic/common-plugins/src/main/kotlin/plugins/common.gradle.kts

@@ -101,8 +101,8 @@ tasks {
         description = "Generate template classes"
         group = LifecycleBasePlugin.BUILD_TASK_NAME
 
-        // GitHub actions workaround
-        val props = project.properties.toMutableMap()
+        // val props = project.properties.toMutableMap()
+        val props = mutableMapOf<String, Any?>()
         props["git_branch"] = project.findProperty("branch_name")
         props["git_tag"] = project.findProperty("base_tag")
 
@@ -130,7 +130,7 @@ tasks {
 
         filteringCharset = "UTF-8"
         from(project.projectDir.resolve("src/main/templates"))
-        into(project.buildDir.resolve("generated-sources/templates/kotlin/main"))
+        into(project.layout.buildDirectory.dir("generated-sources/templates/kotlin/main"))
         exclude { it.name.startsWith("jte") }
         expand(props)
 

gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.docs.gradle.kts

@@ -1,8 +1,8 @@
 package plugins
 
-import common.kotlinJvmTarget
 import common.libs
 import java.net.URI
+import org.jetbrains.dokka.DokkaConfiguration.Visibility
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 
 plugins {
@@ -14,53 +14,45 @@ tasks {
   withType<DokkaTaskPartial>().configureEach {
     dokkaSourceSets.configureEach {
       moduleName = project.name
-      jdkVersion = kotlinJvmTarget.map { it.target.toInt() }
+      jdkVersion = 20
+      // jdkVersion = kotlinJvmTarget.map { it.target.toInt() }
       noStdlibLink = false
       noJdkLink = false
       reportUndocumented = false
       skipDeprecated = true
       includes.from("README.md")
 
-      pluginsMapConfiguration =
-          mapOf(
-              "org.jetbrains.dokka.base.DokkaBase" to
-                  """{
-                 "footerMessage": "Copyright &copy; 2023 Suresh"
-                 }""")
+      documentedVisibilities = setOf(Visibility.PUBLIC, Visibility.PROTECTED)
 
       sourceLink {
-        sourceLink {
-          remoteUrl = libs.versions.publish.scm.url.map { URI("$it/tree/main/src").toURL() }
-          remoteLineSuffix = "#L"
-        }
-
-        externalDocumentationLink {
-          url = URI("https://kotlin.github.io/kotlinx.coroutines/package-list").toURL()
-        }
-
-        externalDocumentationLink {
-          url = URI("https://kotlinlang.org/api/kotlinx.serialization/package-list").toURL()
-        }
+        localDirectory = rootProject.projectDir
+        remoteUrl = libs.versions.publish.scm.url.map { URI("$it/tree/main").toURL() }
+        remoteLineSuffix = "#L"
+      }
 
-        perPackageOption {
-          matchingRegex = "kotlin($|\\.).*"
-          skipDeprecated = false
-          reportUndocumented = true // Emit warnings about not documented members
-          includeNonPublic = false
-        }
+      externalDocumentationLink {
+        url = URI("https://kotlin.github.io/kotlinx.coroutines/package-list").toURL()
       }
 
-      //  val rootPath = rootProject.rootDir.toPath()
-      //  val logoCss = rootPath.resolve("docs/css/logo-styles.css").toString().replace('\\', '/')
-      //  val paletteSvg =
-      // rootPath.resolve("docs/img/wordmark_small_dark.svg").toString().replace('\\', '/')
-      //  pluginsMapConfiguration = mapOf(
-      //      "org.jetbrains.dokka.base.DokkaBase" to """{
-      //          "customStyleSheets": ["$logoCss"],
-      //      "customAssets": ["$paletteSvg"],
-      //      "footerMessage": "Copyright &copy; 2021 AJ Alt"
-      //  }"""
-      //  )
+      externalDocumentationLink {
+        url = URI("https://kotlinlang.org/api/kotlinx.serialization/package-list").toURL()
+      }
     }
+
+    pluginsMapConfiguration =
+        mapOf(
+            "org.jetbrains.dokka.base.DokkaBase" to
+                """{ "footerMessage": "Copyright &copy; 2023 Suresh"}""")
+
+    //  val rootPath = rootProject.rootDir.toPath()
+    //  val logoCss = rootPath.resolve("docs/css/logo-styles.css").toString().replace('\\', '/')
+    //  val paletteSvg = rootPath.resolve("docs/img/img.svg").toString().replace('\\', '/')
+    //  pluginsMapConfiguration = mapOf(
+    //      "org.jetbrains.dokka.base.DokkaBase" to """{
+    //          "customStyleSheets": ["$logoCss"],
+    //      "customAssets": ["$paletteSvg"],
+    //      "footerMessage": "Copyright &copy; 2021 AJ Alt"
+    //     }"""
+    //  )
   }
 }

gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.mpp.gradle.kts

@@ -51,6 +51,7 @@ kotlinMultiplatform.apply {
 
     // val test by testRuns.existing
     testRuns.configureEach { executionTask.configure { configureKotlinTest() } }
+    // Attribute to distinguish JVM target
     attributes.attribute(mppTargetAttr, "jvm")
   }
 
@@ -60,18 +61,19 @@ kotlinMultiplatform.apply {
       compilerOptions.configure { configureKotlinJvm() }
     }
     testRuns.configureEach { executionTask.configure { configureKotlinTest() } }
+    // Attribute to distinguish Desktop target
     attributes.attribute(mppTargetAttr, "desktop")
   }
 
-  js(IR) {
+  js {
     useEsModules()
     binaries.executable()
 
     browser {
       commonWebpackConfig(
           Action {
             // outputFileName = "app.js"
-            cssSupport { enabled.set(true) }
+            cssSupport { enabled = true }
           })
 
       testTask(
@@ -84,6 +86,8 @@ kotlinMultiplatform.apply {
       // distribution { outputDirectory = file("$projectDir/docs") }
     }
 
+    compilations.configureEach { kotlinOptions { configureKotlinJs() } }
+
     testRuns.configureEach { executionTask.configure { configureTestReport() } }
   }
 
@@ -235,6 +239,8 @@ tasks {
   named<Copy>("jvmProcessResources") {
     val jsBrowserDist = named("jsBrowserDistribution")
     from(jsBrowserDist)
+    // filePermissions {}
+    // dirPermissions {}
   }
 
   // Application run should use the jvmJar as classpath
@@ -264,7 +270,7 @@ if (!isNodeJSConfigured.toBoolean()) {
     rootProject.extensions.configure<NodeJsRootExtension> {
       download = true
       isNodeJSConfigured = "true"
-      // nodeVersion = "20.0.0-v8-canaryxxxx"
+      nodeVersion = libs.versions.node.version.get()
       // nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
     }
   }

gradle/build-logic/common-plugins/src/main/kotlin/plugins/publishing.gradle.kts

@@ -16,14 +16,17 @@ if (project == rootProject) {
 
 group = libs.versions.group.get()
 
-tasks {
-  cyclonedxBom {
-    includeConfigs = listOf("runtimeClasspath")
-    skipConfigs = listOf("compileClasspath", "testCompileClasspath")
-    destination = project.layout.buildDirectory.dir("sbom").map { it.asFile }
-    outputFormat = "json"
-    includeLicenseText = true
-  }
+val sonatypeUsername: String? by project
+val sonatypePassword: String? by project
+val signingKey: String? by project
+val signingPassword: String? by project
+
+signing {
+  isRequired = sonatypeUsername.isNullOrBlank().not() && sonatypePassword.isNullOrBlank().not()
+  // isPublish = gradle.taskGraph.allTasks.any { it.name.startsWith("publish") }
+  useInMemoryPgpKeys(signingKey, signingPassword)
+  // useGpgCmd()
+  sign(publishing.publications)
 }
 
 publishing {
@@ -105,17 +108,15 @@ publishing {
   }
 }
 
-// signing {
-//  setRequired {
-//    gradle.taskGraph.allTasks.any {
-//      it.name.startsWith("publish")
-//    }
-//  }
-//  publishing.publications.configureEach {
-//    sign(this)
-//  }
-//  useGpgCmd()
-// }
+tasks {
+  cyclonedxBom {
+    includeConfigs = listOf("runtimeClasspath")
+    skipConfigs = listOf("compileClasspath", "testCompileClasspath")
+    destination = project.layout.buildDirectory.dir("sbom").map { it.asFile }
+    outputFormat = "json"
+    includeLicenseText = true
+  }
+}
 
 fun MavenPublication.configurePom() {
   val githubUrl = libs.versions.publish.scm.url

gradle/build-logic/gradle.properties

@@ -2,6 +2,7 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.daemon=false
 org.gradle.configureondemand=true
+org.gradle.configuration-cache=true
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.kotlin.dsl.allWarningsAsErrors=true