Bump serialization from 1.5.0 to 1.5.1 (#208)

hfhbd · May 11, 2023 · 639b79d · 639b79d
1 parent f8bb316
commit 639b79d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlin = "1.8.21"
-serialization = "1.5.0"
+serialization = "1.5.1"
 exposed = "0.41.1"
 
 [libraries]

diff --git a/kotlinx-uuid-core/build.gradle.kts b/kotlinx-uuid-core/build.gradle.kts
@@ -10,7 +10,14 @@ plugins {
 }
 
 kotlin {
-    targetHierarchy.default()
+    targetHierarchy.default {
+        common {
+            group("linuxDerivat") {
+                withAndroidNative()
+                withLinux()
+            }
+        }
+    }
 
     jvm()
     js(IR) {
@@ -37,12 +44,12 @@ kotlin {
     iosArm64()
 
     // tier 3
-    // no kotlinx.serialization support androidNativeArm32()
-    // no kotlinx.serialization support androidNativeArm64()
-    // no kotlinx.serialization support androidNativeX86()
-    // no kotlinx.serialization support androidNativeX64()
+    androidNativeArm32()
+    androidNativeArm64()
+    androidNativeX86()
+    androidNativeX64()
     mingwX64()
-    // no kotlinx.serialization support watchosDeviceArm64()
+    watchosDeviceArm64()
 
     sourceSets {
         commonMain {

diff --git a/kotlinx-uuid-core/src/commonMain/kotlin/kotlinx/uuid/SecureRandom.kt b/kotlinx-uuid-core/src/commonMain/kotlin/kotlinx/uuid/SecureRandom.kt
@@ -8,6 +8,6 @@ import kotlin.random.*
  * - On JS, it uses `window.crypto` or `nodejs.crypto`.
  * - On darwin, it uses `SecRandomCopyBytes`.
  * - On mingw, it uses `BCryptRandom`.
- * - On Linux, it uses `DevUrandom`.
+ * - On Linux and Android native, it uses `DevUrandom`.
  */
 public expect val SecureRandom: Random
diff --git a/...xMain/kotlin/kotlinx/uuid/SecureRandom.kt → ...tMain/kotlin/kotlinx/uuid/SecureRandom.kt b/...xMain/kotlin/kotlinx/uuid/SecureRandom.kt → ...tMain/kotlin/kotlinx/uuid/SecureRandom.kt
@@ -15,7 +15,7 @@ private class DevUrandom : Random() {
         val urandom = open("/dev/urandom", O_RDONLY)
         require(urandom >= 0)
         val status = bytes.usePinned {
-            read(urandom, it.addressOf(0), numberOfBytes.toULong())
+            read(urandom, it.addressOf(0), numberOfBytes.convert())
         }
         close(urandom)
         require(status >= 0)