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..7636a9734f0 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") @@ -58,6 +58,7 @@ fun LibraryExtension.commonAndroidLibConfig( resources.pickFirsts.add("google/protobuf/*.proto") jniLibs.pickFirsts.add("**/libsodium.so") } + // No Android Unit test. JVM does that. Android runs on emulator sourceSets.remove(sourceSets.getByName("test")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2ec3eb4c82e..b3b1a44f8b4 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" @@ -23,9 +23,9 @@ 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" +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 @@ -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"