Merge branch 'main' into common-gradle-dependencies-release

common-gradle-dependencies v0.7.1-20240516 release

architecture-common-gradle-plugins/build.gradle.kts

@@ -46,8 +46,8 @@ gradlePlugin {
             "Kotlin Multiplatform app conventions with the JS browser target"
         )
         scriptConventionsPlugin(
-            "kotlin-multiplatform-jvm-and-js-browser-app-conventions",
-            "Kotlin Multiplatform app conventions with the JVM target and the JS browser target"
+            "kotlin-multiplatform-app-conventions-with-conventional-targets",
+            "Kotlin Multiplatform app conventions with the conventional targets JVM, JS (browser), iOS (`iosX64`, `iosArm64`, and `iosSimulatorArm64`), and Wasm JS"
         )
 
         scriptConventionsPlugin(

architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/default-web-frontend-conventions.gradle.kts

@@ -18,7 +18,7 @@ repositories {
 }
 
 kotlin {
-    js(IR) {
+    js {
         browser {
             commonWebpackConfig {
                 outputFileName = "app.js"
@@ -36,7 +36,7 @@ kotlin {
     sourceSets {
         jsMain {
             dependencies {
-                implementation(compose.web.core)
+                implementation(compose.html.core)
                 implementation(compose.runtime)
             }
         }

architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-common-app-conventions.gradle.kts

@@ -1,7 +1,7 @@
 package com.huanshankeji
 
 plugins {
-    id("com.huanshankeji.kotlin-jvm-common-conventions")
+    kotlin("jvm")
 }
 
 dependencies {

architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-jvm-and-js-browser-app-conventions.gradle.kts → architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-app-conventions-with-conventional-targets.gradle.kts

@@ -2,5 +2,5 @@ package com.huanshankeji
 
 plugins {
     id("com.huanshankeji.kotlin-multiplatform-app-conventions")
-    id("com.huanshankeji.kotlin-multiplatform-jvm-and-js-browser-conventions")
+    id("com.huanshankeji.kotlin-multiplatform-conventional-targets")
 }

architecture-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-app-conventions.gradle.kts

@@ -1,7 +1,7 @@
 package com.huanshankeji
 
 plugins {
-    id("com.huanshankeji.kotlin-multiplatform-conventions")
+    kotlin("multiplatform")
 }
 
 kotlin {

buildSrc/build.gradle.kts

@@ -24,8 +24,8 @@ dependencies {
         implementation("org.jetbrains.kotlin:kotlin-sam-with-receiver:1.8.0")
     }
     */
-    // for `KotlinCompilationTask` and the version is for Compose 1.6.1
-    implementation(kotlin("gradle-plugin", "1.9.23"))
+    // for `KotlinCompilationTask` and the version is for Compose 1.6.1 and 1.6.2
+    implementation(kotlin("gradle-plugin", "1.9.24"))
     implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.2.1") // This version has to be used for Gradle 8.6.
 
     implementation("com.gradle.publish:plugin-publish-plugin:1.2.1")

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

@@ -4,13 +4,13 @@ import com.huanshankeji.CommonVersions
 val commonVersions = CommonVersions()
 val commonGradleClasspathDependencies = CommonGradleClasspathDependencies(commonVersions)
 
-val kotlinVersion = "1.9.23" // for Compose 1.6.1
+val kotlinVersion = "1.9.23" // for Compose 1.6.1 and 1.6.2
 
-val alignedPluginVersion = "0.5.1-SNAPSHOT"
+val alignedPluginVersion = "0.6.0-SNAPSHOT"
 
 // "x.y.z" indicates the version of the way of organizing the code,
 // and the date indicates the version when the dependency versions are updated.
-val commonGradleDependenciesVersion = "0.7.1-20240314"
+val commonGradleDependenciesVersion = "0.7.1-20240516"
 
 // This is the source dependency version. There is another build source dependency in "buildSrc/build.gradle.kts".
 val pluginProjectSourceDependentStableCommonGradleDependenciesVersion = "0.7.1-20240314-boostrap".apply {

common-gradle-dependencies/src/main/kotlin/com/huanshankeji/CommonVersions.kt

@@ -7,20 +7,20 @@ class CommonVersions @JvmOverloads constructor(
 
     val kotlinCommon: String = "0.4.0",
 
-    val kotlinxCoroutines: String = "1.8.0",
+    val kotlinxCoroutines: String = "1.8.1",
     val kotlinxHtml: String = "0.11.0",
     val kotlinxSerialization: String = "1.6.3",
-    val kotlinxDatetime: String = "0.5.0",
+    val kotlinxDatetime: String = "0.6.0",
     val kotlinxBenchmark: String = "0.4.10",
-    val exposed: String = "0.48.0",
-    val ktor: String = "2.3.9",
-    val composeMultiplatform: String = "1.6.1", // this is usually only used in classpath dependencies
+    val exposed: String = "0.50.1",
+    val ktor: String = "2.3.11",
+    val composeMultiplatform: String = "1.6.2", // this is usually only used in classpath dependencies
 
-    val vertx: String = "4.5.5",
-    val arrow: String = "1.2.3",
-    val orgJunit: String = "5.10.2",
-    val kotest: String = "5.8.1",
-    val postgreSql: String = "42.7.2",
+    val vertx: String = "4.5.7",
+    val arrow: String = "1.2.4",
+    val orgJunit: String = "5.10.2", // JUnit 5 actually
+    val kotest: String = "5.9.0",
+    val postgreSql: String = "42.7.3",
     val slf4j: String = "1.7.36", // TODO: consider replacing with kotlin-logging (https://github.com/oshai/kotlin-logging)
-    val testContainers: String = "1.19.7"
+    val testContainers: String = "1.19.8"
 )

kotlin-common-gradle-plugins/build.gradle.kts

@@ -18,22 +18,13 @@ gradlePlugin {
         fun scriptConventionsPlugin(idSuffix: String, displayName: String, description: String = displayName) =
             scriptPlugin(`package`, idSuffix, displayName, description)
 
-        scriptConventionsPlugin(
-            "kotlin-jvm-common-conventions",
-            "Kotlin/JVM common conventions"
-        )
-
-        scriptConventionsPlugin(
-            "kotlin-multiplatform-conventions",
-            "Kotlin Multiplatform conventions"
-        )
         scriptConventionsPlugin(
             "kotlin-multiplatform-js-browser-conventions",
             "Kotlin Multiplatform conventions with the JS browser target"
         )
         scriptConventionsPlugin(
-            "kotlin-multiplatform-jvm-and-js-browser-conventions",
-            "Kotlin Multiplatform conventions with the JVM target and the JS browser target"
+            "kotlin-multiplatform-conventional-targets",
+            "Kotlin Multiplatform conventions with the conventional targets JVM, JS (browser), iOS (`iosX64`, `iosArm64`, and `iosSimulatorArm64`), and Wasm JS"
         )
 
         create("maven-publish-conventions") {

kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/MavenPublishConventionsPlugin.kt

@@ -9,6 +9,7 @@ import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.withType
 
+// TODO refactor into a script plugin
 class MavenPublishConventionsPlugin : Plugin<Project> {
     sealed class ArtifactIdConfig {
         // Use the default artifact ID, which is the subproject name unchanged.

kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-jvm-library-maven-publish-conventions.gradle.kts

@@ -1,7 +1,7 @@
 package com.huanshankeji
 
 plugins {
-    id("com.huanshankeji.kotlin-jvm-common-conventions")
+    kotlin("jvm")
     `java-library`
 }
 apply<MavenPublishConventionsPlugin>()

kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-conventional-targets.gradle.kts

@@ -0,0 +1,20 @@
+package com.huanshankeji
+
+plugins {
+    id("com.huanshankeji.kotlin-multiplatform-js-browser-conventions")
+}
+
+kotlin {
+    jvm()
+
+    //androidTarget()
+
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+
+    /*
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs()
+    */
+}

kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-js-browser-conventions.gradle.kts

@@ -1,11 +1,11 @@
 package com.huanshankeji
 
 plugins {
-    id("com.huanshankeji.kotlin-multiplatform-conventions")
+    kotlin("multiplatform")
 }
 
 kotlin {
-    js(IR) {
+    js {
         moduleName = fullNameWithRootProjectNameForFileSystem
         browser()
     }

kotlin-common-gradle-plugins/src/main/kotlin/com/huanshankeji/kotlin-multiplatform-maven-publish-conventions.gradle.kts

@@ -1,6 +1,6 @@
 package com.huanshankeji
 
 plugins {
-    id("com.huanshankeji.kotlin-multiplatform-conventions")
+    kotlin("multiplatform")
 }
 apply<MavenPublishConventionsPlugin>()