chore: another kotlin dsl refactorings

Author: sureshg

gradle.properties

@@ -5,10 +5,10 @@ org.gradle.caching=true
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.configuration-cache=false
+org.gradle.configuration-cache.problems=warn
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
 # org.gradle.logging.stacktrace=all
 # org.gradle.unsafe.isolated-projects=true
-# org.gradle.configuration-cache.problems=warn
 # org.gradle.configuration-cache.max-problems=5
 # org.gradle.welcome=never
 # org.gradle.console=rich
@@ -43,6 +43,7 @@ ksp.version.check=false
 # Compose
 org.jetbrains.compose.experimental.wasm.enabled=true
 org.jetbrains.compose.experimental.macos.enabled=true
+kotlin.mpp.filterResourcesByExtension=true
 # compose.resources.always.generate.accessors=true
 
 # Project
@@ -55,7 +56,9 @@ semver.commitsMaxCount=100
 debug=false
 
 # Other projects
-nativeBuild=false
 composeBuild=true
 springBoot=false
+nativeBuild=false
+nativeWinTarget=false
+
 

gradle/build-logic/build.gradle.kts

@@ -9,6 +9,7 @@ plugins {
   alias(libs.plugins.jte)
   alias(libs.plugins.bestpractices)
   alias(libs.plugins.benmanes)
+  alias(libs.plugins.spotless)
   // alias(libs.plugins.kotlin.dsl)
 }
 
@@ -31,19 +32,34 @@ kotlin {
         "-Xno-param-assertions",
         "-Xno-call-assertions",
         "-Xno-receiver-assertions")
-    optIn =
-        listOf(
-            "kotlin.ExperimentalStdlibApi",
-            "kotlin.time.ExperimentalTime",
-            "kotlin.io.encoding.ExperimentalEncodingApi",
-            "kotlinx.validation.ExperimentalBCVApi",
-            "kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "kotlinx.serialization.ExperimentalSerializationApi",
-            "kotlinx.validation.ExperimentalBCVApi",
-            "org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi",
-            "org.jetbrains.kotlin.gradle.ExperimentalWasmDsl",
-            "org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDistributionDsl",
-            "org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDceDsl")
+    optIn.addAll(
+        "kotlin.ExperimentalStdlibApi",
+        "kotlin.time.ExperimentalTime",
+        "kotlin.io.encoding.ExperimentalEncodingApi",
+        "kotlinx.validation.ExperimentalBCVApi",
+        "kotlinx.coroutines.ExperimentalCoroutinesApi",
+        "kotlinx.serialization.ExperimentalSerializationApi",
+        "org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi",
+        "org.jetbrains.kotlin.gradle.ExperimentalWasmDsl",
+        "org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDistributionDsl",
+        "org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDceDsl")
+  }
+}
+
+spotless {
+  val ktfmtVersion = libs.versions.ktfmt.get()
+  kotlin {
+    target("src/**/*.kts", "src/**/*.kt")
+    ktfmt(ktfmtVersion)
+    trimTrailingWhitespace()
+    endWithNewline()
+  }
+
+  kotlinGradle {
+    target("*.kts")
+    ktfmt(ktfmtVersion)
+    trimTrailingWhitespace()
+    endWithNewline()
   }
 }
 
@@ -67,9 +83,8 @@ tasks {
   register("cleanAll") {
     description = "Cleans all projects"
     group = LifecycleBasePlugin.CLEAN_TASK_NAME
-
     allprojects.mapNotNull { it.tasks.findByName("clean") }.forEach { dependsOn(it) }
-    doLast { delete(layout.buildDirectory) }
+    // doLast { delete(layout.buildDirectory) }
   }
 }
 

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

