chore: kotlin 2.1.20-RC update and misc changes

Author: sureshg

gradle.properties

@@ -65,6 +65,6 @@ enableMavenSnapshot=false
 # Other projects
 composeBuild=true
 springBoot=false
-nativeBuild=false
-nativeWinTarget=false
+kotlin.target.native.enabled=false
+kotlin.target.win.enabled=false
 debug=false

gradle/build-logic/src/main/kotlin/common/Multiplatform.kt

@@ -7,6 +7,7 @@ import org.gradle.kotlin.dsl.*
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 fun KotlinMultiplatformExtension.commonTarget(project: Project) =
@@ -101,7 +102,7 @@ fun KotlinMultiplatformExtension.jvmTarget(project: Project) =
         // val test by testRuns.existing
         testRuns.configureEach { executionTask.configure { configureJavaTest() } }
 
-        // Configure application executable only it's enabled
+        // Configures JavaExec task with name "runJvm" and Gradle distribution "jvmDistZip"
         if (isKmpExecEnabled) {
           binaries {
             executable {
@@ -112,14 +113,6 @@ fun KotlinMultiplatformExtension.jvmTarget(project: Project) =
           }
         }
 
-        // Register a task to execute a class using jvm runtime dependencies.
-        // compilations.getByName("test") {
-        //   tasks.register<JavaExec>("ktExec") {
-        //     classpath(runtimeDependencyFiles, output)
-        //     mainClass = "dev.suresh.test.ExecMain"
-        //   }
-        // }
-
         // attributes.attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm)
       }
 
@@ -255,6 +248,37 @@ fun KotlinMultiplatformExtension.wasmJsTarget(project: Project) =
       }
     }
 
