Move to stdlib Uuid (#1405)

Co-authored-by: Ashley Davies <[email protected]>
ashdavies · Dec 17, 2024 · 290ead1 · 290ead1
1 parent 037dcdd
commit 290ead1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 27 deletions.
diff --git a/conferences-app/src/androidMain/kotlin/io/ashdavies/party/gallery/StorageManager.android.kt b/conferences-app/src/androidMain/kotlin/io/ashdavies/party/gallery/StorageManager.android.kt
@@ -1,18 +1,20 @@
 package io.ashdavies.party.gallery
 
 import io.ashdavies.content.PlatformContext
-import io.ashdavies.util.randomUuid
 import kotlinx.coroutines.withContext
 import java.io.File
 import kotlin.coroutines.CoroutineContext
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 internal actual fun StorageManager(
     pathProvider: PathProvider,
     coroutineContext: CoroutineContext,
 ): StorageManager = object : StorageManager {
 
+    @OptIn(ExperimentalUuidApi::class)
     override suspend fun create(platformContext: PlatformContext): File = withContext(coroutineContext) {
-        File(pathProvider.getImagesPath(), "${randomUuid()}.jpg").apply {
+        File(pathProvider.getImagesPath(), "${Uuid.random()}.jpg").apply {
             require(createNewFile()) { "File already exists" }
         }
     }

diff --git a/conferences-app/src/commonMain/kotlin/io/ashdavies/party/gallery/ImageManager.kt b/conferences-app/src/commonMain/kotlin/io/ashdavies/party/gallery/ImageManager.kt
@@ -2,8 +2,9 @@ package io.ashdavies.party.gallery
 
 import io.ashdavies.content.PlatformContext
 import io.ashdavies.sql.mapToList
-import io.ashdavies.util.randomUuid
 import kotlinx.coroutines.flow.Flow
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 internal interface ImageManager {
     val list: Flow<List<Image>>
@@ -28,9 +29,10 @@ internal fun ImageManager(
         .selectAll()
         .mapToList()
 
+    @OptIn(ExperimentalUuidApi::class)
     override fun add(file: File) {
         val image = Image(
-            uuid = randomUuid(),
+            uuid = "${Uuid.random()}",
             name = file.getName(),
             path = file.getAbsolutePath(),
         )

diff --git a/conferences-app/src/commonTest/kotlin/io/ashdavies/gallery/SyncManagerTest.kt b/conferences-app/src/commonTest/kotlin/io/ashdavies/gallery/SyncManagerTest.kt
@@ -5,14 +5,16 @@ import io.ashdavies.http.DefaultHttpConfiguration
 import io.ashdavies.party.gallery.SyncManager
 import io.ashdavies.party.gallery.SyncState
 import io.ashdavies.party.gallery.inMemoryHttpClientEngine
-import io.ashdavies.util.randomUuid
 import io.ktor.client.HttpClient
 import io.ktor.utils.io.ByteReadChannel
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
-private val RandomImage = "${randomUuid()}.jpg"
+@OptIn(ExperimentalUuidApi::class)
+private val RandomImage = "${Uuid.random()}.jpg"
 
 internal class SyncManagerTest {
 

diff --git a/conferences-app/src/jvmMain/kotlin/io/ashdavies/party/gallery/StorageManager.jvm.kt b/conferences-app/src/jvmMain/kotlin/io/ashdavies/party/gallery/StorageManager.jvm.kt
@@ -1,18 +1,20 @@
 package io.ashdavies.party.gallery
 
 import io.ashdavies.content.PlatformContext
-import io.ashdavies.util.randomUuid
 import kotlinx.coroutines.withContext
 import java.io.File
 import kotlin.coroutines.CoroutineContext
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 internal actual fun StorageManager(
     pathProvider: PathProvider,
     coroutineContext: CoroutineContext,
 ): StorageManager = object : StorageManager {
 
+    @OptIn(ExperimentalUuidApi::class)
     override suspend fun create(platformContext: PlatformContext): File = withContext(coroutineContext) {
-        File(pathProvider.getImagesPath(), "${randomUuid()}.jpg").apply {
+        File(pathProvider.getImagesPath(), "${Uuid.random()}.jpg").apply {
             require(createNewFile()) { "File already exists" }
         }
     }

diff --git a/identity-manager/src/commonMain/kotlin/io/ashdavies/identity/GoogleIdIdentityService.kt b/identity-manager/src/commonMain/kotlin/io/ashdavies/identity/GoogleIdIdentityService.kt
@@ -1,14 +1,16 @@
 package io.ashdavies.identity
 
 import io.ashdavies.content.PlatformContext
-import io.ashdavies.util.randomUuid
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 internal expect class GoogleIdIdentityService(
     context: PlatformContext,
 ) : IdentityService<GoogleIdIdentityRequest>
 
+@OptIn(ExperimentalUuidApi::class)
 internal data class GoogleIdIdentityRequest(
     val serverClientId: String,
     val autoSelectEnabled: Boolean = true,
-    val nonce: String? = randomUuid(),
+    val nonce: String = "${Uuid.random()}",
 ) : IdentityRequest
diff --git a/platform-support/src/androidMain/kotlin/io/ashdavies/util/PlatformUuid.android.kt b/platform-support/src/androidMain/kotlin/io/ashdavies/util/PlatformUuid.android.kt
diff --git a/platform-support/src/commonMain/kotlin/io/ashdavies/util/PlatformUuid.kt b/platform-support/src/commonMain/kotlin/io/ashdavies/util/PlatformUuid.kt
diff --git a/platform-support/src/jvmMain/kotlin/io/ashdavies/util/PlatformUuid.jvm.kt b/platform-support/src/jvmMain/kotlin/io/ashdavies/util/PlatformUuid.jvm.kt