Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to kotlin.uuid.Uuid #361

Merged
merged 13 commits into from
Aug 17, 2024
Merged

Switch to kotlin.uuid.Uuid #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fa27b4d
WIP switch to kotlin.uuid.Uuid
hfhbd Jul 2, 2024
d9c1135
Remove exposed support due to Comparable requirement
hfhbd Aug 16, 2024
ad4f42e
Bump Kotlin to 2.0.20-RC2
hfhbd Aug 16, 2024
43941fe
clean up
hfhbd Aug 16, 2024
ac08fcb
Bring back BinarySerializer until there is one in kotlinx-serialization
hfhbd Aug 17, 2024
f7d1aba
Bring back helpers
hfhbd Aug 17, 2024
d90b404
Bring back helpers
hfhbd Aug 17, 2024
8721419
Bring back helpers
hfhbd Aug 17, 2024
bb8707d
Rename converter to lowercase
hfhbd Aug 17, 2024
73bdd1b
Update abi
hfhbd Aug 17, 2024
b31fa97
Update api
hfhbd Aug 17, 2024
6f23fa3
Update yarn lock file
hfhbd Aug 17, 2024
06b84ce
Remove stdlib tests
hfhbd Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 29 additions & 56 deletions detekt-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,19 @@
<SmellBaseline>
<ManuallySuppressedIssues/>
<CurrentIssues>
<ID>FunctionNaming:Dsl.kt$@UUIDExperimentalAPI public fun UUIDv7(timeStamp: Instant = Clock.System.now(), random: Random = SecureRandom): UUID</ID>
<ID>FunctionNaming:UUID7.kt$@UUIDExperimentalAPI public fun UUIDv7(timeStamp: Long, random: Random = SecureRandom): UUID</ID>
<ID>MagicNumber:Encoding.kt$0xff</ID>
<ID>MagicNumber:Encoding.kt$56</ID>
<ID>MagicNumber:Encoding.kt$7</ID>
<ID>MagicNumber:Encoding.kt$8</ID>
<ID>MagicNumber:Formatter.kt$0xffff</ID>
<ID>MagicNumber:Formatter.kt$0xffffffffffffL</ID>
<ID>MagicNumber:Formatter.kt$10</ID>
<ID>MagicNumber:Formatter.kt$16</ID>
<ID>MagicNumber:Formatter.kt$32</ID>
<ID>MagicNumber:Formatter.kt$38</ID>
<ID>MagicNumber:Formatter.kt$4</ID>
<ID>MagicNumber:Formatter.kt$48</ID>
<ID>MagicNumber:Formatter.kt$6</ID>
<ID>MagicNumber:Formatter.kt$8</ID>
<ID>MagicNumber:Formatter.kt$9</ID>
<ID>FunctionNaming:Dsl.kt$public fun UUIDv7(timeStamp: Instant = Clock.System.now(), random: Random): Uuid</ID>
<ID>FunctionNaming:UUID7.kt$public fun UUIDv7(timeStamp: Long, random: Random): Uuid</ID>
<ID>MagicNumber:KotlinConfig.kt$8</ID>
<ID>MagicNumber:NameBasedGenerator.kt$0x3f</ID>
<ID>MagicNumber:NameBasedGenerator.kt$4</ID>
<ID>MagicNumber:NameBasedGenerator.kt$6</ID>
<ID>MagicNumber:NameBasedGenerator.kt$8</ID>
<ID>MagicNumber:Parser.kt$10</ID>
<ID>MagicNumber:Parser.kt$12</ID>
<ID>MagicNumber:Parser.kt$16</ID>
<ID>MagicNumber:Parser.kt$32</ID>
<ID>MagicNumber:Parser.kt$4</ID>
<ID>MagicNumber:Parser.kt$48</ID>
<ID>MagicNumber:Parser.kt$6</ID>
<ID>MagicNumber:Parser.kt$8</ID>
<ID>MagicNumber:RandomGenerator.kt$0x38</ID>
<ID>MagicNumber:RandomGenerator.kt$0x3fffffffffffffffL</ID>
<ID>MagicNumber:RandomGenerator.kt$0x4000L</ID>
<ID>MagicNumber:RandomGenerator.kt$0x80L</ID>
<ID>MagicNumber:RandomGenerator.kt$0x3f</ID>
<ID>MagicNumber:RandomGenerator.kt$0x40</ID>
<ID>MagicNumber:RandomGenerator.kt$0x80</ID>
<ID>MagicNumber:RandomGenerator.kt$16</ID>
<ID>MagicNumber:RandomGenerator.kt$6</ID>
<ID>MagicNumber:RandomGenerator.kt$8</ID>
<ID>MagicNumber:SHA1.kt$SHA1$0X67452301</ID>
<ID>MagicNumber:SHA1.kt$SHA1$0x5a827999</ID>
<ID>MagicNumber:SHA1.kt$SHA1$0x6ed9eba1</ID>
Expand Down Expand Up @@ -65,37 +44,31 @@
<ID>MagicNumber:SHA1.kt$SHA1.IntArrayView$3</ID>
<ID>MagicNumber:SHA1.kt$SHA1.IntArrayView$4</ID>
<ID>MagicNumber:SHA1.kt$SHA1.IntArrayView$8</ID>
<ID>MagicNumber:SecureRandom.js.kt$SecureRandomBrowser$31</ID>
<ID>MagicNumber:SecureRandom.js.kt$SecureRandomBrowser$32</ID>
<ID>MagicNumber:UUID.kt$UUID$0x0fffL</ID>
<ID>MagicNumber:UUID.kt$UUID$0x1fff</ID>
<ID>MagicNumber:UUID.kt$UUID$0xf000L</ID>
<ID>MagicNumber:UUID.kt$UUID$0xffff0000L</ID>
<ID>MagicNumber:UUID.kt$UUID$0xffffffffffffL</ID>
<ID>MagicNumber:UUID.kt$UUID$12</ID>
<ID>MagicNumber:UUID.kt$UUID$13</ID>
<ID>MagicNumber:UUID.kt$UUID$15</ID>
<ID>MagicNumber:UUID.kt$UUID$16</ID>
<ID>MagicNumber:UUID.kt$UUID$32</ID>
<ID>MagicNumber:UUID.kt$UUID$4</ID>
<ID>MagicNumber:UUID.kt$UUID$48</ID>
<ID>MagicNumber:UUID.kt$UUID$5</ID>
<ID>MagicNumber:UUID.kt$UUID$60</ID>
<ID>MagicNumber:UUID.kt$UUID$61</ID>
<ID>MagicNumber:UUID.kt$UUID$7</ID>
<ID>MagicNumber:UUID.kt$UUID.Version.NAME_BASED_MD5$3</ID>
<ID>MagicNumber:UUID.kt$UUID.Version.NAME_BASED_SHA1$5</ID>
<ID>MagicNumber:UUID.kt$UUID.Version.RANDOM_BASED$4</ID>
<ID>MagicNumber:UUID.kt$0x0fffL</ID>
<ID>MagicNumber:UUID.kt$0x1fff</ID>
<ID>MagicNumber:UUID.kt$0xf000L</ID>
<ID>MagicNumber:UUID.kt$0xffff00000000L</ID>
<ID>MagicNumber:UUID.kt$0xffff0000L</ID>
<ID>MagicNumber:UUID.kt$0xffffffffffffL</ID>
<ID>MagicNumber:UUID.kt$12</ID>
<ID>MagicNumber:UUID.kt$13</ID>
<ID>MagicNumber:UUID.kt$15</ID>
<ID>MagicNumber:UUID.kt$16</ID>
<ID>MagicNumber:UUID.kt$32</ID>
<ID>MagicNumber:UUID.kt$4</ID>
<ID>MagicNumber:UUID.kt$48</ID>
<ID>MagicNumber:UUID.kt$5</ID>
<ID>MagicNumber:UUID.kt$60</ID>
<ID>MagicNumber:UUID.kt$61</ID>
<ID>MagicNumber:UUID.kt$7</ID>
<ID>MagicNumber:UUID7.kt$0x0fffL</ID>
<ID>MagicNumber:UUID7.kt$0xffff0000L</ID>
<ID>MagicNumber:UUID7.kt$16</ID>
<ID>MagicNumber:UUID7.kt$28672</ID>
<ID>MagicNumber:UUID7.kt$32</ID>
<ID>MagicNumber:UUID7.kt$4095</ID>
<ID>MagicNumber:UUID7.kt$48</ID>
<ID>MagicNumber:UUID7.kt$62</ID>
<ID>MatchingDeclarationName:CommonParcelable.apple.kt$CommonParcelable</ID>
<ID>MatchingDeclarationName:CommonParcelable.js.kt$CommonParcelable</ID>
<ID>MatchingDeclarationName:CommonParcelable.jvm.kt$CommonParcelable</ID>
<ID>MatchingDeclarationName:CommonParcelable.linux.kt$CommonParcelable</ID>
<ID>MatchingDeclarationName:CommonParcelable.ming.kt$CommonParcelable</ID>
<ID>TooManyFunctions:SHA1.kt$SHA1</ID>
<ID>VariableNaming:UUID7.kt$val rand_a = helper.timeStamp and 4095</ID>
</CurrentIssues>
</SmellBaseline>
1 change: 0 additions & 1 deletion gradle/build-logic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion gradle/build-logic/src/main/kotlin/KotlinConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fun KotlinProjectExtension.kotlinConfig() {
sourceSets.configureEach {
languageSettings {
progressiveMode = true
optIn("kotlinx.uuid.InternalAPI")
optIn("kotlin.uuid.ExperimentalUuidApi")
}
}
}
8 changes: 0 additions & 8 deletions gradle/build-logic/src/main/kotlin/kotlinJvm.gradle.kts
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion gradle/build-logic/src/main/kotlin/kotlinMPP.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
kotlin("multiplatform")
kotlin("plugin.serialization")
}

kotlin {
Expand Down
8 changes: 1 addition & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
[versions]
kotlin = "2.0.0"
kotlin = "2.0.20-RC2"
serialization = "1.7.1"
exposed = "0.52.0"

[libraries]
serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cbor", version.ref = "serialization" }
serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "serialization" }

exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" }
exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" }
h2 = { module = "com.h2database:h2", version = "2.3.230" }
slf4j = { module = "org.slf4j:slf4j-simple", version = "2.0.13" }

sqldelight-runtime = { module = "app.cash.sqldelight:runtime", version = "2.0.2" }

datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.6.0" }
Expand Down
Loading
Loading