From 2af619c667b73a93a881e65c5669f24066d3b8fb Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Mon, 25 Sep 2023 09:41:21 +0200 Subject: [PATCH 1/7] chore: Bumps org.jetbrains.kotlinx:kotlinx-datetime from 0.4.0 to 0.4.1. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2ec3eb4c82e..86bbc188a5e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ androidx-arch = "2.2.0" androidx-test-orchestrator = "1.4.2" androidx-sqlite = "2.3.1" benasher-uuid = "0.8.0" -ktx-datetime = { strictly = "0.4.0" } +ktx-datetime = { strictly = "0.4.1" } ktx-serialization = "1.5.1" ktx-atomicfu = "0.22.0" kover = "0.7.1" From 5e2c98f540ea7adc7db23070117230bed3543634 Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Mon, 25 Sep 2023 10:11:15 +0200 Subject: [PATCH 2/7] chore: update dependencies --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 86bbc188a5e..29143080a91 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ cryptobox4j = "1.3.0" cryptobox-android = "1.1.5" android-security = "1.1.0-alpha06" ktor = "2.3.4" -okio = "3.4.0" +okio = "3.5.0" ok-http = "4.11.0" mockative = "1.4.1" android-work = "2.8.1" @@ -47,7 +47,7 @@ dokka = "1.8.20" carthage = "0.0.1" libsodiumBindings = "0.8.6" protobufCodegen = "0.9.4" -annotation = "1.2.0" +annotation = "1.7.0" mordant = "2.0.0-beta13" apache-tika = "2.8.0" mockk = "1.13.5" From d06e06b4dade459928b0f4e005a26cdef4171302 Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Mon, 25 Sep 2023 10:36:55 +0200 Subject: [PATCH 3/7] chore: exclude resource --- .../main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt b/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt index 95221e6318a..5f5640957f5 100644 --- a/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt +++ b/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt @@ -58,6 +58,8 @@ fun LibraryExtension.commonAndroidLibConfig( resources.pickFirsts.add("google/protobuf/*.proto") jniLibs.pickFirsts.add("**/libsodium.so") } + packagingOptions.resources.excludes += "META-INF/versions/9/previous-compilation-data.bin" + // No Android Unit test. JVM does that. Android runs on emulator sourceSets.remove(sourceSets.getByName("test")) From a653078166c592adde3edbd1ec757d808fa530d2 Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Mon, 25 Sep 2023 12:17:52 +0200 Subject: [PATCH 4/7] chore: downgrade atomicfu version --- .../main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt b/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt index 5f5640957f5..ea62575d533 100644 --- a/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt +++ b/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt @@ -39,7 +39,7 @@ fun LibraryExtension.commonAndroidLibConfig( includeNativeInterop: Boolean, namespaceSuffix: String ) { - val sanitizedSuffix = namespaceSuffix.replace('-','.') + val sanitizedSuffix = namespaceSuffix.replace('-', '.') namespace = "$BASE_NAMESPACE.$sanitizedSuffix" compileSdk = Android.Sdk.compile sourceSets.getByName("main").manifest.srcFile("src/androidMain/AndroidManifest.xml") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 29143080a91..b3b1a44f8b4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ androidx-sqlite = "2.3.1" benasher-uuid = "0.8.0" ktx-datetime = { strictly = "0.4.1" } ktx-serialization = "1.5.1" -ktx-atomicfu = "0.22.0" +ktx-atomicfu = "0.20.0" kover = "0.7.1" multiplatform-settings = "1.0.0" # if you update sqlDelight check if https://github.com/cashapp/sqldelight/issues/4154 is fixed From 3977cc8a3cc423dbb9bf70ecf8bad76acef2a929 Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Mon, 25 Sep 2023 12:20:12 +0200 Subject: [PATCH 5/7] chore: cleanup --- .../main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt b/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt index ea62575d533..7636a9734f0 100644 --- a/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt +++ b/buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt @@ -58,7 +58,6 @@ fun LibraryExtension.commonAndroidLibConfig( resources.pickFirsts.add("google/protobuf/*.proto") jniLibs.pickFirsts.add("**/libsodium.so") } - packagingOptions.resources.excludes += "META-INF/versions/9/previous-compilation-data.bin" // No Android Unit test. JVM does that. Android runs on emulator sourceSets.remove(sourceSets.getByName("test")) From b25fe052d8431520f9f37b680d5d43c8e64dcb33 Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Fri, 29 Sep 2023 17:49:33 +0200 Subject: [PATCH 6/7] chore: revert atomicfu dependency downgrade --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b3b1a44f8b4..29143080a91 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ androidx-sqlite = "2.3.1" benasher-uuid = "0.8.0" ktx-datetime = { strictly = "0.4.1" } ktx-serialization = "1.5.1" -ktx-atomicfu = "0.20.0" +ktx-atomicfu = "0.22.0" kover = "0.7.1" multiplatform-settings = "1.0.0" # if you update sqlDelight check if https://github.com/cashapp/sqldelight/issues/4154 is fixed From d49771c4f3aa5a66450b0b69bf0d089b677bdb1c Mon Sep 17 00:00:00 2001 From: Oussama Hassine Date: Fri, 29 Sep 2023 18:22:58 +0200 Subject: [PATCH 7/7] chore: downgrade atomicfu to 0.20.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 29143080a91..b3b1a44f8b4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ androidx-sqlite = "2.3.1" benasher-uuid = "0.8.0" ktx-datetime = { strictly = "0.4.1" } ktx-serialization = "1.5.1" -ktx-atomicfu = "0.22.0" +ktx-atomicfu = "0.20.0" kover = "0.7.1" multiplatform-settings = "1.0.0" # if you update sqlDelight check if https://github.com/cashapp/sqldelight/issues/4154 is fixed