@@ -92,9 +92,7 @@ fun KotlinMultiplatformExtension.jvmTarget() {
 
     mainRun {
       mainClass = libs.versions.app.mainclass
-      val jvmArgs: String? by project
-      val args = jvmArgs?.split(",") ?: jvmArguments(appRun = true)
-      setArgs(args)
+      setArgs(jvmRunArgs)
     }
 
     // val test by testRuns.existing
@@ -189,6 +187,8 @@ fun KotlinMultiplatformExtension.wasmJsTarget() {
   wasmJs {
     // moduleName = "wasm-app"
     browser {
+      val rootDirPath = project.rootDir.path
+      val projectDirPath = project.projectDir.path
       commonWebpackConfig {
         cssSupport { enabled = true }
         // outputFileName = "wasm-app.js"
@@ -198,8 +198,8 @@ fun KotlinMultiplatformExtension.wasmJsTarget() {
               static =
                   (static ?: mutableListOf()).apply {
                     // Serve sources to debug inside the browser
-                    add(project.rootDir.path)
-                    add(project.projectDir.path)
+                    add(rootDirPath)
+                    add(projectDirPath)
                   }
             }
       }
@@ -256,7 +256,11 @@ fun KotlinMultiplatformExtension.allNativeTargets(configure: KotlinNativeTarget.
     macosArm64 { configure() }
     linuxX64 { configure() }
     linuxArm64 { configure() }
-    mingwX64 { configure() }
+
+    val nativeWinTarget: String? by project
+    if (nativeWinTarget.toBoolean()) {
+      mingwX64 { configure() }
+    }
   }
 }
 

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

@@ -145,12 +145,6 @@ val Project.githubToken
 val Project.isKotlinMultiplatformProject
   get() = plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")
 
-val Project.isKotlinJvmProject
-  get() = plugins.hasPlugin("org.jetbrains.kotlin.jvm")
-
-val Project.isKotlinJsProject
-  get() = plugins.hasPlugin("org.jetbrains.kotlin.js")
-
 @Suppress("UnstableApiUsage")
 val Project.gradleSystemProperties
   get() =
@@ -333,6 +327,16 @@ fun Project.jvmArguments(appRun: Boolean = false, headless: Boolean = true) = bu
   }
 }
 
+/**
+ * JVM arguments for running java/kotlin applications. If the user has provided a custom
+ * *jvmArgs*(`-PjvmArgs=...`) gradle property, it will be used instead of the default [jvmArguments]
+ */
+val Project.jvmRunArgs
+  get() = run {
+    val jvmArgs: String? by this
+    jvmArgs?.split(",") ?: jvmArguments(appRun = true)
+  }
+
 /**
  * Returns the dependency string for the specified Kotlin wrapper.
  *
@@ -408,25 +412,24 @@ fun KotlinCommonCompilerOptions.configureKotlinCommon() {
       "-Xcontext-receivers",
       "-Xexpect-actual-classes",
       "-Xskip-prerelease-check",
-      // "-Xsupress-warning=WARNING_NAME"
+      // "-Xsuppress-warning=CONTEXT_RECEIVERS_DEPRECATED"
       // "-P",
       // "plugin:...=..."
   )
-  optIn =
-      listOf(
-          "kotlin.ExperimentalStdlibApi",
-          "kotlin.contracts.ExperimentalContracts",
-          "kotlin.ExperimentalUnsignedTypes",
-          "kotlin.io.encoding.ExperimentalEncodingApi",
-          "kotlin.time.ExperimentalTime",
-          "kotlinx.coroutines.ExperimentalCoroutinesApi",
-          "kotlinx.serialization.ExperimentalSerializationApi",
-          "kotlin.ExperimentalMultiplatform",
-          "kotlin.js.ExperimentalJsExport",
-          "kotlin.experimental.ExperimentalNativeApi",
-          "kotlinx.cinterop.ExperimentalForeignApi",
-          // "org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi",
-      )
+  optIn.addAll(
+      "kotlin.ExperimentalStdlibApi",
+      "kotlin.contracts.ExperimentalContracts",
+      "kotlin.ExperimentalUnsignedTypes",
+      "kotlin.io.encoding.ExperimentalEncodingApi",
+      "kotlin.time.ExperimentalTime",
+      "kotlinx.coroutines.ExperimentalCoroutinesApi",
+      "kotlinx.serialization.ExperimentalSerializationApi",
+      "kotlin.ExperimentalMultiplatform",
+      "kotlin.js.ExperimentalJsExport",
+      "kotlin.experimental.ExperimentalNativeApi",
+      "kotlinx.cinterop.ExperimentalForeignApi",
+      // "org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi",
+  )
 }
 
 context(Project)
@@ -588,16 +591,17 @@ fun KotlinSourceSet.ksp(dependencyNotation: Any) {
 
 /** Returns the path of the dependency jar in runtime classpath. */
 context(Project)
-val ExternalDependency.dependencyPath
-  get() =
-      configurations
-          .named("runtimeClasspath")
-          .get()
-          .resolvedConfiguration
-          .resolvedArtifacts
-          .find { it.moduleVersion.id.module == module }
-          ?.file
-          ?.path ?: error("Could not find $name in runtime classpath")
+val ExternalDependency.dependencyPath: Provider<String>
+  get() = provider {
+    configurations
+        .named("runtimeClasspath")
+        .get()
+        .resolvedConfiguration
+        .resolvedArtifacts
+        .find { it.moduleVersion.id.module == module }
+        ?.file
+        ?.path
+  }
 
 /** Returns the application `run` command. */
 context(Project)