Skip to content

Commit f1dd704

Browse files
authored
Update Kotlin to 2.0.20-RC2, kotlinx-uuid to 0.1.0 and Gradle to 8.10 (#268)
1 parent 8fcb5bf commit f1dd704

20 files changed

Lines changed: 377 additions & 350 deletions

File tree

.github/release.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
changelog:
2+
categories:
3+
- title: Features
4+
labels:
5+
- '*'
6+
exclude:
7+
labels:
8+
- dependencies
9+
- title: Updated Dependencies
10+
labels:
11+
- dependencies

.github/workflows/CD.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
run: long="${{ github.ref }}"; version=${long#"refs/tags/v"}; echo "version=${version}" >> $GITHUB_ENV
1818
- uses: gradle/gradle-build-action@v2
1919
- name: Publish
20-
run: ./gradlew -Pversion=$version -Dorg.gradle.parallel=false publish closeAndReleaseStagingRepository
20+
run: ./gradlew -Pversion=$version -Dorg.gradle.parallel=false publish closeAndReleaseStagingRepositories
2121
env:
2222
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
2323
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

cloudkitclient-core/api/cloudkitclient-core.api

Lines changed: 201 additions & 201 deletions
Large diffs are not rendered by default.
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
package app.softwork.cloudkitclient
22

33
import app.softwork.cloudkitclient.types.*
4+
import app.softwork.uuid.toUuid
45
import kotlinx.datetime.*
5-
import kotlinx.uuid.*
6+
import kotlin.uuid.*
7+
import kotlin.uuid.ExperimentalUuidApi
68

9+
@OptIn(ExperimentalUuidApi::class)
710
public class TestClient(clock: Clock) : Client {
811
override val logging: (String) -> Unit = { println(it) }
9-
private val assets: MutableMap<UUID, Pair<Asset, ByteArray>> = mutableMapOf()
12+
private val assets: MutableMap<Uuid, Pair<Asset, ByteArray>> = mutableMapOf()
1013

1114
override val publicDB: TestDatabase = TestDatabase("public", assets, clock)
1215
override val privateDB: TestDatabase = TestDatabase("private", assets, clock)
1316
override val sharedDB: TestDatabase = TestDatabase("shared", assets, clock)
1417

1518
override suspend fun download(assetToDownload: Asset): ByteArray =
16-
assets[assetToDownload.downloadURL!!.toUUID()]!!.second
19+
assets[assetToDownload.downloadURL!!.toUuid()]!!.second
1720
}

cloudkitclient-testing/src/commonMain/kotlin/app/softwork/cloudkitclient/TestDatabase.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ import app.softwork.cloudkitclient.Record.Information
88
import app.softwork.cloudkitclient.types.*
99
import app.softwork.cloudkitclient.values.*
1010
import kotlinx.datetime.*
11-
import kotlinx.uuid.*
1211
import kotlin.reflect.*
12+
import kotlin.uuid.*
1313

14+
@OptIn(ExperimentalUuidApi::class)
1415
public class TestDatabase(
1516
public val name: String,
16-
public val assets: MutableMap<UUID, Pair<Asset, ByteArray>>,
17+
public val assets: MutableMap<Uuid, Pair<Asset, ByteArray>>,
1718
clock: Clock,
1819
public val zones: Map<ZoneID, Storage> = mapOf(ZoneID.default to TestStorage(initUser, assets, clock))
1920
) : Database {
@@ -67,5 +68,5 @@ public class TestDatabase(
6768
): Asset = zones[zoneID]!!.upload(asset, recordInformation, field, recordName)
6869

6970
override suspend fun createToken(): Response =
70-
Response(apnsEnvironment = Development, apnsToken = UUID().toString(), webcourierURL = "")
71+
Response(apnsEnvironment = Development, apnsToken = Uuid.random().toString(), webcourierURL = "")
7172
}

cloudkitclient-testing/src/commonMain/kotlin/app/softwork/cloudkitclient/TestStorage.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ package app.softwork.cloudkitclient
22

33
import app.softwork.cloudkitclient.values.*
44
import kotlinx.datetime.*
5-
import kotlinx.uuid.*
65
import kotlin.reflect.*
6+
import kotlin.uuid.*
77

8+
@OptIn(ExperimentalUuidApi::class)
89
public class TestStorage(
910
private val initUser: UserRecord,
10-
private val assets: MutableMap<UUID, Pair<app.softwork.cloudkitclient.types.Asset, ByteArray>>,
11+
private val assets: MutableMap<Uuid, Pair<app.softwork.cloudkitclient.types.Asset, ByteArray>>,
1112
private val clock: Clock
1213
) : Storage {
1314

@@ -17,7 +18,7 @@ public class TestStorage(
1718
create(initUser, UserRecord)
1819
}
1920

20-
public override fun randomChangeTag(): String = UUID().toString().take(8)
21+
public override fun randomChangeTag(): String = Uuid.random().toString().take(8)
2122

2223
public override fun now(
2324
userRecordName: String,
@@ -83,7 +84,7 @@ public class TestStorage(
8384
field: KProperty1<F, Value.Asset?>,
8485
recordName: String?
8586
): app.softwork.cloudkitclient.types.Asset {
86-
val download = UUID()
87+
val download = Uuid.random()
8788
val asset = app.softwork.cloudkitclient.types.Asset(
8889
fileChecksum = "",
8990
size = content.size,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencyResolutionManagement {
55
gradlePluginPortal()
66
}
77
versionCatalogs.register("libs") {
8-
from(files("../gradle/libs.versions.toml"))
8+
from(files("../libs.versions.toml"))
99
}
1010
}
1111

build-logic/src/main/kotlin/MyRepos.settings.gradle.kts renamed to gradle/build-logic/src/main/kotlin/MyRepos.settings.gradle.kts

File renamed without changes.

0 commit comments

Comments
 (0)