Skip to content

Commit 6332110

Browse files
brettchabotcopybara-androidxtest
authored andcommitted
Remove all multidex handling.
Now that SDKs < 23 are not supported, remove all handling for legacy multidex. PiperOrigin-RevId: 789381010
1 parent d24393a commit 6332110

File tree

40 files changed

+26
-532
lines changed

40 files changed

+26
-532
lines changed

MODULE.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ maven.install(
5252
"androidx.concurrent:concurrent-futures-ktx:1.2.0",
5353
"androidx.core:core:1.6.0",
5454
"androidx.lifecycle:lifecycle-common:2.3.1",
55-
"androidx.multidex:multidex:2.0.0",
5655
"androidx.tracing:tracing:1.1.0",
5756
"androidx.window:window-java:1.1.0",
5857
"androidx.window:window-core:1.1.0",

build_extensions/android_library_test.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ def axt_android_library_test(
1010
data = [],
1111
device_list = None,
1212
manifest = None,
13-
multidex = None,
1413
deps = [],
1514
**kwargs):
1615
"""Placeholder for future instrumentation test support.

build_extensions/mainDexClasses.rules

Lines changed: 0 additions & 20 deletions
This file was deleted.

core/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
**API Changes**
1414

15-
* Update to minSdkVersion 23
15+
* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
1616

1717
**Breaking API Changes**
1818

core/javatests/androidx/test/core/app/BUILD

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ licenses(["notice"])
1818
android_binary(
1919
name = "ActivityScenarioTest_target",
2020
manifest = "AndroidManifest_target.xml",
21-
multidex = "legacy",
2221
deps = [
2322
"//core/javatests/androidx/test/core/app/testing",
2423
"//core/javatests/androidx/test/core/app/testing:manifest",
25-
"@maven//:androidx_multidex_multidex",
2624
],
2725
)
2826

espresso/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The following artifacts were released:
2222

2323
**API Changes**
2424

25-
* Update to minSdkVersion 23
25+
* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
2626

2727
**Breaking API Changes**
2828

espresso/device/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
**API Changes**
1414

15-
* Update to minSdkVersion 23
15+
* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
1616

1717
**Breaking API Changes**
1818

ext/junit/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ are released.
1313

1414
**API Changes**
1515

16-
* Update to minSdkVersion 23
16+
* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
1717

1818
**Breaking API Changes**
1919

ext/truth/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
**API Changes**
1717

18-
* Update to minSdkVersion 23
18+
* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
1919

2020
**Breaking API Changes**
2121

gradle-tests/espresso/accessibility/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ android {
1616
defaultConfig {
1717
minSdk rootProject.ext.minSdk
1818
targetSdk rootProject.ext.targetSdk
19-
multiDexEnabled = true
2019
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2120
}
2221

@@ -44,7 +43,6 @@ android {
4443
}
4544

4645
dependencies {
47-
androidTestImplementation "androidx.multidex:multidex:2.0.0"
4846
androidTestImplementation libs.ext.junit
4947
androidTestImplementation libs.espresso.accessibility
5048
androidTestImplementation libs.espresso.core

0 commit comments

Comments
 (0)