chore: kotlin 2.2.0 refactor

Author: sureshg

compose/cmp/build.gradle.kts

@@ -8,7 +8,6 @@ import kotlin.io.path.listDirectoryEntries
 import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat.*
 import org.jetbrains.compose.desktop.application.tasks.AbstractJPackageTask
-import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 
 plugins {
   dev.suresh.plugin.kotlin.mpp
@@ -64,7 +63,7 @@ kotlin {
 
 composeCompiler {
   reportsDestination = layout.buildDirectory.dir("compose_compiler")
-  featureFlags.add(ComposeFeatureFlag.OptimizeNonSkippingGroups)
+  // featureFlags.add(ComposeFeatureFlag.)
 }
 
 compose {

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

@@ -91,6 +91,12 @@ val Project.isComposeModuleEnabled: Boolean
 val Project.isBootModuleEnabled: Boolean
   get() = gradleBooleanProp("module.boot.enabled").get()
 
+val Project.isMvnSnapshotRepoEnabled: Boolean
+  get() = gradleBooleanProp("maven.snapshot.repo.enabled").get()
+
+val Project.isAutomaticModuleEnabled
+  get() = gradleBooleanProp("java.automatic.module.enabled").get()
+
 /** Java version properties. */
 val Project.javaVersion
   get() = libs.versions.java.asProvider().map { JavaVersion.toVersion(it) }
@@ -107,9 +113,6 @@ val Project.toolchainVendor
 val Project.addModules
   get() = libs.versions.java.addModules.get()
 
-val Project.isAutomaticModuleEnabled
-  get() = gradleBooleanProp("java.automatic.module.enabled").get()
-
 val Project.defaultJarManifest
   get() = buildMap {
     put("Enable-Native-Access", "ALL-UNNAMED")
@@ -442,6 +445,10 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
           "-Xwhen-guards",
           "-Xmulti-dollar-interpolation",
           "-Xnon-local-break-continue",
+          "-Xnested-type-aliases",
+          "-Xreport-all-warnings",
+          // "-Wextra",
+          // "-Xexpected-type-guided-resolution",
           // "-XXLanguage:+ExplicitBackingFields",
           // "-Xsuppress-version-warnings",
           // "-P",
@@ -466,8 +473,8 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon(project: Project) =
 fun KspAATask.configureKspConfig() =
     with(project) {
       kspConfig.apply {
-        apiVersion = kotlinApiVersion.map { it.version }
         jvmTarget = kotlinJvmTarget.map { it.target }
+        apiVersion = kotlinApiVersion.map { it.version }
         languageVersion = kotlinLangVersion.map { it.version }
         allWarningsAsErrors = false
       }
@@ -499,7 +506,6 @@ fun KotlinJvmCompilerOptions.configureKotlinJvm(project: Project) =
           "-Xassertions=jvm",
           "-Xemit-jvm-type-annotations",
           "-Xjspecify-annotations=strict",
-          "-Xextended-compiler-checks",
           "-Xskip-prerelease-check",
           // Remove null check intrinsics from bytecode
           "-Xno-param-assertions",
@@ -514,6 +520,7 @@ fun KotlinJvmCompilerOptions.configureKotlinJvm(project: Project) =
           // "-Xgenerate-strict-metadata-version",
           // "-Xuse-kapt4",
       )
+      // jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
     }
 
 fun Test.configureJavaTest() {
@@ -586,8 +593,8 @@ fun TestLoggingContainer.configureLogEvents() {
 }
 
 fun KotlinJsCompilerOptions.configureKotlinJs() {
-  // freeCompilerArgs.addAll("-Xir-per-file")
-  // target = "es2015"
+  freeCompilerArgs.addAll("-Xir-per-file")
+  target = "es2015"
   // sourceMap = true
   // sourceMapEmbedSources = "always"
 }

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

@@ -1,8 +1,6 @@
 @file:Suppress("UnstableApiUsage")
 
-import com.javiersc.semver.project.gradle.plugin.SemverExtension
 import common.*
-import common.GithubAction
 import common.Platform
 import org.jetbrains.kotlin.gradle.utils.extendsFrom
 
@@ -16,7 +14,7 @@ val muslEnabled = project.hasProperty("musl")
 val reportsEnabled = project.hasProperty("reports")
 val agentEnabled = project.hasProperty("agent")
 
-val semverExtn = extensions.getByType<SemverExtension>()
+// val semverExtn = extensions.getByType<SemverExtension>()
 
 graalvmNative {
   binaries.all {
@@ -34,23 +32,22 @@ graalvmNative {
       add("--enable-https")
       add("--install-exit-handlers")
       add("-R:MaxHeapSize=64m")
-      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:+VectorAPISupport")
       // add("-H:+AddAllCharsets")
       // add("-H:+IncludeAllLocales")
       // add("-H:+IncludeAllTimeZones")
       // add("-H:IncludeResources=.*(message\\.txt|\\app.properties)\$")
+      // add("--features=graal.aot.RuntimeFeature")
       // add("--enable-url-protocols=http,https,jar,unix")
       // add("--initialize-at-build-time=kotlinx,kotlin,org.slf4j")
+      // add("-EBUILD_NUMBER=${project.version}")
+      // add("-ECOMMIT_HASH=${semverExtn.commits.get().first().hash}")
 
       val monOpts = buildString {
         append("heapdump,jfr,jvmstat,threaddump,nmt")
@@ -103,8 +100,7 @@ graalvmNative {
     // }
 
     jvmArgs = jvmArguments()
-    systemProperties =
-        mapOf("java.awt.headless" to "false", "jdk.incubator.vector.VECTOR_ACCESS_OOB_CHECK" to "0")
+    systemProperties = mapOf("java.awt.headless" to "false")
     javaLauncher = javaToolchains.launcherFor { configureJvmToolchain(project) }
   }
 
@@ -119,7 +115,7 @@ graalvmNative {
   }
 
   metadataRepository { enabled = true }
-  toolchainDetection = false
+  toolchainDetection = true
 }
 
 /**
@@ -205,7 +201,8 @@ val niArchiveName
 
 dependencies {
   // Dependencies required for native-image build. Use "graalCompileOnly" for compile only deps.
-  // "graalCompileOnly"(libs.graalvm.sdk)
-  // "graalImplementation"(libs.classgraph)
+  "graalCompileOnly"(libs.graal.sdk)
   nativeImageCompileOnly(graal.map { it.output })
+  compileOnly(libs.graal.sdk)
+  // "graalImplementation"(libs.classgraph)
 }

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

@@ -1,9 +1,9 @@
 import com.github.ajalt.mordant.rendering.TextColors
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.google.cloud.tools.jib.gradle.BuildDockerTask
 import com.google.devtools.ksp.gradle.KspAATask
 import common.*
-import java.io.PrintWriter
-import java.io.StringWriter
+import java.io.*
 import java.util.spi.ToolProvider
 import kotlinx.validation.*
 import org.gradle.internal.os.OperatingSystem
@@ -16,11 +16,10 @@ plugins {
   kotlin("plugin.serialization")
   kotlin("plugin.power-assert")
   com.google.devtools.ksp
-  dev.zacsweers.redacted
-  com.javiersc.kotlin.kopy
+  // dev.zacsweers.redacted
+  // com.javiersc.kotlin.kopy
   id("dev.suresh.plugin.common")
   id("dev.suresh.plugin.kotlin.docs")
-  // kotlin("plugin.atomicfu")
   // `test-suite-base`
 }
 
@@ -64,18 +63,22 @@ testing {
 
 ksp { allWarningsAsErrors = false }
 
-powerAssert { functions = listOf("kotlin.assert", "kotlin.test.assertTrue") }
-
-redacted {
-  enabled = true
-  replacementString = "█"
+powerAssert {
+  functions =
+      listOf(
+          "kotlin.assert",
+          "kotlin.test.assertTrue",
+          "kotlin.test.assertEquals",
+          "kotlin.test.assertNull",
+          "kotlin.require")
 }
 
-kopy {
-  copyFunctions = listOf(KopyCopyFunctions.Copy)
-  // debug = false
-  // reportPath = layout.buildDirectory.dir("reports/kopy")
-}
+// redacted {
+//  enabled = true
+//  replacementString = "█"
+// }
+
+// kopy { copyFunctions = listOf(KopyCopyFunctions.Copy) }
 
 // Java agent configuration for jib
 val javaAgent by configurations.registering { isTransitive = false }
@@ -136,12 +139,11 @@ tasks {
   }
 
   pluginManager.withPlugin("com.gradleup.shadow") {
-    val shadowJar by existing(Jar::class)
     val buildExecutable by
         registering(ReallyExecJar::class) {
-          jarFile = shadowJar.flatMap { it.archiveFile }
+          jarFile = named<ShadowJar>("shadowJar").flatMap { it.archiveFile }
           // javaOpts = application.applicationDefaultJvmArgs
-          javaOpts = named<JavaExec>("run").get().jvmArgs
+          javaOpts = jvmRunArgs
           execJarFile = layout.buildDirectory.dir("libs").map { it.file("${project.name}-app") }
           onlyIf { OperatingSystem.current().isUnix }
         }
@@ -152,6 +154,7 @@ tasks {
       description = "Print Java Platform Module dependencies of the application."
       group = LifecycleBasePlugin.BUILD_GROUP
 
+      val shadowJar = named<ShadowJar>("shadowJar")
       doLast {
         val jarFile = shadowJar.get().archiveFile.get().asFile
 
@@ -185,7 +188,7 @@ tasks {
 
     val jdepExtn = extensions.create<JdeprscanExtension>("jdeprscan")
     register<Jdeprscan>("jdeprscan", jdepExtn).configure {
-      jarFile = shadowJar.flatMap { it.archiveFile }
+      jarFile = named<ShadowJar>("shadowJar").flatMap { it.archiveFile }
     }
   }
 

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

@@ -1,15 +1,15 @@
 @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 common.*
 import kotlinx.validation.*
 import org.gradle.internal.os.OperatingSystem
-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.js.npm.tasks.*
+import org.jetbrains.kotlin.gradle.targets.wasm.nodejs.*
+import org.jetbrains.kotlin.gradle.targets.wasm.npm.*
 import tasks.*
 
 plugins {
@@ -20,14 +20,10 @@ plugins {
   id("dev.suresh.plugin.common")
   id("dev.suresh.plugin.kotlin.docs")
   com.google.devtools.ksp
-  dev.zacsweers.redacted
-  com.javiersc.kotlin.kopy
-  // kotlin("plugin.atomicfu")
+  // dev.zacsweers.redacted
+  // com.javiersc.kotlin.kopy
   // kotlin("plugin.compose")
-  // io.github.terrakok.`kmp-hierarchy`
   // org.gradle.kotlin.`kotlin-dsl`
-  // app.cash.molecule
-  // dev.mokkery
 }
 
 configurations.configureEach { resolutionStrategy { failOnNonReproducibleResolution() } }
@@ -57,9 +53,10 @@ kotlin {
   //        group("apple")
   //      }
   //
-  //      group("jsCommon") {
+  //     group("jsAndWasmShared") {
   //        withJs()
   //        withWasmJs()
+  //       withWasmWasi()
   //      }
   //    }
   //  }
@@ -77,18 +74,22 @@ ksp {
   // excludedSources.from(generateCodeTask)
 }
 
-powerAssert { functions = listOf("kotlin.assert", "kotlin.test.assertTrue") }
-
-redacted {
-  enabled = true
-  replacementString = "█"
+powerAssert {
+  functions =
+      listOf(
+          "kotlin.assert",
+          "kotlin.test.assertTrue",
+          "kotlin.test.assertEquals",
+          "kotlin.test.assertNull",
+          "kotlin.require")
 }
 
-kopy {
-  copyFunctions = listOf(KopyCopyFunctions.Copy)
-  // debug = false
-  // reportPath = layout.buildDirectory.dir("reports/kopy")
-}
+// redacted {
+//   enabled = true
+//   replacementString = "█"
+// }
+
+// kopy { copyFunctions = listOf(KopyCopyFunctions.Copy) }
 
 tasks {
   val buildConfigExtn = extensions.create<BuildConfigExtension>("buildConfig")
@@ -129,11 +130,10 @@ tasks {
   }
 
   pluginManager.withPlugin("com.gradleup.shadow") {
-    // https://gradleup.com/shadow/kmp-plugin/
-    val shadowJar by existing(ShadowJar::class)
     val buildExecutable by
         registering(ReallyExecJar::class) {
-          jarFile = shadowJar.flatMap { it.archiveFile }
+          // https://gradleup.com/shadow/kotlin-plugins/
+          jarFile = named<ShadowJar>("shadowJar").flatMap { it.archiveFile }
           javaOpts = jvmRunArgs
           execJarFile = layout.buildDirectory.dir("libs").map { it.file("${project.name}-app") }
           onlyIf { OperatingSystem.current().isUnix }
@@ -164,12 +164,12 @@ tasks {
     }
 
     withType<KotlinApiBuildTask>().configureEach {
-      // inputJar = named<Jar>("shadowJar").flatMap { it.archiveFile }
+      // inputJar = named<ShadowJar>("shadowJar").flatMap { it.archiveFile }
     }
   }
 }
 
-var npmEnabled: String? by rootProject.extra
+// var npmEnabled: String? by rootProject.extra
 
 plugins.withType<NodeJsPlugin> {
   the<NodeJsEnvSpec>().apply {
@@ -178,13 +178,23 @@ plugins.withType<NodeJsPlugin> {
     // downloadBaseUrl = "https://nodejs.org/download/nightly"
   }
 
-  if (!npmEnabled.toBoolean()) {
-    rootProject.the<NpmExtension>().apply {
-      lockFileDirectory = project.rootDir.resolve("gradle/kotlin-js-store")
-      packageLockMismatchReport = LockFileMismatchReport.WARNING
-      packageLockAutoReplace = false
-    }
-    npmEnabled = "true"
+  rootProject.the<NpmExtension>().apply {
+    lockFileDirectory = project.rootDir.resolve("gradle/kotlin-js-store")
+    packageLockMismatchReport = LockFileMismatchReport.WARNING
+    packageLockAutoReplace = false
+  }
+}
+
+plugins.withType<WasmNodeJsPlugin> {
+  the<WasmNodeJsEnvSpec>().apply {
+    download = true
+    // version = libs.versions.nodejs.version.get()
+    // downloadBaseUrl = "https://nodejs.org/download/nightly"
+  }
+  rootProject.the<WasmNpmExtension>().apply {
+    lockFileDirectory = project.rootDir.resolve("gradle/kotlin-js-store/wasm")
+    packageLockMismatchReport = LockFileMismatchReport.WARNING
+    packageLockAutoReplace = false
   }
 }