diff --git a/buildSrc/src/main/kotlin/io.customer/android/Versions.kt b/buildSrc/src/main/kotlin/io.customer/android/Versions.kt index 06a6205a..262fb5a7 100644 --- a/buildSrc/src/main/kotlin/io.customer/android/Versions.kt +++ b/buildSrc/src/main/kotlin/io.customer/android/Versions.kt @@ -33,7 +33,7 @@ object Versions { internal const val SEGMENT = "1.19.2" internal const val REDUX_KOTLIN = "0.6.0" internal const val ROBOLECTRIC = "4.16" - internal const val OKHTTP = "5.2.1" + internal const val OKHTTP = "4.12.0" internal const val RETROFIT = "2.11.0" // Compose (using latest stable BOM compatible with Kotlin 2.1.21) diff --git a/messaginginapp/build.gradle b/messaginginapp/build.gradle index 5f60bbf1..bf6a3ba9 100644 --- a/messaginginapp/build.gradle +++ b/messaginginapp/build.gradle @@ -32,14 +32,6 @@ android { viewBinding true } - packaging { - resources { - excludes += [ - 'META-INF/versions/9/OSGI-INF/MANIFEST.MF', - 'META-INF/OSGI-INF/MANIFEST.MF' - ] - } - } } dependencies { diff --git a/samples/java_layout/build.gradle b/samples/java_layout/build.gradle index 3746b2a9..e1f7051c 100644 --- a/samples/java_layout/build.gradle +++ b/samples/java_layout/build.gradle @@ -37,15 +37,6 @@ android { // BuildConfig is now enabled in sample-app.gradle } - packaging { - resources { - excludes += [ - 'META-INF/versions/9/OSGI-INF/MANIFEST.MF', - 'META-INF/OSGI-INF/MANIFEST.MF' - ] - } - } - // No need for composeOptions reference as it's conditionally applied in sample-app.gradle } diff --git a/samples/kotlin_compose/build.gradle.kts b/samples/kotlin_compose/build.gradle.kts index 7cb5b183..02f36060 100644 --- a/samples/kotlin_compose/build.gradle.kts +++ b/samples/kotlin_compose/build.gradle.kts @@ -43,13 +43,6 @@ android { } // buildFeatures and composeOptions are configured in sample-app.gradle - packaging { - resources { - excludes += "/META-INF/{AL2.0,LGPL2.1}" - excludes += "META-INF/versions/9/OSGI-INF/MANIFEST.MF" - excludes += "META-INF/OSGI-INF/MANIFEST.MF" - } - } } kotlin {