chore: build-logic changes

sureshg · sureshg · commit e7b46ff184b7 · 2023-08-14T17:47:02.000-07:00
diff --git a/README.md b/README.md
@@ -120,38 +120,38 @@ $ actionlint
 
 ```mermaid
 %%{
-init: {
-'theme': 'neutral'
-}
+  init: {
+    'theme': 'neutral'
+  }
 }%%
 
 graph LR
 
-    subgraph compose
-        desktop
-        web
-    end
-    subgraph dep-mgmt
-        bom
-        catalog
-    end
-    subgraph devtools
-        compiler
-        ksp
-    end
-    subgraph compiler
-        compiler
-        plugin
-    end
-    subgraph ksp
-        ksp
-        processor
-    end
-    web --> common
-    web --> common
-    desktop --> common
-    backend --> common
-    web --> common
-    benchmarks --> common
+  subgraph compose
+    desktop
+    web
+  end
+  subgraph dep-mgmt
+    bom
+    catalog
+  end
+  subgraph devtools
+    compiler
+    ksp
+  end
+  subgraph compiler
+    compiler
+    plugin
+  end
+  subgraph ksp
+    ksp
+    processor
+  end
+  web --> common
+  web --> common
+  desktop --> common
+  backend --> common
+  web --> common
+  benchmarks --> common
 
 ```
diff --git a/common/src/commonMain/kotlin/dev/suresh/Greeting.kt b/common/src/commonMain/kotlin/dev/suresh/Greeting.kt
@@ -22,15 +22,15 @@ class Greeting {
 
   fun greeting() =
       """
-      | Platform       : Kotlin $platform
-      | Build Time     : ${BuildConfig.buildTime}
-      | Build Version  : ${BuildConfig.version}
-      | Java Version   : ${BuildConfig.java}
-      | Kotlin Version : ${KotlinVersion.CURRENT}
-      | Gradle Version : ${BuildConfig.gradle}
-      | Git Hash       : ${BuildConfig.gitHash}
-      | Git Message    : ${BuildConfig.gitMessage}
-      | Git Tag        : ${BuildConfig.gitTags}
+      | Platform          : Kotlin $platform
+      | Build Time (UTC)  : ${BuildConfig.buildTimeUTC}
+      | Build Version     : ${BuildConfig.version}
+      | Java Version      : ${BuildConfig.java}
+      | Kotlin Version    : ${KotlinVersion.CURRENT}
+      | Gradle Version    : ${BuildConfig.gradle}
+      | Git Hash          : ${BuildConfig.gitHash}
+      | Git Message       : ${BuildConfig.gitMessage}
+      | Git Tag           : ${BuildConfig.gitTags}
       | ${KData("Foo", 20, "test")}
       | ${kotlinxTests()}
       """
diff --git a/gradle/build-logic/common-plugins/build.gradle.kts b/gradle/build-logic/common-plugins/build.gradle.kts
@@ -102,6 +102,7 @@ dependencies {
   implementation(platform(libs.kotlin.bom))
   implementation(kotlin("stdlib"))
   implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.kotlinx.datetime)
   // Http client and JSON serialization
   implementation(libs.ktor.client.java)
   implementation(libs.ktor.client.content.negotiation)
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/DepReportsPlugin.kt b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/DepReportsPlugin.kt
@@ -29,15 +29,15 @@ class DepReportsPlugin : Plugin<Project> {
                 val resolvedArtifacts = runtimeClasspath.incoming.artifacts.resolvedArtifacts
 
                 // Transform the artifacts
-                artifactIds.set(resolvedArtifacts.map { it.map(ResolvedArtifactResult::getId) })
-                artifactVariants.set(
-                    resolvedArtifacts.map { it.map(ResolvedArtifactResult::getVariant) })
-                artifactFiles.set(
+                artifactIds = resolvedArtifacts.map { it.map(ResolvedArtifactResult::getId) }
+                artifactVariants =
+                    resolvedArtifacts.map { it.map(ResolvedArtifactResult::getVariant) }
+                artifactFiles =
                     resolvedArtifacts.map {
                       it.map { resolvedArtifactResult ->
                         layout.projectDirectory.file(resolvedArtifactResult.file.absolutePath)
                       }
-                    })
+                    }
                 outputFile.convention(layout.buildDirectory.file("resolved-artifacts.txt"))
               }
         }
