<upgrade> kmp version to 2.1.0

kgit2 · Jan 7, 2025 · d9002f9 · d9002f9
1 parent bf4d214
commit d9002f9
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 80 deletions.
diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 
 Kotlin Native library for create sub-process and redirect their I/O.
 
-# v2.2.0
+# v2.3.0
 
 Rust is an excellent language that takes into account both performance and engineering.
 
@@ -45,8 +45,8 @@ It will bring
 
 # Dependent
 
-- Rust Standard Library 1.69.0 (No support for later versions)
-- Kotlin Multiplatform 2.0.10
+- Rust Standard Library 1.83.0
+- Kotlin Multiplatform 2.1.0
 
 # Usage
 
@@ -98,7 +98,7 @@ Dependency:
 
 ### 1. Dependencies
 
-- rust toolchain - <= 1.69.0 (https://rustup.rs) (recommend)
+- rust toolchain - >= 1.83.0 (https://rustup.rs)
   - just (install with `cargo install just`)
 - cross-compile toolchain
   - x86_64-apple-darwin

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -10,7 +9,7 @@ plugins {
 }
 
 val sharedGroup = "com.kgit2"
-val sharedVersion = "2.2.1"
+val sharedVersion = "2.3.0"
 
 group = sharedGroup
 version = sharedVersion
@@ -27,7 +26,6 @@ subprojects {
 
 kotlin {
     jvm {
-        @OptIn(ExperimentalKotlinGradlePluginApi::class)
         compilerOptions {
             jvmTarget.set(JvmTarget.JVM_17)
         }
@@ -62,32 +60,49 @@ kotlin {
     applyDefaultHierarchyTemplate()
 
     sourceSets {
-        // add opt-in
-        all {
-            // languageSettings.optIn("kotlinx.cinterop.UnsafeNumber")
-            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
-            languageSettings.optIn("kotlin.experimental.ExperimentalNativeApi")
-            // languageSettings.optIn("kotlin.native.runtime.NativeRuntimeApi")
-            languageSettings.optIn("kotlin.ExperimentalStdlibApi")
+        val sourceSetsNeedOptIn = setOf(
+            nativeMain,
+            appleMain,
+            macosMain,
+            macosX64Main,
+            macosArm64Main,
+            linuxMain,
+            linuxX64Main,
+            linuxArm64Main,
+            mingwMain,
+            mingwX64Main,
+        )
+
+        sourceSetsNeedOptIn.forEach { sourceSet ->
+            sourceSet.languageSettings {
+                optIn("kotlinx.cinterop.ExperimentalForeignApi")
+                optIn("kotlin.experimental.ExperimentalNativeApi")
+            }
+        }
 
+        commonMain {
             languageSettings {
-                @OptIn(ExperimentalKotlinGradlePluginApi::class)
                 compilerOptions {
                     freeCompilerArgs.add("-Xexpect-actual-classes")
                 }
             }
-        }
 
-        commonMain {
             dependencies {
                 implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
             }
         }
+
         commonTest {
             dependencies {
                 implementation(kotlin("test"))
             }
         }
+
+        nativeMain {
+            languageSettings {
+                optIn("kotlinx.cinterop.ExperimentalForeignApi")
+            }
+        }
     }
 }
 
@@ -192,7 +207,7 @@ if (ossrhUsername != null && ossrhPassword != null) {
 }
 
 enum class Platform(
-    val archName: String
+    val archName: String,
 ) {
     MACOS_X64("x86_64-apple-darwin"),
     MACOS_ARM64("aarch64-apple-darwin"),

diff --git a/kommand-core/.idea/git_toolbox_blame.xml b/kommand-core/.idea/git_toolbox_blame.xml
diff --git a/kommand-core/Cargo.lock b/kommand-core/Cargo.lock
diff --git a/kommand-core/Cargo.toml b/kommand-core/Cargo.toml
@@ -5,7 +5,7 @@ members = [
 ]
 
 [workspace.package]
-version = "2.1.2"
+version = "2.3.0"
 edition = "2021"
 authors = ["BppleMan"]
 
@@ -23,8 +23,3 @@ crate-type = ["rlib", "staticlib"]
 
 [build-dependencies]
 cbindgen = "0.26.0"
-
-[package.metadata.cargo-xbuild]
-memcpy = true
-sysroot_path = "/Users/bppleman/.rustup/toolchains/stable-x86_64-apple-darwin/lib/rustlib/x86_64-pc-windows-gnu:/Users/bppleman/.konan/dependencies/msys2-mingw-w64-x86_64-2/x86_64-w64-mingw32"
-panic_immediate_abort = false
diff --git a/kommand-core/rust-toolchain.toml b/kommand-core/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.69.0"
+channel = "1.83.0"
 targets = ["x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "x86_64-pc-windows-gnu"]
diff --git a/kommand-examples/example1/build.gradle.kts b/kommand-examples/example1/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 val currentPlatform: Platform = when {
     DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX && DefaultNativePlatform.getCurrentArchitecture().isAmd64 -> Platform.MACOS_X64
@@ -20,8 +21,8 @@ repositories {
 
 kotlin {
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "17"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
         withJava()
         testRuns["test"].executionTask.configure {
@@ -48,15 +49,6 @@ kotlin {
     applyDefaultHierarchyTemplate()
 
     sourceSets {
-        // add opt-in
-        all {
-            languageSettings.optIn("kotlinx.cinterop.UnsafeNumber")
-            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
-            languageSettings.optIn("kotlin.experimental.ExperimentalNativeApi")
-            languageSettings.optIn("kotlin.native.runtime.NativeRuntimeApi")
-            languageSettings.optIn("kotlin.ExperimentalStdlibApi")
-        }
-
         commonMain {
             dependencies {
                 implementation(rootProject)

diff --git a/kommand-examples/example2/build.gradle.kts b/kommand-examples/example2/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 val currentPlatform: Platform = when {
     DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX && DefaultNativePlatform.getCurrentArchitecture().isAmd64 -> Platform.MACOS_X64
@@ -20,8 +21,8 @@ repositories {
 
 kotlin {
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "17"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
         withJava()
         testRuns["test"].executionTask.configure {
@@ -48,15 +49,6 @@ kotlin {
     applyDefaultHierarchyTemplate()
 
     sourceSets {
-        // add opt-in
-        all {
-            languageSettings.optIn("kotlinx.cinterop.UnsafeNumber")
-            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
-            languageSettings.optIn("kotlin.experimental.ExperimentalNativeApi")
-            languageSettings.optIn("kotlin.native.runtime.NativeRuntimeApi")
-            languageSettings.optIn("kotlin.ExperimentalStdlibApi")
-        }
-
         commonMain {
             dependencies {
                 implementation(rootProject)

diff --git a/kommand-examples/example3/build.gradle.kts b/kommand-examples/example3/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 val currentPlatform: Platform = when {
     DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX && DefaultNativePlatform.getCurrentArchitecture().isAmd64 -> Platform.MACOS_X64
@@ -20,8 +21,8 @@ repositories {
 
 kotlin {
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "17"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
         withJava()
         testRuns["test"].executionTask.configure {
@@ -48,15 +49,6 @@ kotlin {
     applyDefaultHierarchyTemplate()
 
     sourceSets {
-        // add opt-in
-        all {
-            languageSettings.optIn("kotlinx.cinterop.UnsafeNumber")
-            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
-            languageSettings.optIn("kotlin.experimental.ExperimentalNativeApi")
-            languageSettings.optIn("kotlin.native.runtime.NativeRuntimeApi")
-            languageSettings.optIn("kotlin.ExperimentalStdlibApi")
-        }
-
         commonMain {
             dependencies {
                 implementation(rootProject)

diff --git a/kommand-examples/timeout/build.gradle.kts b/kommand-examples/timeout/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 val currentPlatform: Platform = when {
     DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX && DefaultNativePlatform.getCurrentArchitecture().isAmd64 -> Platform.MACOS_X64
@@ -20,8 +21,8 @@ repositories {
 
 kotlin {
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "17"
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
         withJava()
         testRuns["test"].executionTask.configure {
@@ -48,15 +49,6 @@ kotlin {
     applyDefaultHierarchyTemplate()
 
     sourceSets {
-        // add opt-in
-        all {
-            languageSettings.optIn("kotlinx.cinterop.UnsafeNumber")
-            languageSettings.optIn("kotlinx.cinterop.ExperimentalForeignApi")
-            languageSettings.optIn("kotlin.experimental.ExperimentalNativeApi")
-            languageSettings.optIn("kotlin.native.runtime.NativeRuntimeApi")
-            languageSettings.optIn("kotlin.ExperimentalStdlibApi")
-        }
-
         commonMain {
             dependencies {
                 implementation(rootProject)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,7 @@
 pluginManagement {
     plugins {
-        kotlin("jvm") version "2.0.10" apply false
-        kotlin("multiplatform") version "2.0.10" apply false
+        kotlin("jvm") version "2.1.0" apply false
+        kotlin("multiplatform") version "2.1.0" apply false
         id("org.jetbrains.dokka") version "1.9.20" apply false
         id("io.github.gradle-nexus.publish-plugin") version "1.3.0" apply false
     }