Merge branch 'main' into release

v0.4.0 release

Author: ShreckYe

README.md

@@ -5,7 +5,7 @@
 
 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/), 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.
 
 ## Maven coordinates
 

buildSrc/build.gradle.kts

@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", "1.8.10"))
-    implementation("com.huanshankeji:common-gradle-dependencies:0.5.0-20230310")
-    implementation("com.huanshankeji.team:gradle-plugins:0.4.0")
+    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")
 }

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

@@ -2,8 +2,13 @@ import com.huanshankeji.CommonDependencies
 import com.huanshankeji.CommonGradleClasspathDependencies
 import com.huanshankeji.CommonVersions
 
-val projectVersion = "0.3.0"
+val projectVersion = "0.4.0"
 
 val commonVersions = CommonVersions()
 val commonDependencies = CommonDependencies(commonVersions)
 val commonGradleClasspathDependencies = CommonGradleClasspathDependencies(commonVersions)
+
+object DependencyVersions {
+    val protobufPlugin = "0.9.4"
+    val protobuf = "3.25.2"
+}

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

@@ -0,0 +1,21 @@
+import com.huanshankeji.team.`Shreck Ye`
+import com.huanshankeji.team.pomForTeamDefaultOpenSource
+
+plugins {
+    id("com.huanshankeji.team.with-group")
+    id("com.huanshankeji.team.default-github-packages-maven-publish")
+}
+
+version = projectVersion
+
+afterEvaluate {
+    publishing.publications.withType<MavenPublication> {
+        pomForTeamDefaultOpenSource(
+            project,
+            "Huanshankeji Kotlin Common",
+            "Huanshankeji's common code libraries in Kotlin"
+        ) {
+            `Shreck Ye`()
+        }
+    }
+}

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

@@ -1,7 +1,6 @@
 plugins {
-    id("common-conventions-before")
+    id("common-conventions")
     id("com.huanshankeji.kotlin-jvm-library-sonatype-ossrh-publish-conventions")
-    id("common-conventions-after")
 }
 
 kotlin.jvmToolchain(8)

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

@@ -1,8 +1,7 @@
 plugins {
-    id("common-conventions-before")
+    id("common-conventions")
     id("com.huanshankeji.kotlin-multiplatform-jvm-and-js-browser-conventions")
     id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions")
-    id("common-conventions-after")
 }
 
 kotlin.jvmToolchain(8)

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

@@ -0,0 +1,6 @@
+package com.huanshankeji
+
+interface BidirectionalConversion<T1, T2> {
+    fun to(value: T1): T2
+    fun from(value: T2): T1
+}

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

@@ -1,6 +1,7 @@
 package com.huanshankeji.codec
 
-import java.util.*
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.ExperimentalEncodingApi
 
 fun uLongBigEndianShiftOffset(index: Int): Int =
     (7 - index) * 8
@@ -36,8 +37,18 @@ fun List<Byte>.bigEndianToLong(): Long =
     map { it.toUByte() }.bigEndianToULong().toLong()
 
 
+@Deprecated(
+    "Use `Base64` in the Kotlin Standard Library directly.",
+    ReplaceWith("Base64.encode(this)", "kotlin.io.encoding.Base64")
+)
 fun ByteArray.toBase64String(): String =
-    Base64.getEncoder().encodeToString(this)
+    @OptIn(ExperimentalEncodingApi::class)
+    Base64.encode(this)
 
+@Deprecated(
+    "Use `Base64` in the Kotlin Standard Library directly.",
+    ReplaceWith("Base64.decode(this)", "kotlin.io.encoding.Base64")
+)
 fun String.base64ToBytes(): ByteArray =
-    Base64.getDecoder().decode(this)
+    @OptIn(ExperimentalEncodingApi::class)
+    Base64.decode(this)