Merge branch 'main' into release

v0.5.0 release

Author: ShreckYe

.gitignore

@@ -1,6 +1,8 @@
 # Ignore Gradle project-specific cache directory
 .gradle
 
+.kotlin
+
 # Ignore Gradle build output directory
 build
 

README.md

@@ -5,7 +5,9 @@
 
 Huanshankeji's common code libraries in Kotlin
 
-These include a core library to extend the Kotlin language and its standard library, and extension libraries for various Kotlin and Java libraries such as [Λrrow](https://arrow-kt.io/), Coroutines ([docs here](https://kotlinlang.org/docs/coroutines-overview.html) and [repository here](https://github.com/Kotlin/kotlinx.coroutines)), [Exposed](https://github.com/JetBrains/Exposed), [Ktor](https://ktor.io/), [reflection](https://kotlinlang.org/docs/reflection.html), Serialization ([docs here](https://kotlinlang.org/docs/serialization.html) and [repository here](https://github.com/Kotlin/kotlinx.serialization)), [Vert.x](https://vertx.io/), etc.
+These include a core library to extend the Kotlin language and its standard library, and extension libraries for various Kotlin and Java libraries such as [Λrrow](https://arrow-kt.io/), Coroutines ([docs here](https://kotlinlang.org/docs/coroutines-overview.html) and [repository here](https://github.com/Kotlin/kotlinx.coroutines)), [Exposed](https://github.com/JetBrains/Exposed), [Ktor](https://ktor.io/), [reflection](https://kotlinlang.org/docs/reflection.html), Serialization ([docs here](https://kotlinlang.org/docs/serialization.html) and [repository here](https://github.com/Kotlin/kotlinx.serialization)), [Vert.x](https://vertx.io/), etc. For common extensions for Compose Multiplatform, check out [compose-multiplatform-common](https://github.com/huanshankeji/compose-multiplatform-material/tree/main/compose-multiplatform-common).
+
+Currently supported targets by multiplatform libraries: JVM, JS (browser), iOS (`iosX64`, `iosArm64`, and `iosSimulatorArm64`) (except for the Coroutines module), and Wasm JS.
 
 ## Maven coordinates
 

buildSrc/build.gradle.kts

@@ -15,7 +15,8 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", "1.9.23"))
-    implementation("com.huanshankeji:common-gradle-dependencies:0.7.1-20240314-boostrap")
-    implementation("com.huanshankeji.team:gradle-plugins:0.5.1")
+    // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects.
+    implementation(kotlin("gradle-plugin", "2.0.10"))
+    implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch
+    implementation("com.huanshankeji.team:gradle-plugins:0.6.0") // don't use a snapshot version in a main branch
 }

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

@@ -2,13 +2,13 @@ import com.huanshankeji.CommonDependencies
 import com.huanshankeji.CommonGradleClasspathDependencies
 import com.huanshankeji.CommonVersions
 
-val projectVersion = "0.4.0"
+val projectVersion = "0.5.0"
 
-val commonVersions = CommonVersions()
+val commonVersions = CommonVersions(arrow = "2.0.0-alpha.4") // for Wasm JS
 val commonDependencies = CommonDependencies(commonVersions)
 val commonGradleClasspathDependencies = CommonGradleClasspathDependencies(commonVersions)
 
 object DependencyVersions {
     val protobufPlugin = "0.9.4"
-    val protobuf = "3.25.2"
+    val protobuf = "3.25.2" // Not bumped. The version is a bit chaotic.
 }

buildSrc/src/main/kotlin/common-conventions.gradle.kts

@@ -3,6 +3,7 @@ import com.huanshankeji.team.pomForTeamDefaultOpenSource
 
 plugins {
     id("com.huanshankeji.team.with-group")
+    id("maven-central")
     id("com.huanshankeji.team.default-github-packages-maven-publish")
 }
 

buildSrc/src/main/kotlin/maven-central.gradle.kts

@@ -0,0 +1,3 @@
+repositories {
+    mavenCentral()
+}

buildSrc/src/main/kotlin/multiplatform-conventions-without-ios.gradle.kts

@@ -0,0 +1,19 @@
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
+plugins {
+    id("common-conventions")
+    kotlin("multiplatform")
+    id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions")
+}
+
+kotlin {
+    jvm()
+    jvmToolchain(8)
+
+    //androidTarget()
+
+    js()
+
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs()
+}

buildSrc/src/main/kotlin/multiplatform-conventions.gradle.kts

@@ -1,7 +1,14 @@
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
 plugins {
     id("common-conventions")
-    id("com.huanshankeji.kotlin-multiplatform-jvm-and-js-browser-conventions")
+    id("com.huanshankeji.kotlin-multiplatform-conventional-targets")
     id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions")
 }
 
-kotlin.jvmToolchain(8)
+kotlin {
+    jvmToolchain(8)
+
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs()
+}

core/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("multiplatform-conventions")
+    `multiplatform-conventions`
 }
 
 kotlin.sourceSets {

core/src/commonMain/kotlin/com/huanshankeji/Lambdas.kt

@@ -0,0 +1,19 @@
+package com.huanshankeji
+
+/**
+ * Used in places when curly braces are needed (`if` and `when`) to make the code look better.
+ */
+inline fun lambdaOf(noinline block: () -> Unit) =
+    block
+
+/**
+ * Used in places when curly braces are needed (`if` and `when`) to make the code look better.
+ */
+inline fun <T, R> lambdaOf(noinline block: (T) -> R) =
+    block
+
+/**
+ * A shortcut for the empty lambda, used in places when curly braces are needed (`if` and `when`) to make the code look better.
+ */
+inline fun emptyLambda() =
+    {}