chore: kotlin 2.1.20-Beta1 update

Author: sureshg

README.md

@@ -116,6 +116,10 @@ The next version will be based on the semantic version scope (`major`, `minor`,
                 jaegertracing/all-in-one:latest
    $ open http://localhost:16686
 
+   # Run otel tui
+   $ brew install ymtdzzz/tap/otel-tui
+   $ otel-tui
+
    # Run the app
    $ docker run -it --rm \
                 --name jvm \

backend/agent/otel/build.gradle.kts

@@ -73,6 +73,7 @@ dependencies {
   compileOnly(libs.bundles.otel.agent.extn)
   compileOnly(libs.google.auto.annotations)
   annotationProcessor(libs.google.auto.service.apt)
+  implementation(libs.otel.samplers)
 
   testImplementation(platform(libs.junit.bom))
   testImplementation(libs.junit.jupiter)

backend/jvm/src/main/resources/logback.xml

@@ -2,6 +2,7 @@
 <configuration scan="true" scanPeriod="15 seconds" packagingData="true" debug="false">
     <import class="ch.qos.logback.classic.encoder.JsonEncoder"/>
     <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
+    <import class="ch.qos.logback.classic.AsyncAppender"/>
     <import class="ch.qos.logback.core.rolling.RollingFileAppender"/>
     <import class="ch.qos.logback.core.FileAppender"/>
     <import class="ch.qos.logback.core.ConsoleAppender"/>
@@ -48,6 +49,11 @@
         </encoder>
     </appender>
 
+    <!--appender name="ASYNC-APP1" class="AsyncAppender">
+        <appender-ref ref="APP1"/>
+        <neverBlock>true</neverBlock>
+    </appender-->
+
     <appender name="JSON" class="RollingFileAppender">
         <file>${LOG_DIR}/app.json</file>
         <rollingPolicy class="TimeBasedRollingPolicy">
@@ -95,8 +101,9 @@
 
     <root level="INFO">
         <appender-ref ref="STDOUT"/>
-        <!--appender-ref ref="OTEL"/-->
+        <!-- appender-ref ref="OTEL"/-->
         <!-- appender-ref ref="JSON"/-->
+        <!-- appender-ref ref="ASYNC-APP1" /-->
     </root>
 
     <logger name="dev.suresh" level="INFO" additivity="false">

backend/native/build.gradle.kts

@@ -122,7 +122,7 @@ tasks {
   val linkReleaseExecutableMacosArm64 by getting(KotlinNativeLink::class)
 
   val macOsUniversalBinary by
-      creating(Exec::class) {
+      registering(Exec::class) {
         val binName = "${project.name}-macos"
         dependsOn(linkReleaseExecutableMacosX64, linkReleaseExecutableMacosArm64)
         commandLine(

gradle.properties

@@ -31,11 +31,13 @@ kotlin.js.yarn=false
 kotlin.incremental.native=true
 kotlin.native.binary.gc=cms
 kotlin.native.ignoreDisabledTargets=true
-kotlin.mpp.enableCInteropCommonization=true
+# kotlin.mpp.enableCInteropCommonization=true
 
 ## Dokka
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+org.jetbrains.dokka.experimental.tryK2=true
+org.jetbrains.dokka.experimental.tryK2.nowarn=true
 
 ## KSP
 ksp.useKSP2=true
@@ -63,5 +65,6 @@ enableMavenSnapshot=false
 # Other projects
 composeBuild=true
 springBoot=false
-nativeBuild=false
+nativeBuild=true
+nativeWinTarget=false
 debug=false

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

@@ -264,7 +264,7 @@ fun KotlinNativeCompilerOptions.configureKotlinNative() {
   // freeCompilerArgs.addAll("-Xverbose-phases=Linker", "-Xruntime-logs=gc=info")
 }
 
-fun KotlinMultiplatformExtension.allNativeTargets(configure: KotlinNativeTarget.() -> Unit = {}) {
+fun KotlinMultiplatformExtension.allNativeTargets(winTarget: Boolean = false, configure: KotlinNativeTarget.() -> Unit = {}) {
   fun KotlinNativeTarget.configureAll() {
     // KotlinNativeTargetWithHostTests
     compilerOptions { configureKotlinNative() }
@@ -282,7 +282,9 @@ fun KotlinMultiplatformExtension.allNativeTargets(configure: KotlinNativeTarget.
   macosArm64 { configureAll() }
   linuxX64 { configureAll() }
   linuxArm64 { configureAll() }
-  mingwX64 { configureAll() }
+  if(winTarget) {
+    mingwX64 { configureAll() }
+  }
 }
 
 fun KotlinMultiplatformExtension.addKspDependencyForAllTargets(

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

@@ -162,7 +162,7 @@ configurations {
 
 tasks {
   val archiveTgz by
-      creating(Tar::class) {
+      registering(Tar::class) {
         archiveFileName = niArchiveName
         compression = Compression.GZIP
         destinationDirectory = project.layout.buildDirectory

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

@@ -54,8 +54,6 @@ dokka {
 
     documentedVisibilities = setOf(VisibilityModifier.Public)
 
-    samples.from("src/test/kotlin")
-
     externalDocumentationLinks {
       register("kotlinx.coroutines") { url("https://kotlinlang.org/api/kotlinx.coroutines/") }
       register("kotlinx.serialization") { url("https://kotlinlang.org/api/kotlinx.serialization/") }
@@ -66,6 +64,9 @@ dokka {
       register("ktor") { url("https://api.ktor.io/") }
     }
 
+    // https://github.com/Kotlin/dokka/issues/3373
+    // samples.from("src/test/kotlin")
+
     // dokkaPublicationDirectory = rootProject.layout.buildDirectory.dir("dokkaDir")
   }
 
@@ -86,7 +87,6 @@ spotless {
     // googleJavaFormat(libs.versions.google.javaformat.get())
     palantirJavaFormat(libs.versions.palantir.javaformat.get()).formatJavadoc(true)
     target("**/*.java_disabled")
-    targetExclude("**/build/**")
   }
   // if(plugins.hasPlugin(JavaPlugin::class.java)){ }
 

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

@@ -113,19 +113,21 @@ tasks {
   }
 
   processResources {
-    inputs.property("version", project.version.toString())
+    val version = project.version.toString()
+    val rootProjectName = rootProject.name
+    val moduleName = project.name
+
+    inputs.property("version", version)
     filesMatching("**/*-res.txt") {
       expand(
-          "name" to rootProject.name,
-          "module" to project.name,
-          "version" to project.version,
+          "name" to rootProjectName,
+          "module" to moduleName,
+          "version" to version,
       )
     }
     filesMatching("**/*.yaml") {
       filter { line ->
-        line
-            .replace("{project.name}", rootProject.name)
-            .replace("{project.version}", project.version.toString())
+        line.replace("{project.name}", rootProjectName).replace("{project.version}", version)
       }
     }
   }

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

@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.*
 import org.jetbrains.kotlin.gradle.targets.js.npm.*
 import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
-import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 import tasks.*
 
 plugins {
@@ -35,6 +34,7 @@ plugins {
 }
 
 val nativeBuild: String? by project
+val nativeWinTarget: String? by project
 
 kotlin {
   commonTarget(project)
@@ -44,7 +44,7 @@ kotlin {
       jsTarget(project)
       wasmJsTarget(project)
       if (nativeBuild.toBoolean()) {
-        allNativeTargets {}
+        allNativeTargets(winTarget = nativeWinTarget.toBoolean()) {}
       }
     }
 
@@ -55,23 +55,23 @@ kotlin {
     }
   }
 
-  applyDefaultHierarchyTemplate {
-    common {
-      group("posix") {
-        // Using group will add the intermediate source sets
-        group("linux")
-        group("apple")
-      }
-
-      group("jsCommon") {
-        withJs()
-        withWasmJs()
-      }
-    }
-  }
-
-  // To configure specific targets
-  targets.withType<KotlinJvmTarget>().configureEach { compilerOptions {} }
+  // applyDefaultHierarchyTemplate {
+  //    common {
+  //      group("posix") {
+  //        // Using group will add the intermediate source sets
+  //        group("linux")
+  //        group("apple")
+  //      }
+  //
+  //      group("jsCommon") {
+  //        withJs()
+  //        withWasmJs()
+  //      }
+  //    }
+  //  }
+
+  // ==== To configure specific targets ====
+  // targets.withType<KotlinJvmTarget>().configureEach { compilerOptions {} }
   // targets.matching { it.platformType == js }.configureEach { apply(plugin = ...) }
 
   // kotlinDaemonJvmArgs = jvmArguments
@@ -134,19 +134,21 @@ tasks {
   }
 
   withType<ProcessResources>().configureEach {
-    inputs.property("version", project.version.toString())
+    val version = project.version.toString()
+    val rootProjectName = rootProject.name
+    val moduleName = project.name
+
+    inputs.property("version", version)
     filesMatching("**/*-res.txt") {
       expand(
-          "name" to rootProject.name,
-          "module" to project.name,
-          "version" to project.version,
+          "name" to rootProjectName,
+          "module" to moduleName,
+          "version" to version,
       )
     }
     filesMatching("**/*.yaml") {
       filter { line ->
-        line
-            .replace("{project.name}", rootProject.name)
-            .replace("{project.version}", project.version.toString())
+        line.replace("{project.name}", rootProjectName).replace("{project.version}", version)
       }
     }
   }