From a7e7bf99c3315e6ce77260c40e2a04d199111165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=B3bert=20Papp?= Date: Sun, 29 Sep 2024 17:56:42 +0100 Subject: [PATCH] Remove Multidex usages (#473) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaëtan Muller --- android/build.gradle | 1 - .../debug/java/net/twisterrob/inventory/android/DebugApp.java | 2 +- gradle/libs.versions.toml | 3 --- gradle/platform-inventory/build.gradle.kts | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 6ab6c9d49..7b0de8cc2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -49,7 +49,6 @@ dependencies { testImplementation 'net.twisterrob.lib:twister-lib-hamcrest' testImplementation 'net.twisterrob.lib:twister-lib-mockito' testImplementation(libs.test.robolectric) - testImplementation(libs.test.robolectricMultidexShadows) testImplementation(libs.androidx.test.core) testRuntimeOnly(libs.slf4j.simple) diff --git a/android/src/debug/java/net/twisterrob/inventory/android/DebugApp.java b/android/src/debug/java/net/twisterrob/inventory/android/DebugApp.java index 499302898..10784db83 100644 --- a/android/src/debug/java/net/twisterrob/inventory/android/DebugApp.java +++ b/android/src/debug/java/net/twisterrob/inventory/android/DebugApp.java @@ -1,5 +1,5 @@ package net.twisterrob.inventory.android; public class DebugApp extends App { - // MultiDex was here, debug-only overrides come here. + // Debug-only overrides come here. } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 34b8a0279..2ca0addb2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,7 +41,6 @@ androidx-lifecycle = "2.6.2" # https://developer.android.com/jetpack/androidx/re androidx-loader = "1.1.0" # https://developer.android.com/jetpack/androidx/releases/loader androidx-localbroadcastmanager = "1.1.0" # https://developer.android.com/jetpack/androidx/releases/localbroadcastmanager androidx-material = "1.9.0" # https://github.com/material-components/material-components-android/releases -androidx-multidex = "2.0.1" # https://developer.android.com/jetpack/androidx/releases/multidex androidx-preference = "1.2.1" # https://developer.android.com/jetpack/androidx/releases/preference androidx-print = "1.0.0" # https://developer.android.com/jetpack/androidx/releases/print androidx-recyclerview = "1.3.1" # https://developer.android.com/jetpack/androidx/releases/recyclerview @@ -122,7 +121,6 @@ androidx-lifecycleViewModel = { module = "androidx.lifecycle:lifecycle-viewmodel androidx-loader = { module = "androidx.loader:loader", version.ref = "androidx-loader" } androidx-localbroadcastmanager = { module = "androidx.localbroadcastmanager:localbroadcastmanager", version.ref = "androidx-localbroadcastmanager" } androidx-material = { module = "com.google.android.material:material", version.ref = "androidx-material" } -androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "androidx-multidex" } androidx-preference = { module = "androidx.preference:preference", version.ref = "androidx-preference" } androidx-print = { module = "androidx.print:print", version.ref = "androidx-print" } androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "androidx-recyclerview" } @@ -160,7 +158,6 @@ test-mockito = { module = "org.mockito:mockito-core", version.ref = "test-mockit test-mockitoKotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "test-mockito-kotlin" } test-mockitoAndroid = { module = "org.mockito:mockito-android", version.ref = "test-mockito-android" } test-robolectric = { module = "org.robolectric:robolectric", version.ref = "test-robolectric" } -test-robolectricMultidexShadows = { module = "org.robolectric:shadows-multidex", version.ref = "test-robolectric" } # Gwen.given, Gwen.when, Gwen.then test-gwen = { module = "com.shazam:gwen", version.ref = "test-gwen" } test-durian = { module = "com.diffplug.durian:durian", version.ref = "test-durian" } diff --git a/gradle/platform-inventory/build.gradle.kts b/gradle/platform-inventory/build.gradle.kts index b5e65a8a1..cd991f0a9 100644 --- a/gradle/platform-inventory/build.gradle.kts +++ b/gradle/platform-inventory/build.gradle.kts @@ -26,7 +26,6 @@ dependencies { androidxTest.forEach { api(libsVC.findLibrary(it).get()) } api(libs.test.robolectric) - api(libs.test.robolectricMultidexShadows) } }