@@ -68,10 +68,10 @@ abstract class ListResolvedArtifacts : DefaultTask() {
       ids.forEachIndexed { idx, id ->
         val variant = variants[idx]
         val file = files[idx]
-        it.appendLine("FILE ${file.asFile.name}")
-        it.appendLine("  id: ${id.displayName}")
-        it.appendLine("  variant: ${variant.displayName}")
-        it.appendLine("  size: ${file.asFile.length()}")
+        it.appendLine("File - ${file.asFile.name}")
+        it.appendLine("  Id : ${id.displayName}")
+        it.appendLine("  Variant : ${variant.displayName}")
+        it.appendLine("  Size : ${file.asFile.length()}")
         it.appendLine()
       }
     }
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/common.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/common.gradle.kts
@@ -13,7 +13,7 @@ import tasks.*
 plugins {
   idea
   application
-  id("com.github.johnrengelman.shadow")
+  com.github.johnrengelman.shadow
   id("plugins.kotlin.docs")
   id("plugins.publishing")
 }
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/graalvm.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/graalvm.gradle.kts
@@ -10,8 +10,8 @@ plugins {
   application
   id("plugins.kotlin.jvm")
   id("plugins.misc")
-  id("org.graalvm.buildtools.native")
-  id("com.autonomousapps.dependency-analysis")
+  org.graalvm.buildtools.native
+  com.autonomousapps.`dependency-analysis`
 }
 
 val debugEnabled = project.hasProperty("debug")
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.benchmark.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.benchmark.gradle.kts
@@ -15,8 +15,8 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
  */
 plugins {
   id("plugins.kotlin.mpp")
-  id("org.jetbrains.kotlinx.benchmark")
-  id("org.jetbrains.kotlin.plugin.allopen")
+  org.jetbrains.kotlinx.benchmark
+  `kotlin-allopen`
 }
 
 description = "Kotlin benchmarking tests"
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.docs.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.docs.gradle.kts
@@ -9,9 +9,9 @@ import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 
 plugins {
-  id("org.jetbrains.dokka")
-  id("org.jetbrains.kotlinx.kover")
-  id("test-report-aggregation")
+  org.jetbrains.dokka
+  org.jetbrains.kotlinx.kover
+  `test-report-aggregation`
 }
 
 // The following plugins and config apply only to a root project.
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.jvm.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.jvm.gradle.kts
@@ -8,11 +8,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   `java-library`
-  id("com.google.devtools.ksp")
+  com.google.devtools.ksp
   kotlin("jvm")
-  kotlin("plugin.serialization")
-  id("kotlinx-atomicfu")
-  id("dev.zacsweers.redacted")
+  `kotlinx-serialization`
+  `kotlinx-atomicfu`
+  dev.zacsweers.redacted
   id("plugins.kotlin.docs")
   // `test-suite-base`
 }
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.mpp.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.mpp.gradle.kts
@@ -14,14 +14,14 @@ import tasks.BuildConfigExtension
 
 plugins {
   java
-  kotlin("plugin.serialization")
-  id("com.google.devtools.ksp")
-  id("kotlinx-atomicfu")
-  id("dev.zacsweers.redacted")
+  `kotlinx-serialization`
+  com.google.devtools.ksp
+  `kotlinx-atomicfu`
+  dev.zacsweers.redacted
+  app.cash.molecule
   id("plugins.kotlin.docs")
-  id("app.cash.molecule")
-  // id("dev.petuska.npm.publish")
-  // id("dev.mokkery")
+  // dev.petuska.npm.publish
+  // dev.mokkery
 }
 
 // Workaround for "The root project is not yet available for build" error.
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/misc.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/misc.gradle.kts
@@ -6,9 +6,9 @@ import org.gradle.kotlin.dsl.*
 plugins {
   java
   wrapper
-  id("com.diffplug.spotless")
-  id("com.github.ben-manes.versions")
-  id("dev.iurysouza.modulegraph")
+  com.diffplug.spotless
+  com.github.`ben-manes`.versions
+  dev.iurysouza.modulegraph
   // id("plugins.common")
   // id("gg.jte.gradle")
 }
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/publishing.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/publishing.gradle.kts
@@ -6,7 +6,7 @@ import common.libs
 plugins {
   `maven-publish`
   signing
-  // id("org.cyclonedx.bom")
+  // org.cyclonedx.bom
 }
 
 // Nexus plugin needs to apply to the root project only
