WIP switch to kotlin.uuid.Uuid

gradle/build-logic/build.gradle.kts

@@ -4,7 +4,6 @@ plugins {
 
 dependencies {
     implementation(libs.plugins.kotlin.jvm.toDep())
-    implementation(libs.plugins.kotlin.serialization.toDep())
     implementation(libs.plugins.kotlin.parcelize.toDep())
     implementation(libs.plugins.android.toDep())
     implementation(libs.plugins.binary.toDep())

gradle/build-logic/settings.gradle.kts

@@ -1,6 +1,7 @@
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
         mavenCentral()
         google()
         gradlePluginPortal()

gradle/build-logic/src/main/kotlin/KotlinConfig.kt

@@ -8,7 +8,7 @@ fun KotlinProjectExtension.kotlinConfig() {
     sourceSets.configureEach {
         languageSettings {
             progressiveMode = true
-            optIn("kotlinx.uuid.InternalAPI")
+            optIn("kotlin.ExperimentalStdlibApi")
         }
     }
 }

gradle/build-logic/src/main/kotlin/kotlinJvm.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     kotlin("jvm")
-    kotlin("plugin.serialization")
 }
 
 kotlin {

gradle/build-logic/src/main/kotlin/kotlinMPP.gradle.kts

@@ -1,13 +1,15 @@
 plugins {
     kotlin("multiplatform")
-    kotlin("plugin.serialization")
 }
 
 kotlin {
     jvm()
     js(IR) {
         browser()
         nodejs()
+        compilerOptions {
+            target.set("es2015")
+        }
     }
 
     // tier 1

gradle/build-logic/src/main/kotlin/mySettings.settings.gradle.kts

@@ -1,5 +1,6 @@
 dependencyResolutionManagement {
     repositories {
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
         mavenCentral()
         google()
     }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.0.0"
+kotlin = "2.0.20-dev-7572"
 serialization = "1.7.1"
 exposed = "0.52.0"
 
@@ -24,7 +24,7 @@ androidx-test-runner = { module = "androidx.test:runner", version = "1.6.1" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
-android = { id = "com.android.application", version = "8.5.0" }
+android = { id = "com.android.application", version = "8.3.0" }
 binary = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.14.0" }
 publish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }

kotlinx-uuid-core/build.gradle.kts

@@ -15,27 +15,12 @@ plugins {
 }
 
 kotlin {
-    applyDefaultHierarchyTemplate {
-        common {
-            group("linuxDerivat") {
-                group("androidNative")
-                group("linux")
-            }
-        }
-    }
+    applyDefaultHierarchyTemplate()
 
     sourceSets {
-        commonMain {
-            dependencies {
-                implementation(libs.serialization.core)
-            }
-        }
         commonTest {
             dependencies {
                 implementation(kotlin("test"))
-                implementation(libs.serialization.json)
-                implementation(libs.serialization.cbor)
-                implementation(libs.serialization.protobuf)
             }
         }
     }
@@ -80,8 +65,4 @@ kotlin {
             }
         }
     }
-    compilerOptions.freeCompilerArgs.addAll(
-        "-P",
-        "plugin:org.jetbrains.kotlin.parcelize:additionalAnnotation=kotlinx.uuid.internal.CommonParcelize",
-    )
 }

kotlinx-uuid-core/src/androidMain/kotlin/kotlinx/uuid/internal/Parcelabler.kt

@@ -0,0 +1,18 @@
+package kotlinx.uuid.internal
+
+import android.os.Parcel
+import kotlinx.parcelize.Parceler
+
+public object UuidParceler : Parceler<kotlin.uuid.Uuid> {
+    override fun create(parcel: Parcel): kotlin.uuid.Uuid = kotlin.uuid.Uuid.fromLongs(
+        parcel.readLong(),
+        parcel.readLong(),
+    )
+
+    override fun kotlin.uuid.Uuid.write(parcel: Parcel, flags: Int) {
+        toLongs { mostSignificantBits, leastSignificantBits ->
+            parcel.writeLong(mostSignificantBits)
+            parcel.writeLong(leastSignificantBits)
+        }
+    }
+}

kotlinx-uuid-core/src/appleMain/kotlin/kotlinx/uuid/Converter.kt

@@ -4,14 +4,16 @@
 
 package kotlinx.uuid
 
+import kotlin.uuid.Uuid
+
 /**
  * Converts this [platform.Foundation.NSUUID][platform.Foundation.NSUUID] value to a [kotlinx.uuid.UUID][UUID] value
  * by using the [UUIDString][platform.Foundation.NSUUID.UUIDString] representation.
  */
-public fun platform.Foundation.NSUUID.toKotlinUUID(): UUID = UUID(UUIDString)
+public fun platform.Foundation.NSUUID.toKotlinUUID(): Uuid = Uuid.parse(UUIDString)
 
 /**
  * Converts this [kotlinx.uuid.UUID][UUID] value to a [platform.Foundation.NSUUID][platform.Foundation.NSUUID] value
  * by using the default [toString] representation.
  */
-public fun UUID.toNsUUID(): platform.Foundation.NSUUID = platform.Foundation.NSUUID(toString())
+public fun Uuid.toNsUUID(): platform.Foundation.NSUUID = platform.Foundation.NSUUID(toString())

kotlinx-uuid-core/src/appleTest/kotlin/kotlinx/uuid/NsUUIDConvertingTest.kt

@@ -9,12 +9,13 @@
 package kotlinx.uuid
 
 import kotlin.test.*
+import kotlin.uuid.Uuid
 
 class NsUUIDConvertingTest {
 
     @Test
     fun toNsUUID() {
-        val kotlinUUID = UUID(SOME_UUID_STRING)
+        val kotlinUUID = Uuid.parse(SOME_UUID_STRING)
         val nsUUID = kotlinUUID.toNsUUID()
         assertEquals(SOME_UUID_STRING, nsUUID.UUIDString.lowercase())
     }