Skip to content

Commit 5678443

Browse files
brettchabotcopybara-androidxtest
authored andcommitted
Remove all remaining special case handling for SDKs < 23.
Now that minSdkVersion is 23, remove all special case handling for SDKs less than that. PiperOrigin-RevId: 789397071
1 parent a2e69c5 commit 5678443

File tree

105 files changed

+110
-747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+110
-747
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/AndroidManifest_robolectric.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package="androidx.test.robolectric" >
1919

2020
<uses-sdk
21-
android:minSdkVersion="21"
21+
android:minSdkVersion="23"
2222
android:targetSdkVersion="33" />
2323

2424
</manifest>

build_extensions/AndroidManifest_target_stub.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package="${applicationId}" >
1919

2020
<uses-sdk
21-
android:minSdkVersion="21"
21+
android:minSdkVersion="23"
2222
android:targetSdkVersion="34" />
2323

2424
</manifest>

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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
**API Changes**
1414

15+
* Update to minSdkVersion 23
16+
1517
**Breaking API Changes**
1618

1719
**Known Issues**

core/java/androidx/test/core/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package="androidx.test.core" >
1919

2020
<uses-sdk
21-
android:minSdkVersion="21"
21+
android:minSdkVersion="23"
2222
android:targetSdkVersion="28" />
2323

2424
<uses-permission android:name="android.permission.REORDER_TASKS" />

core/javatests/androidx/test/core/app/AndroidManifest_target.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package="androidx.test.core.app" >
1919

2020
<uses-sdk
21-
android:minSdkVersion="21"
21+
android:minSdkVersion="23"
2222
android:targetSdkVersion="34" />
2323

2424
<application >

core/javatests/androidx/test/core/app/AndroidManifest_test.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package="androidx.test.core.app.test" >
1919

2020
<uses-sdk
21-
android:minSdkVersion="21"
21+
android:minSdkVersion="23"
2222
android:targetSdkVersion="34" />
2323

2424
<application/>

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

0 commit comments

Comments
 (0)