Distinct name for platform artifacts. (#29)

skiko/build.gradle.kts

@@ -346,7 +346,7 @@ extensions.configure<CppLibrary> {
 library {
     linkage.addAll(listOf(Linkage.SHARED))
     targetMachines.addAll(listOf(machines.macOS.x86_64, machines.linux.x86_64, machines.windows.x86_64))
-    baseName.set("skiko")
+    baseName.set("skiko-$target")
 
     dependencies {
         implementation(

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/Library.kt

@@ -35,7 +35,7 @@ object Library {
         if (loaded) return
 
         val resourcePath = "/"
-        val name = "skiko"
+        val name = "skiko-$hostId"
         val platformName = System.mapLibraryName(name)
 
         val hash = Library::class.java.getResourceAsStream("$resourcePath$platformName.sha256").use {
@@ -44,7 +44,7 @@ object Library {
         val cacheDir = File("$cacheRoot/$hash")
         cacheDir.mkdirs()
         loadOrGet(cacheDir, resourcePath, platformName, true)
-        val loadIcu = OSType.currentOs == OSType.WINDOWS
+        val loadIcu = hostOs.isWindows
         if (loadIcu) {
             loadOrGet(cacheDir, resourcePath, "icudtl.dat", false)
         }

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/OSType.kt

-package org.jetbrains.skiko
-
-enum class OSType {
-    MAC_OS, LINUX, WINDOWS, UNKNOWN;
-
-    companion object {
-        val currentOs by lazy {
-            val name = System.getProperty("os.name").toLowerCase()
-            when {
-                name.indexOf("win") >= 0 -> WINDOWS
-                name.indexOf("mac") >= 0 -> MAC_OS
-                name.indexOf("linux") >= 0 -> LINUX
-                else -> UNKNOWN
-            }
-        }
-    }
-}
\ No newline at end of file

skiko/src/jvmMain/kotlin/org/jetbrains/skiko/OsArch.kt

+package org.jetbrains.skiko
+
+enum class OS(val id: String) {
+    Linux("linux"),
+    Windows("windows"),
+    MacOS("macos")
+    ;
+
+    val isWindows
+        get() = this == Windows
+}
+
+enum class Arch(val id: String) {
+    X64("x64"),
+    Arm64("arm64")
+}
+
+val hostOs by lazy {
+    val osName = System.getProperty("os.name")
+    when {
+        osName == "Mac OS X" -> OS.MacOS
+        osName == "Linux" -> OS.Linux
+        osName.startsWith("Win") -> OS.Windows
+        else -> throw Error("Unknown OS $osName")
+    }
+}
+
+val hostArch by lazy {
+    val osArch = System.getProperty("os.arch")
+    when (osArch) {
+        "x86_64", "amd64" -> Arch.X64
+        "aarch64" -> Arch.Arm64
+        else -> throw Error("Unknown arch $osArch")
+    }
+}
+
+val hostId by lazy {
+    "${hostOs.id}-${hostArch.id}"
+}
\ No newline at end of file