diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9be152e9e7..1c7466f680 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -197,6 +197,12 @@ android { buildConfigFieldStr("FLAVOR_DESCRIPTION", "FDroid") } } + + packaging { + resources.pickFirsts += setOf( + "META-INF/versions/9/OSGI-INF/MANIFEST.MF", + ) + } } androidComponents { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 42ba9684e3..091bb12c49 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -135,7 +135,7 @@ accompanist_permission = { module = "com.google.accompanist:accompanist-permissi squareup_seismic = "com.squareup:seismic:1.0.3" # network -network_okhttp_bom = "com.squareup.okhttp3:okhttp-bom:5.1.0" +network_okhttp_bom = "com.squareup.okhttp3:okhttp-bom:5.2.1" network_okhttp_logging = { module = "com.squareup.okhttp3:logging-interceptor" } network_okhttp_okhttp = { module = "com.squareup.okhttp3:okhttp" } network_okhttp = { module = "com.squareup.okhttp3:okhttp" }