diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-07-31 15:38:13 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-08-01 09:48:08 +0200 |
| commit | 754677a648ad6580f5546f0b83ea5765cfd97b3d (patch) | |
| tree | f7c1c32538f06a262c5d3086f4e4512af288eb4a /android/gradle | |
| parent | 212c9c1aabe17763f0ed807b2d3fca15f2305c8b (diff) | |
| download | mullvadvpn-754677a648ad6580f5546f0b83ea5765cfd97b3d.tar.xz mullvadvpn-754677a648ad6580f5546f0b83ea5765cfd97b3d.zip | |
Fix ktor parsing error
App module had transitive dependencies using a older version at runtime
of serializationx. However, when compiling the test:e2e module a later
version than 1.8.0 was used through ktor. This caused deserialization
in runtime to go looking for a method that didn't exist. By putting an
explicit version in the app module we make sure to use a version that
is compatible with ktor.
Diffstat (limited to 'android/gradle')
| -rw-r--r-- | android/gradle/libs.versions.toml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 92fb8b5048..3e0e6fceb3 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -65,7 +65,6 @@ koin = "4.1.0" koin-compose = "4.1.0" # Ktor -# Bumping to 3.1.0 causes an AbstractMethodError in the serialization logic (DROID-1820). ktor = "3.2.3" # Kotlin @@ -74,7 +73,7 @@ ktor = "3.2.3" kotlin = "2.2.0" kotlin-ksp = "2.2.0-2.0.2" kotlinx = "1.10.2" -kotlinx-serialization = "1.8.1" +kotlinx-serialization-json = "1.9.0" # Protobuf protobuf-gradle-plugin = "0.9.5" @@ -121,6 +120,7 @@ androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx- androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx-uiautomator" } androidx-test-orchestrator = { module = "androidx.test:orchestrator", version.ref = "androidx-testorchestrator" } androidx-tv = { module = "androidx.tv:tv-material", version.ref = "androidx-tv" } +androidx-ui-test = { module = "androidx.compose.ui:ui-test", version.ref = "compose" } # Arrow arrow = { module = "io.arrow-kt:arrow-core", version.ref = "arrow" } @@ -180,6 +180,7 @@ kotlin-native-prebuilt = { module = "org.jetbrains.kotlin:kotlin-native-prebuilt kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx" } kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx" } +kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" } # Ktor ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } |