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

chore: update dependencies #2085

Merged
merged 9 commits into from
Oct 2, 2023
Merged

chore: update dependencies #2085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2af619c
chore: Bumps org.jetbrains.kotlinx:kotlinx-datetime from 0.4.0 to 0.4.1.
ohassine Sep 25, 2023
5e2c98f
chore: update dependencies
ohassine Sep 25, 2023
d06e06b
chore: exclude resource
ohassine Sep 25, 2023
a653078
chore: downgrade atomicfu version
ohassine Sep 25, 2023
3977cc8
chore: cleanup
ohassine Sep 25, 2023
1c10f66
Merge branch 'develop' into update_dependencies
ohassine Sep 25, 2023
b25fe05
chore: revert atomicfu dependency downgrade
ohassine Sep 29, 2023
d6f9695
Merge remote-tracking branch 'origin/develop' into update_dependencies
ohassine Sep 29, 2023
d49771c
chore: downgrade atomicfu to 0.20.0
ohassine Sep 29, 2023
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
3 changes: 2 additions & 1 deletion buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonAndroidConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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"))

Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't look like an update.

Is the rollback to 0.20.0 intended?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it's on purpose because both atomicfu 0.22 and datetime 0.4.1 duplicate this bin file

> A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction
   > 2 files found with path 'META-INF/versions/9/previous-compilation-data.bin' from inputs:

I downgraded atomicfu because I recently updated it from 0.18.5

That should be fixed in 0.4.2
Kotlin/kotlinx-datetime#304

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
Expand All @@ -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"
Expand Down