chore: misc cleanups

Author: sureshg

.github/workflows/build.yml

@@ -115,17 +115,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_SECRET_KEY_ID }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_SECRET_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_SECRET_KEY_PASSWORD }}
-          ORG_GRADLE_PROJECT_githubActor: ${{ github.actor }}
-          ORG_GRADLE_PROJECT_githubToken: ${{ secrets.GITHUB_TOKEN }}
-          # JOB_CONTEXT: ${{ toJSON(job) }}
-          # STEPS_CONTEXT: ${{ toJSON(steps) }}
-          # RUNNER_CONTEXT: ${{ toJSON(runner) }}
-          # GITHUB_CONTEXT: ${{ toJSON(github) }}
-          # STRATEGY_CONTEXT: ${{ toJSON(strategy) }}
-          # MATRIX_CONTEXT: ${{ toJSON(matrix) }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_PRIVATE_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PRIVATE_KEY_PASSWORD }}
+          ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }}
+          ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 📤 Uploading ${{ matrix.os }} build artifacts
         if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
@@ -171,7 +165,7 @@ jobs:
         uses: JamesIves/[email protected]
         with:
           branch: gh-pages
-          folder: build/reports/tests/test
+          folder: build/reports/allTests
           target-folder: tests
           clean: true
           commit-message: 'report: Deployed test results'

compose/cmp/build.gradle.kts

@@ -1,4 +1,5 @@
 @file:OptIn(ExperimentalComposeLibrary::class)
+@file:Suppress("UnstableApiUsage")
 
 import common.Platform
 import common.jvmArguments

gradle/build-logic/build.gradle.kts

@@ -136,9 +136,6 @@ jte {
 }
 
 dependencies {
-  // Hack to access version catalog from pre-compiled script plugins.
-  // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
-  implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
   implementation(platform(libs.kotlin.bom))
   implementation(libs.kotlin.stdlib)
   implementation(libs.kotlinx.coroutines.core)
@@ -194,6 +191,9 @@ dependencies {
   implementation(libs.build.kopy.plugin)
   implementation(libs.build.tomlj)
 
+  // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
+  implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+
   // implementation(libs.build.kotlin.compose.compiler)
   // implementation(libs.build.karakum.plugin)
   // implementation(libs.jte.native)

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.docs.gradle.kts

@@ -6,23 +6,17 @@ import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.DokkaBaseConfiguration
 import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
-import org.jetbrains.kotlin.gradle.tasks.KotlinTest
 
 plugins {
   org.jetbrains.dokka
   com.diffplug.spotless
-  `test-report-aggregation`
+  // `test-report-aggregation`
 }
 
 // The following plugins and config apply only to a root project.
 if (isRootProject) {
   apply(plugin = "org.hildan.github.changelog")
 
-  // Combined test report
-  dependencies {
-    allprojects.filter { !it.path.contains(":dep-mgmt") }.forEach { testReportAggregation(it) }
-  }
-
   // Dokka multi-module config.
   tasks.withType<DokkaMultiModuleTask>().configureEach {
     description = project.description.orEmpty()
@@ -43,10 +37,12 @@ if (isRootProject) {
   // Combined test reports
   val allTestReports by
       tasks.registering(TestReport::class) {
-        destinationDirectory = layout.buildDirectory.dir("reports/tests/test")
-        allprojects.forEach {
-          testResults.from(it.tasks.withType<Test>(), it.tasks.withType<KotlinTest>())
-        }
+        group = LifecycleBasePlugin.VERIFICATION_GROUP
+        description = "Generates aggregated test report for all tests."
+        destinationDirectory = layout.buildDirectory.dir("reports/allTests")
+
+        // Include the results from the `test` task in all subprojects
+        allprojects.forEach { testResults.from(it.tasks.withType<AbstractTestTask>()) }
 
         doLast {
           logger.lifecycle("All test reports are aggregated in ${destinationDirectory.get()}")

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.mpp.gradle.kts

@@ -112,7 +112,7 @@ tasks {
 
   withType<KotlinNpmInstallTask>().configureEach { configureKotlinNpm() }
 
-  // withType<KotlinJsCompile>().configureEach { }
+  // withType<Kotlin2JsCompile>().configureEach {}
 
   withType<Jar>().configureEach {
     manifest {

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.publishing.gradle.kts

@@ -8,20 +8,6 @@ plugins {
   `maven-publish`
   signing
   com.gradleup.nmcp
-  // org.cyclonedx.bom
-}
-
-// Nexus plugin needs to apply to the root project only
-if (isRootProject) {
-  apply(plugin = "io.github.gradle-nexus.publish-plugin")
-
-  nmcp {
-    publishAggregation {
-      username = mavenCentralUsername
-      password = mavenCentralPassword
-      publicationType = "AUTOMATIC"
-    }
-  }
 }
 
 group = libs.versions.group.get()
@@ -37,9 +23,8 @@ publishing {
       name = "GitHubPackages"
       url = uri(githubPackage(libs.versions.dev.name.get(), rootProject.name))
       credentials {
-        // findProperty("githubActor")
-        username = githubActor.orNull ?: System.getenv("GITHUB_ACTOR")
-        password = githubToken.orNull ?: System.getenv("GITHUB_TOKEN")
+        username = githubPackagesUsername.orNull
+        password = githubPackagesPassword.orNull
       }
     }
   }
@@ -113,8 +98,8 @@ pluginManager.withPlugin("com.google.cloud.tools.jib") {
     to {
       if (image.orEmpty().startsWith("ghcr.io", ignoreCase = true)) {
         auth {
-          username = githubActor.orNull ?: System.getenv("GITHUB_ACTOR")
-          password = githubToken.orNull ?: System.getenv("GITHUB_TOKEN")
+          username = githubPackagesUsername.orNull
+          password = githubPackagesPassword.orNull
         }
       }
     }
@@ -125,9 +110,8 @@ signing {
   setRequired { hasSigningKey }
   if (hasSigningKey) {
     useInMemoryPgpKeys(signingKeyId.orNull, signingKey.orNull, signingPassword.orNull)
+    sign(publishing.publications)
   }
-  sign(publishing.publications)
-  // gradle.taskGraph.allTasks.any { it.name.startsWith("publish") }
 }
 
 nmcp {
@@ -179,12 +163,4 @@ tasks {
 
   // For publishing kotlin native binaries
   withType<AbstractPublishToMaven>().configureEach { mustRunAfter(withType<KotlinNativeLink>()) }
-
-  // cyclonedxBom {
-  //   includeConfigs = listOf("runtimeClasspath")
-  //   skipConfigs = listOf("compileClasspath", "testCompileClasspath")
-  //   destination = project.layout.buildDirectory.dir("sbom").map { it.asFile }
-  //   outputFormat = "json"
-  //   includeLicenseText = true
-  // }
 }