bump version to 0.5.0 for the next release target.

atsushieno · Jun 13, 2023 · a9d913e · a9d913e
1 parent abb910c
commit a9d913e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 75 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = 'dev.atsushieno'
-    version = '0.4.2'
+    version = '0.5.0'
 
     repositories {
         google()

diff --git a/ktmidi-native-ext/build.gradle.kts b/ktmidi-native-ext/build.gradle.kts
@@ -7,36 +7,15 @@ plugins {
 }
 
 kotlin {
-    iosX64("ios") {
-        binaries {
-            framework {
-                baseName = "library"
-            }
-        }
-    }
     val hostOs = System.getProperty("os.name")
+    val isArm64 = System.getProperty("os.arch") == "aarch64"
     val isMingwX64 = hostOs.startsWith("Windows")
-    val isMacOSX64 = hostOs == "Mac OS X"
-    val isLinuxX64 = hostOs == "Linux"
     val nativeTarget = when {
-        isMacOSX64 -> macosX64("native") {
-            binaries {
-                staticLib {}
-                sharedLib {}
-            }
-        }
-        isLinuxX64 -> linuxX64("native") {
-            binaries {
-                staticLib {}
-                sharedLib {}
-            }
-        }
-        isMingwX64 -> mingwX64("native") {
-            binaries {
-                staticLib {}
-                sharedLib {}
-            }
-        }
+        hostOs == "Mac OS X" && isArm64 -> macosArm64("native")
+        hostOs == "Mac OS X" && !isArm64 -> macosX64("native")
+        hostOs == "Linux" && isArm64 -> linuxArm64("native")
+        hostOs == "Linux" && !isArm64 -> linuxX64("native")
+        isMingwX64 -> mingwX64("native")
         else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
     }
     nativeTarget.apply {
@@ -68,8 +47,6 @@ kotlin {
         }
         val nativeMain by getting
         val nativeTest by getting
-        val iosMain by getting
-        val iosTest by getting
     }
 }
 

diff --git a/ktmidi/build.gradle.kts b/ktmidi/build.gradle.kts
@@ -51,28 +51,14 @@ kotlin {
         }
     }
     val hostOs = System.getProperty("os.name")
+    val isArm64 = System.getProperty("os.arch") == "aarch64"
     val isMingwX64 = hostOs.startsWith("Windows")
-    val isMacOSX64 = hostOs == "Mac OS X"
-    val isLinuxX64 = hostOs == "Linux"
     val nativeTarget = when {
-        isMacOSX64 -> macosX64("native") {
-            binaries {
-                staticLib {}
-                sharedLib {}
-            }
-        }
-        isLinuxX64 -> linuxX64("native") {
-            binaries {
-                staticLib {}
-                sharedLib {}
-            }
-        }
-        isMingwX64 -> mingwX64("native") {
-            binaries {
-                staticLib {}
-                sharedLib {}
-            }
-        }
+        hostOs == "Mac OS X" && isArm64 -> macosArm64("native")
+        hostOs == "Mac OS X" && !isArm64 -> macosX64("native")
+        hostOs == "Linux" && isArm64 -> linuxArm64("native")
+        hostOs == "Linux" && !isArm64 -> linuxX64("native")
+        isMingwX64 -> mingwX64("native")
         else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
     }
 

diff --git a/player-sample-lib/build.gradle.kts b/player-sample-lib/build.gradle.kts
@@ -33,28 +33,14 @@ kotlin {
         }
     }*/
     val hostOs = System.getProperty("os.name")
+    val isArm64 = System.getProperty("os.arch") == "aarch64"
     val isMingwX64 = hostOs.startsWith("Windows")
-    val isMacOSX64 = hostOs == "Mac OS X"
-    val isLinuxX64 = hostOs == "Linux"
     val nativeTarget = when {
-        isMacOSX64 -> macosX64("native") {
-            binaries {
-                staticLib {}
-                sharedLib {}
-            }
-        }
-        isLinuxX64 -> linuxX64("native") {
-            binaries {
-                staticLib {}
-                sharedLib {}
-            }
-        }
-        isMingwX64 -> mingwX64("native") {
-            binaries {
-                staticLib {}
-                sharedLib {}
-            }
-        }
+        hostOs == "Mac OS X" && isArm64 -> macosArm64("native")
+        hostOs == "Mac OS X" && !isArm64 -> macosX64("native")
+        hostOs == "Linux" && isArm64 -> linuxArm64("native")
+        hostOs == "Linux" && !isArm64 -> linuxX64("native")
+        isMingwX64 -> mingwX64("native")
         else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
     }
 

diff --git a/player-sample-native/build.gradle.kts b/player-sample-native/build.gradle.kts
@@ -12,13 +12,14 @@ plugins {
 
 kotlin {
     val hostOs = System.getProperty("os.name")
+    val isArm64 = System.getProperty("os.arch") == "aarch64"
     val isMingwX64 = hostOs.startsWith("Windows")
-    val isMacOSX64 = hostOs == "Mac OS X"
-    val isLinuxX64 = hostOs == "Linux"
     val nativeTarget = when {
-        isMacOSX64 -> macosX64("native") { binaries.executable { } }
-        isLinuxX64 -> linuxX64("native") { binaries.executable { } }
-        isMingwX64 -> mingwX64("native") { binaries.executable { } }
+        hostOs == "Mac OS X" && isArm64 -> macosArm64("native")
+        hostOs == "Mac OS X" && !isArm64 -> macosX64("native")
+        hostOs == "Linux" && isArm64 -> linuxArm64("native")
+        hostOs == "Linux" && !isArm64 -> linuxX64("native")
+        isMingwX64 -> mingwX64("native")
         else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
     }