@@ -52,7 +52,7 @@ publishing {
     plugins.withId("org.jetbrains.kotlin.multiplatform") {
       val javadocJar by
           tasks.registering(Jar::class) {
-            archiveClassifier.set("javadoc")
+            archiveClassifier = "javadoc"
             duplicatesStrategy = DuplicatesStrategy.WARN
             // contents are deliberately left empty
           }
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/settings/include.settings.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/settings/include.settings.gradle.kts
@@ -1,3 +1,3 @@
 package settings
 
-// Including Another Settings plugin"
+// Including other settings plugin
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/settings/repos.settings.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/settings/repos.settings.gradle.kts
@@ -3,12 +3,13 @@ package settings
 import com.gradle.scan.plugin.PublishedBuildScan
 import common.GithubAction
 import common.Repo
+import org.gradle.api.JavaVersion.VERSION_17
 import org.gradle.kotlin.dsl.*
 import org.gradle.toolchains.foojay.FoojayToolchainResolver
 
 pluginManagement {
-  require(JavaVersion.current().isJava11Compatible) {
-    "This build requires Gradle to be run with at least Java 11"
+  require(JavaVersion.current().isCompatibleWith(VERSION_17)) {
+    "This build requires Gradle to be run with at least Java $VERSION_17"
   }
 
   resolutionStrategy {
@@ -41,7 +42,7 @@ plugins {
   id("org.gradle.toolchains.foojay-resolver")
   // Use semver on all projects
   id("com.javiersc.semver")
-  // Include another pre-compiled settings plugin
+  // Include other pre-compiled settings plugin
   id("settings.include")
 }
 
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/tasks/BuildConfig.kt b/gradle/build-logic/common-plugins/src/main/kotlin/tasks/BuildConfig.kt
@@ -43,6 +43,7 @@ abstract class BuildConfig @Inject constructor(private val extension: BuildConfi
       mapOf(
           "gitHash" to commit.hash,
           "gitMessage" to commit.message,
+          "gitFullMessage" to commit.fullMessage.trim(),
           "gitTimestampEpochSecond" to commit.timestampEpochSecond.toString(),
           "gitTags" to commit.tags.joinToString(),
       )
diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/tasks/ExecTask.kt b/gradle/build-logic/common-plugins/src/main/kotlin/tasks/ExecTask.kt
@@ -3,6 +3,7 @@ package tasks
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.*
+import org.gradle.kotlin.dsl.*
 
 /**
  * A sample [JavaExec] task that executes class from runtime classpath is as follows:
@@ -30,7 +31,7 @@ abstract class ExecTask : JavaExec() {
 
   init {
     group = "build"
-    mainClass.set("app.Main")
+    mainClass = "app.Main"
     argumentProviders.add { listOf(outputDir.get().asFile.path, sourceFile.get().asFile.path) }
   }
 }
diff --git a/gradle/build-logic/common-plugins/src/main/resources/BuildConfig.kte b/gradle/build-logic/common-plugins/src/main/resources/BuildConfig.kte
@@ -1,6 +1,7 @@
 @import common.camelCase
-@import java.time.LocalDateTime
 @import gg.jte.support.ForSupport
+@import kotlinx.datetime.Clock
+@import kotlinx.datetime.*
 
 @param className: String
 @param pkg: String
@@ -13,7 +14,7 @@
 @if(pkg.isNotBlank())package ${pkg}@endif
 object ${className} {
 
-   const val buildTime = "${LocalDateTime.now().toString()}"
+   const val buildTimeUTC = "${Clock.System.now().toLocalDateTime(TimeZone.UTC).toString()}"
 
    const val version = "${version}"
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,7 +24,7 @@ publish-scm-url                = "https://github.com/sureshg/kotlin-mpp-playgrou
 # Gradle Dependencies Versions
 kotlinx-kover                  = "0.7.3"
 kotlinx-io                     = "0.2.1"
-kotlinx-atomicfu               = "0.21.0"
+kotlinx-atomicfu               = "0.22.0"
 kotlinx-coroutines             = "1.7.3"
 kotlinx-datetime               = "0.4.0"
 kotlinx-serialization          = "1.6.0-RC"
@@ -34,7 +34,7 @@ kotlinx-html                   = "0.9.1"
 kotlinx-benchmark              = "0.4.9"
 kotlinx-reflect-lite           = "1.1.0"
 kotlinx-bincompat              = "0.13.2"
-kotlin-wrappers                = "1.0.0-pre.614"
+kotlin-wrappers                = "1.0.0-pre.615"
 zip-prefixer                   = "0.3.1"
 ajalt-mordant                  = "2.1.0"
 ajalt-clikt                    = "4.1.0"
@@ -50,7 +50,7 @@ jte                            = "3.0.2"
 junit                          = "5.10.0"
 koin                           = "3.4.1"
 kotest                         = "5.6.2"
-mockk                          = "1.13.5"
+mockk                          = "1.13.7"
 mokkery                        = "1.9.0-1.3.0"
 ksp-auto-service               = "1.1.0"
 ksp-redacted                   = "1.6.0"

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import tasks.*`
`13`	`13`	`plugins {`
`14`	`14`	`idea`
`15`	`15`	`application`
`16`		`- id("com.github.johnrengelman.shadow")`
	`16`	`+ com.github.johnrengelman.shadow`
`17`	`17`	`id("plugins.kotlin.docs")`
`18`	`18`	`id("plugins.publishing")`
`19`	`19`	`}`