chore: kotlin 2.1.0 update and misc refactorings

Author: sureshg

.gitignore

@@ -17,6 +17,7 @@ reports
 hs_err_pid*
 classes.lst
 *.jsa
+*.aot*
 jre/
 
 # Kotlin

README.md

@@ -14,8 +14,8 @@ Kotlin JVM & Multiplatform projects.
 
 ```bash
 $ curl -s "https://get.sdkman.io" | bash
-$ sdk i java 21.0.4-zulu
-$ sdk u java 21.0.4-zulu
+$ sdk i java 21.0.5-zulu
+$ sdk u java 21.0.5-zulu
 ```
 
 ### Build & Testing
@@ -64,6 +64,16 @@ The next version will be based on the semantic version scope (`major`, `minor`,
 | `dev.suresh.plugin.repos`            | [![Maven Central](https://img.shields.io/maven-central/v/dev.suresh.plugin.repos/dev.suresh.plugin.repos.gradle.plugin?logo=gradle&logoColor=white&color=00B4E6)](https://repo1.maven.org/maven2/dev/suresh/plugin/)                       |
 | `dev.suresh.plugin.catalog`          | [![Maven Central](https://img.shields.io/maven-central/v/dev.suresh.plugin.catalog/dev.suresh.plugin.catalog.gradle.plugin?logo=gradle&logoColor=white&color=00B4E6)](https://repo1.maven.org/maven2/dev/suresh/plugin/)                   |
 
+### Verifying Artifacts
+
+The published artifacts are signed using this [key][signing_key]. The best way to verify artifacts
+is [automatically with Gradle][gradle_verification].
+
+[gradle_verification]: https://docs.gradle.org/current/userguide/dependency_verification.html#sec:signature-verification
+
+[signing_key]: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xc124db3a8ad1c13f7153decdf209c085c8b53ca1
+
+
 <details>
 <summary>Misc</summary>
 

gradle/libs.versions.toml

@@ -0,0 +1,68 @@
+pub   F209C085C8B53CA1
+uid   Suresh <[email protected]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFk9EUsBEAC/0DwHn0NrwHNrRLSbOFy0mPg/xyrFiiG7Ntblmot/0Iek1kaS
+lLNh5rXALgFvTQ6KnEhIQQR0nUaM+9Zo7CjzDSyMlmau/meFEiUTcKufEo/hxb9c
+nUZXXove/dbV/lGfvhqISpbQhx6/ZuYRfKi6Xk2hZxGoWvks+2uNuQUuK3G33yC7
+yxlWsmuToJs8wVJNu+WojehRb+AxiDV6zIuELxsxsLVL3nsrzrPLbcoQGEh7a/zH
+DymqnSSivIFPjOfimzLoXtILxDLSU1tfWi87XiU+i0gxH+3k0eezl2mclMpFKiq7
+zCKW1Xib2IcJCxnVvMg4426hdLlV7mVag91xy74vxOZ4ZjikANZvj31Ne+WLpObX
+5YAnqxBZr7G6OJzl7x3L7lzfc0jtujBovtQSmyF+N6rjgkfP41/vgWbTmf8GDHCm
+38mlFvlpwiPM4kcpnOQULBhX3/PkuEprYCXlFrBVhMfdoGb/ylCeAPWcy8a6Xlp1
+/SefPM7I+oQn4JJCRA8zpYWN733kWrlkZxpqdIEEmuxgJI5gVQn152SNcri4TSqc
+bENwMhwhkIu9kK/NU1ePQkCEBUrFurmQNvnARNov/bFjJ0NzAR4LS9Iy7Q+8TVaH
+RcdZC9V+LnDA+RH4Otfi9+yG5Yqm9EPX2qUARcUt+3uOjtLw7ivX13BzAQARAQAB
+tExTdXJlc2ggRyAoU3VyZXNoIEdvcGFsYWtyaXNobmFuJ3MgUHVibGljIFNpZ25p
+bmcgS2V5LikgPHN1cmVzaGcuZ0BnbWFpbC5jb20+iQJWBBMBCABAAhsDBwsJCAcD
+AgEGFQgCCQoLBBYCAwECHgECF4AWIQTBJNs6itHBP3FT3s3yCcCFyLU8oQUCYqOB
+gQUJGHAMNgAKCRDyCcCFyLU8oVu3D/9yKpRqo5UhesXgR2ZV8ssWMRodRJxzggaM
+iIYQz89xai5whmZL/ZFWGAj+DxfHo7ckcjZ3OvK2sozF7kbmGOK+Utu/JOJhlCql
+guuC4moKNAVNwCAX7V1OfefCz9sReMd5uKPQxTU+FzD5vdGwTehdazYhYp1LznE5
+V989hx2EVliZYG1E33Zjt7EhxG9yc2zEMSuUjHL1D83vzcmQLyFoVxUxXRa5QTay
+gQN4eUTQ6RuTDQRkjudxr0LJ2dSFekT/7qnw9S2hPISaT8qDX2PXSgGah7tmwf0U
+xxvvEHe2oltflrW6sK+AD7NdocZBePcmdYPnTadsDIOfkeHWtvfR+q7AOeYwVi3d
+d96bgYM1Wi1fB9FO2sbTmA8bw7luMjFS6OXyQB434xnv1QlBvTB+BtswPSXw+PTg
+BvuCymgAPeJvwf9SJ5gPi5eQIj2WykdwT9Ql9gj/7W1QNIFbpvfBnzo2tbt+MaIC
+sOd7wSMR9NBboritJ5gQ39iVdv7dbI0I0MmStht4KuNrdgqnPRXoqFOkx7U+5uMI
+/CtgF0bfPwWY28OgRppMxEbjOlT+BFELVWKyKG+C6ZJbyWmis2+ubOsQt/Oy3f0k
+1QWmGuvyK74l7DMYmT3z68vpZjndZ61yMjh4VxeyxGeqF1E6m8bBv2YMvPl5j+qg
+rplq/w0Z8IkCPwQTAQgAKQUCWT0RSwIbAwUJCWYBgAcLCQgHAwIBBhUIAgkKCwQW
+AgMBAh4BAheAAAoJEPIJwIXItTyhRdoP/1imMLLTGHSHmc9KSx6rl2HBirhVXfTO
+aei2MRSePSVBk4cal2whnMVL89hRksIJVgNLj+fmc60ZMRmMR1REsh51nJM2vha4
+OMvDm4etZmiLEBN5H1VEHylMizwkLauXGWb8P2rhw1RdKpCXVE8U2NKPVHnIcbuU
+v15tNz1LV1WgyNe/s4EvqHclobbc0V9jGc67exA70uVDy3KxsO6sulZR9jAL1HW7
+8KegB6/8Hvpu0e69S46mpX5b+4JZdvI1/tLZ3UiS2Z849nH0tFk6n/3OM82KCFWg
+JNnoz8lKIoPIx1KIFwG228LQTNxg7yppvYqfLYdvsZDya4by/Nzjcn8zVmhKrsg1
+ZLSa5PJ3TML40ZBdTyrtNJLBm578uSRBu9NToG9pC41bcItgEBWSoV7mBZuHA7Wc
+uyrwk8ra9nZIkQ6C2IPFevpfVzWbLZNFHGKjTRKx5SXkZxmwKr/avk3xKo29kTM4
+KlgTBOCamYMxo9hZwXrWhJFKodKHkGwcE3xx5l6kJNu7PaPfMW2rriO4TJowOSq8
+qbvmeb9MGIRpnrb8xQCAMTtRf7UyiN5C5z2mPEXQo75iw0NReJ1FgQ5R4WE0nNKR
+rQOUj/b48GLcLyObFYnaxEMEpYgtbxzpG7FbRG1deSmzBr/T03LOcH4fpJtmP9ZQ
+B7UYwnCeD+RnuQINBFk9EUsBEADHfdJfr300lICJcLVTBWxO/rdZyTHHqfERS38D
+3qyH5crvpl9J73tG6Jp2jLwpfgt02uq32SgeHUrqnBCBMq+w4+Iq7vzVzO8YvMi7
++bxMqAbduhp/1d+cBc4yzQ2O48ZM3rTBM+XEJx7hNKDZJGA8K0TyC5EdECqvPD/F
+vyMqd0u0LxTzsTqOTplqkrueuyPI1EnNAi5vocZQlTiwuYVHMVxd5jIoqN6trs+H
+lFiMFFk0MZ0cwMgiYRQjsVEN71rKGfsTKMw44rW0cSP/TOj14WRnTXcS/rbbe5pH
+9XN553SLvIPn+ouoHfCVOTaaMd18ACXjDIVfpr1FXjiPOYUI7so0zF5gqXD4ZvFo
+4fVZNB0KdntkxNcTu9mnzfKKTbzUDhB5ioYDa0wgleg1mUMqIjOtLoZEW2hRz9dO
+/NvKTW7aF8Bfdbirv42VQTRwGCDtNSoiGCbyYtyams5Rz6fhm9TUowmqRhVvJnM1
+5I8wP16xpJ7r7FRlPoPcrCcmaee5Jl3rAuGte7qtaa0d23jE5Ioaezbuj48r5reY
+uLECmZB9inwIXL5aJsV2k4sBV5Ax/4HFCu2nNUgwMQiyJD4xVc9KXr1LcCBJvIQw
+ABygUjLzvip2m9ByUZJNAKRNLOHJcZSFDRReZCVegltKW2hsnWzNjsAeA9VtJv/L
+rcGANQARAQABiQI8BBgBCAAmAhsMFiEEwSTbOorRwT9xU97N8gnAhci1PKEFAmKj
+gZ4FCRhwDFMACgkQ8gnAhci1PKFvOQ//c37SvI561fxwt1TRWaqjD9YN8JejkxuV
+B6nbOTFW+NIxEjXJ9Hs3ItjytAL7drEmtTMTFMfl4vQ3rCTC/UfbcSvdWm6rN5B6
+vX/lIWMIpbCgPdu3xFF/OM2IrOlQ9JoEM9QClYBpb0K+cUgzEGoUCldTe2K9b2+x
+nZ2BPJIQRLLidV/xceORK1nexsjfyuB0LKI+ciIzSzQ30c17bEvfE/DMxl0Mdp1q
+sklB4n92Z0LoHGHYapwUavRHdH0hm4Oqx8GinQCQnOrk5RKLem8maf0MOTUEZDK0
+1sCEmOQQT9qpBPdI5aL0cfnFAiqSH1l7uvhh2Czx7BXilvND28jNiD2i3uxDb1gA
+AySvWegipyy72yYY33VZVtE1cmfLpf3Umu0HR248v21WdGBpsR1/dqm80rHvKpMN
+mlcD3y7VEgv1M7tfyeL4Sz05K9xt/4QKG01KemrUyOVsYaQw9ytM7KItgzM5wzva
+jWTGi919GskYONkOK8FW4BKrreAEKUSvJrHLPupeOdGQSTWHrZlG4eKpTGHIQcqc
+s9JPzluo1wRHgz2jsNTIgKfnU6KMRGp93mUO1bTRB20kKrY6e0fx4cH7ZnU2mORD
+zJzKC8o94FjJApb/gDrjKi+E/qCSoGLJYHdMLWytcnBa11AzA8Dk657p6YjY0wCA
+yDpZeH4BAgg=
+=R3uo
+-----END PGP PUBLIC KEY BLOCK-----

gradle/verification-keyring.keys

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -178,7 +178,7 @@ dependencies {
   // implementation(libs.jte.native)
   // implementation(libs.build.kmp.hierarchy)
   // implementation(libs.build.includegit.plugin)
-  // implementation(libs.build.cyclonedx.plugin)
+  // implementation(libs.build.dependencyanalysis)
 
   testImplementation(gradleTestKit())
   // For using kotlin-dsl in pre-compiled script plugins

plugins/build.gradle.kts

@@ -261,10 +261,7 @@ fun KotlinMultiplatformExtension.hostNativeTarget(configure: KotlinNativeTarget.
     }
 
 fun KotlinNativeCompilerOptions.configureKotlinNative() {
-  freeCompilerArgs.addAll(
-      // "-Xverbose-phases=Linker"
-      // "-Xruntime-logs=gc=info"
-      )
+  // freeCompilerArgs.addAll("-Xverbose-phases=Linker", "-Xruntime-logs=gc=info")
 }
 
 fun KotlinMultiplatformExtension.allNativeTargets(configure: KotlinNativeTarget.() -> Unit = {}) {
@@ -274,6 +271,13 @@ fun KotlinMultiplatformExtension.allNativeTargets(configure: KotlinNativeTarget.
     configure()
   }
 
+  compilerOptions {
+    optIn.addAll(
+        "kotlinx.cinterop.ExperimentalForeignApi",
+        "kotlin.experimental.ExperimentalNativeApi",
+    )
+  }
+
   macosX64 { configureAll() }
   macosArm64 { configureAll() }
   linuxX64 { configureAll() }

plugins/src/main/kotlin/common/Multiplatform.kt

@@ -6,6 +6,9 @@ import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
 import org.gradle.process.CommandLineArgumentProvider
 
+/**
+ * [Configure-With-JavaModules](https://kotlinlang.org/docs/gradle-configure-project.html#configure-with-java-modules-jpms-enabled)
+ */
 internal class PatchModuleArgProvider(
     @get:Input val moduleName: Provider<String>,
     @InputFiles @PathSensitive(PathSensitivity.RELATIVE) val kotlinClasses: Provider<Directory>,

plugins/src/main/kotlin/common/PatchModuleArgProvider.kt

@@ -187,10 +187,12 @@ fun Project.jvmArguments(appRun: Boolean = false, headless: Boolean = true) = bu
             "-XX:+PrintCommandLineFlags",
             "--enable-native-access=ALL-UNNAMED",
             "--illegal-native-access=warn",
+            // "--sun-misc-unsafe-memory-access=warn",
             "-Xmx128M",
             "-XX:+UseZGC",
             "-XX:+UseStringDeduplication",
             "-XX:+UnlockExperimentalVMOptions",
+            "-XX:+UseCompactObjectHeaders",
             "-XX:MaxRAMPercentage=0.8",
             // "-XX:+UseEpsilonGC",
             // "-XX:+AlwaysPreTouch",
@@ -242,6 +244,7 @@ fun Project.jvmArguments(appRun: Boolean = false, headless: Boolean = true) = bu
             "-Djava.security.egd=file:/dev/./urandom",
             "-Djdk.includeInExceptions=hostInfo,jar",
             "-Dkotlinx.coroutines.debug",
+            "-Djdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK=0",
             "-Dcom.sun.management.jmxremote",
             "-Dcom.sun.management.jmxremote.local.only=false",
             "-Dcom.sun.management.jmxremote.port=9898",
@@ -259,7 +262,6 @@ fun Project.jvmArguments(appRun: Boolean = false, headless: Boolean = true) = bu
             // "-XshowSettings:system",
             // "-XshowSettings:properties",
             // "--show-module-resolution",
-            // "-XX:+UseCompactObjectHeaders",
             // "-XX:+ShowHiddenFrames",
             // "-verbose:module",
             // "-XX:ConcGCThreads=2",
@@ -390,29 +392,31 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
       apiVersion = kotlinApiVersion
       languageVersion = kotlinLangVersion
       progressiveMode = true
+      extraWarnings = false
       allWarningsAsErrors = false
       suppressWarnings = false
       verbose = false
       freeCompilerArgs.addAll(
           "-Xexpect-actual-classes",
           "-Xskip-prerelease-check",
+          "-Xwhen-guards",
+          "-Xmulti-dollar-interpolation",
+          "-Xnon-local-break-continue",
           // "-XXLanguage:+ExplicitBackingFields",
           // "-Xsuppress-version-warnings",
           // "-P",
           // "plugin:...=..."
       )
       optIn.addAll(
           "kotlin.ExperimentalStdlibApi",
-          "kotlin.contracts.ExperimentalContracts",
           "kotlin.ExperimentalUnsignedTypes",
+          "kotlin.contracts.ExperimentalContracts",
           "kotlin.io.encoding.ExperimentalEncodingApi",
           "kotlin.time.ExperimentalTime",
           "kotlinx.coroutines.ExperimentalCoroutinesApi",
           "kotlinx.serialization.ExperimentalSerializationApi",
           "kotlin.ExperimentalMultiplatform",
           "kotlin.js.ExperimentalJsExport",
-          "kotlin.experimental.ExperimentalNativeApi",
-          "kotlinx.cinterop.ExperimentalForeignApi",
           "kotlin.uuid.ExperimentalUuidApi",
           // "org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi",
       )
@@ -430,6 +434,7 @@ fun KspAATask.configureKspConfig() =
 
 /**
  * JVM backend compiler options can be found in,
+ * - [CommonCompilerArgs](https://github.com/JetBrains/kotlin/blob/master/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt)
  * - [K2JVMCompilerArguments.kt](https://github.com/JetBrains/kotlin/blob/master/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt)
  * - [JvmTarget.kt](https://github.com/JetBrains/kotlin/blob/master/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmTarget.kt)
  * - [ApiVersion.kt](https://github.com/JetBrains/kotlin/blob/master/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt#L35)

plugins/src/main/kotlin/common/ProjectExtns.kt

@@ -12,7 +12,6 @@ plugins {
 }
 
 val quickBuildEnabled = project.hasProperty("quick")
-val nativeBundleEnabled = project.hasProperty("bundle")
 val muslEnabled = project.hasProperty("musl")
 val reportsEnabled = project.hasProperty("reports")
 val agentEnabled = project.hasProperty("agent")
@@ -32,14 +31,19 @@ graalvmNative {
       add("--enable-preview")
       add("--enable-native-access=ALL-UNNAMED")
       add("--native-image-info")
-      add("--color=auto")
-      add("--enable-monitoring=heapdump,jfr,jvmstat,threaddump,nmt")
       add("--enable-https")
       add("--install-exit-handlers")
       add("-R:MaxHeapSize=64m")
-      add("-H:+ReportExceptionStackTraces")
       add("-EBUILD_NUMBER=${project.version}")
       add("-ECOMMIT_HASH=${semverExtn.commits.get().first().hash}")
+
+      add("-H:+UnlockExperimentalVMOptions")
+      add("-H:+VectorAPISupport")
+      add("-H:+CompactingOldGen")
+      add("-H:+ReportExceptionStackTraces")
+      add("-O3")
+      // add("-Os")
+      // add("-H:+ForeignAPISupport")
       // add("--features=graal.aot.RuntimeFeature")
       // add("-H:+AddAllCharsets")
       // add("-H:+IncludeAllLocales")
@@ -48,10 +52,14 @@ graalvmNative {
       // add("--enable-url-protocols=http,https,jar,unix")
       // add("--initialize-at-build-time=kotlinx,kotlin,org.slf4j")
 
-      // Experimental options
-      add("-H:+UnlockExperimentalVMOptions")
-      add("-H:+CompactingOldGen")
-      add("-Os")
+      val monOpts = buildString {
+        append("heapdump,jfr,jvmstat,threaddump,nmt")
+        if (Platform.isUnix) {
+          append(",")
+          append("jcmd")
+        }
+      }
+      add("--enable-monitoring=$monOpts")
 
       if (Platform.isLinux) {
         when {
@@ -78,11 +86,6 @@ graalvmNative {
         // add("--debug-attach")
       }
 
-      if (nativeBundleEnabled) {
-        add("--bundle-create")
-        add("--dry-run")
-      }
-
       if (java.toolchain.vendor.get().matches("Oracle.*")) {
         if (reportsEnabled) {
           add("-H:+BuildReport")
@@ -100,7 +103,8 @@ graalvmNative {
     // }
 
     jvmArgs = jvmArguments()
-    systemProperties = mapOf("java.awt.headless" to "false")
+    systemProperties =
+        mapOf("java.awt.headless" to "false", "jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK" to "0")
     javaLauncher = javaToolchains.launcherFor { configureJvmToolchain(project) }
   }
 
@@ -193,9 +197,6 @@ val niArchiveName
     if (muslEnabled) {
       append("static-")
     }
-    if (nativeBundleEnabled) {
-      append("bundle-")
-    }
     append(Platform.currentOS.id)
     append("-")
     append(Platform.currentArch.isa)

plugins/src/main/kotlin/dev.suresh.plugin.graalvm.gradle.kts

@@ -1,3 +1,4 @@
+import com.diffplug.spotless.kotlin.KtfmtStep
 import common.*
 import java.time.Year
 import org.hildan.github.changelog.plugin.GitHubChangelogExtension
@@ -89,11 +90,12 @@ spotless {
   }
   // if(plugins.hasPlugin(JavaPlugin::class.java)){ }
 
-  val ktfmtVersion = libs.versions.ktfmt.get()
+  val ktfmtVersion = maxOf(KtfmtStep.defaultVersion(), libs.versions.ktfmt.get())
   kotlin {
     ktfmt(ktfmtVersion)
     target("src/**/*.kts", "src/**/*.kt")
     trimTrailingWhitespace()
+    suppressLintsFor { step = "ktfmt" }
     // licenseHeader(rootProject.file("gradle/license-header.txt"))
   }
 

plugins/src/main/kotlin/dev.suresh.plugin.kotlin.docs.gradle.kts

@@ -1,6 +1,7 @@
 import com.github.ajalt.mordant.rendering.TextColors
 import com.google.cloud.tools.jib.gradle.BuildDockerTask
 import com.google.devtools.ksp.gradle.KspAATask
+import com.javiersc.kotlin.kopy.args.KopyFunctions
 import common.*
 import java.io.PrintWriter
 import java.io.StringWriter
@@ -20,7 +21,7 @@ plugins {
   kotlin("plugin.power-assert")
   com.google.devtools.ksp
   dev.zacsweers.redacted
-  // com.javiersc.kotlin.kopy
+  com.javiersc.kotlin.kopy
   org.jetbrains.kotlinx.atomicfu
   id("dev.suresh.plugin.kotlin.docs")
   // kotlin("plugin.atomicfu")
@@ -75,7 +76,7 @@ redacted {
   replacementString = "█"
 }
 
-// kopy { functions = KopyFunctions.Copy }
+kopy { functions = KopyFunctions.Copy }
 
 // Java agent configuration for jib
 val javaAgent by configurations.registering { isTransitive = false }