+fun KotlinMultiplatformExtension.wasmWasiTarget(project: Project) =
+    with(project) {
+      wasmWasi {
+        nodejs()
+        if (isSharedProject.not()) {
+          binaries
+              .executable()
+              .filter { it.mode == KotlinJsBinaryMode.PRODUCTION }
+              .forEach { binary ->
+                val wasmFilename = binary.mainFileName.map { it.replaceAfterLast(".", "wasm") }
+                val wasmFile =
+                    binary.linkTask.flatMap { it.destinationDirectory.file(wasmFilename) }
+                // Add generated WASM binary as maven publication
+                mavenPublication { artifact(wasmFile) { classifier = targetName } }
+              }
+        }
+
+        compilations.all {
+          compileTaskProvider.configure {
+            compilerOptions.freeCompilerArgs.addAll(
+                listOf("-Xwasm-use-traps-instead-of-exceptions"))
+          }
+        }
+      }
+
+      sourceSets {
+        wasmWasiMain { dependencies {} }
+        wasmWasiTest { kotlin {} }
+      }
+    }
+
 fun KotlinMultiplatformExtension.hostNativeTarget(configure: KotlinNativeTarget.() -> Unit = {}) =
     when {
       Platform.isMac -> {
@@ -275,10 +299,7 @@ fun KotlinMultiplatformExtension.nativeTargets(
     configure: KotlinNativeTarget.() -> Unit = {}
 ) =
     with(project) {
-      val nativeBuild: String? by project
-      val nativeWinTarget: String? by project
-
-      if (nativeBuild.toBoolean()) {
+      if (isNativeTargetEnabled) {
         fun KotlinNativeTarget.configureAll() {
           compilerOptions {
             // freeCompilerArgs.addAll("-Xverbose-phases=Linker", "-Xruntime-logs=gc=info")
@@ -297,11 +318,18 @@ fun KotlinMultiplatformExtension.nativeTargets(
         macosArm64 { configureAll() }
         linuxX64 { configureAll() }
         linuxArm64 { configureAll() }
-        if (nativeWinTarget.toBoolean()) {
+        if (isWinTargetEnabled) {
           mingwX64 { configureAll() }
         }
 
-        sourceSets { nativeMain { dependencies { api(libs.ktor.client.curl) } } }
+        sourceSets {
+          nativeMain {
+            dependencies {
+              // On native targets, only curl currently supports TLS
+              api(libs.ktor.client.curl)
+            }
+          }
+        }
       }
     }
 

gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt

@@ -18,6 +18,7 @@ import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.api.attributes.*
 import org.gradle.api.component.AdhocComponentWithVariants
 import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.provider.*
 import org.gradle.api.tasks.*
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.*
@@ -59,25 +60,31 @@ val Project.buildLogicProjectName
 val Project.isSharedProject
   get() = name == sharedProjectName
 
-// val debug: String? by project
-val Project.debugEnabled
-  get() = providers.gradleProperty("debug").map(String::toBoolean).getOrElse(false)
-
 val Project.skipTest
-  get() = providers.gradleProperty("skip.test").map(String::toBoolean).getOrElse(false)
+  get() = gradleBooleanProperty("skip.test").get()
 
 val Project.hasCleanTask
   get() = gradle.startParameter.taskNames.any { it in listOf("clean", "cleanAll") }
 
-val Project.isSnapshotVersion
-  get() = version.toString().endsWith("SNAPSHOT", true)
-
 val Project.runsOnCI
   get() = providers.environmentVariable("CI").isPresent
 
+// val debug: String? by project
+val Project.debugEnabled
+  get() = gradleBooleanProperty("debug").get()
+
+val Project.isSnapshotVersion
+  get() = version.toString().endsWith("SNAPSHOT", true)
+
 val Project.isKmpExecEnabled
   get() = extra.has("enableKmpExec") && extra["enableKmpExec"] as Boolean
 
+val Project.isNativeTargetEnabled: Boolean
+  get() = gradleBooleanProperty("kotlin.target.native.enabled").get()
+
+val Project.isWinTargetEnabled: Boolean
+  get() = gradleBooleanProperty("kotlin.target.win.enabled").get()
+
 /** Java version properties. */
 val Project.javaVersion
   get() = libs.versions.java.asProvider().map { JavaVersion.toVersion(it) }
@@ -110,6 +117,9 @@ val Project.kotlinLangVersion
 val Project.orgName
   get() = libs.versions.org.name.get()
 
+val Project.orgUrl
+  get() = libs.versions.org.url.get()
+
 val Project.githubUser
   get() = libs.versions.dev.name.get().lowercase()
 
@@ -705,6 +715,9 @@ fun Project.addFileToJavaComponent(file: File) {
   }
 }
 
+fun Project.gradleBooleanProperty(name: String): Provider<Boolean> =
+    providers.gradleProperty(name).map(String::toBoolean).orElse(false)
+
 /** Lazy version of [TaskContainer.maybeCreate] */
 inline fun <reified T : Task> TaskContainer.maybeRegister(
     name: String,

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

@@ -1,6 +1,7 @@
 @file:Suppress("UnstableApiUsage")
 @file:OptIn(ExperimentalKotlinGradlePluginApi::class, ExperimentalBCVApi::class)
 
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.google.devtools.ksp.gradle.KspAATask
 import com.javiersc.kotlin.kopy.args.KopyFunctions
 import common.*
@@ -34,6 +35,8 @@ plugins {
   // dev.mokkery
 }
 
+configurations.configureEach { resolutionStrategy { failOnNonReproducibleResolution() } }
+
 kotlin {
   commonTarget(project)
   when (project.name) {
@@ -147,6 +150,34 @@ tasks {
     }
   }
 
+  pluginManager.withPlugin("com.gradleup.shadow") {
+    // Register a shadowJar task for the default jvm target
+    val mainCompilation = kotlin.jvm().compilations.getByName("main")
+    val shadowJvmJar by
+        registering(ShadowJar::class) {
+          from(tasks.named("jvmJar"))
+          // from(mainCompilation.output.allOutputs) -> allOutputs == classes + resources
+          val runtimeDepConfig =
+              project.configurations.getByName(mainCompilation.runtimeDependencyConfigurationName)
+          configurations = listOf(runtimeDepConfig)
+          archiveClassifier = "all"
+          mergeServiceFiles()
+          manifest {
+            attributes[Attributes.Name.MAIN_CLASS.toString()] = libs.versions.app.mainclass
+          }
+        }
+
+    val buildExecutable by
+        registering(ReallyExecJar::class) {
+          jarFile = shadowJvmJar.flatMap { it.archiveFile }
+          javaOpts = jvmRunArgs
+          execJarFile = layout.buildDirectory.dir("libs").map { it.file("${project.name}-app") }
+          onlyIf { OperatingSystem.current().isUnix }
+        }
+
+    build { finalizedBy(buildExecutable) }
+  }
+
   pluginManager.withPlugin("org.jetbrains.kotlinx.binary-compatibility-validator") {
     configure<ApiValidationExtension> {
       ignoredPackages.add("dev.suresh.test")
@@ -156,22 +187,9 @@ tasks {
     }
 
     withType<KotlinApiBuildTask>().configureEach {
-      // inputJar = named<Jar>("shadowJar").flatMap { it.archiveFile }
+      // inputJar = named<Jar>("shadowJvmJar").flatMap { it.archiveFile }
     }
   }
-
-  pluginManager.withPlugin("com.gradleup.shadow") {
-    val buildExecutable by
-        registering(ReallyExecJar::class) {
-          jarFile = named<Jar>("shadowJar").flatMap { it.archiveFile }
-          // javaOpts = application.applicationDefaultJvmArgs
-          javaOpts = named<JavaExec>("run").get().jvmArgs
-          execJarFile = layout.buildDirectory.dir("libs").map { it.file("${project.name}-app") }
-          onlyIf { OperatingSystem.current().isUnix }
-        }
-
-    build { finalizedBy(buildExecutable) }
-  }
 }
 
 var npmEnabled: String? by rootProject.extra

gradle/kotlin-js-store/package-lock.json

@@ -6,7 +6,7 @@ kotlin-jvmtarget               = "21"
 kotlin-dsl-jvmtarget           = "21"
 kotlin-api-version             = "2.1"
 kotlin-lang-version            = "2.1"
-gradle                         = "8.13-rc-1"
+gradle                         = "8.13-rc-2"
 java-vendor                    = "Oracle"
 java-jvmArguments              = "--enable-preview"
 java-addModules                = "jdk.incubator.vector"
@@ -20,7 +20,7 @@ org-name                       = "suresh.dev"
 org-url                        = "https://suresh.dev"
 
 # Gradle Dependencies Versions
-bc-plugins                     = "1.12.0"
+bc-plugins                     = "1.13.0"
 kotlinx-kover                  = "0.9.1"
 kotlinx-bcv                    = "0.17.0"
 kotlin-dokka                   = "2.0.0"
@@ -83,7 +83,7 @@ jsch                           = "0.2.23"
 pty4j                          = "0.13.2"
 junit                          = "5.12.0-RC2"
 koin                           = "4.1.0-Beta5"
-koin-annotations               = "2.0.0-RC1"
+koin-annotations               = "2.0.0-RC4"
 kotest                         = "6.0.0.M2"
 mockk                          = "1.13.16"
 mokkery                        = "2.7.0"
@@ -149,7 +149,7 @@ apache-commons-imaging         = "1.0-alpha5"
 testcontainers                 = "1.20.5"
 sourceBuddy                    = "2.5.0"
 tcp-javanioproxy               = "1.6"
-kubernetes-client              = "22.0.1"
+kubernetes-client              = "23.0.0"
 reflect-typeparamresolver      = "1.0.2"
 reflect-typetools              = "0.6.3"
 async-profiler                 = "3.0"