Increment compile and target SDK for gradle tests to 36

PiperOrigin-RevId: 789777754

Author: brettchabot

MODULE.bazel

@@ -52,7 +52,6 @@ maven.install(
         "androidx.concurrent:concurrent-futures-ktx:1.2.0",
         "androidx.core:core:1.6.0",
         "androidx.lifecycle:lifecycle-common:2.3.1",
-        "androidx.multidex:multidex:2.0.0",
         "androidx.tracing:tracing:1.1.0",
         "androidx.window:window-java:1.1.0",
         "androidx.window:window-core:1.1.0",

build_extensions/android_library_test.bzl

@@ -10,7 +10,6 @@ def axt_android_library_test(
         data = [],
         device_list = None,
         manifest = None,
-        multidex = None,
         deps = [],
         **kwargs):
     """Placeholder for future instrumentation test support.

build_extensions/mainDexClasses.rules

@@ -18,11 +18,9 @@ licenses(["notice"])
 android_binary(
     name = "ActivityScenarioTest_target",
     manifest = "AndroidManifest_target.xml",
-    multidex = "legacy",
     deps = [
         "//core/javatests/androidx/test/core/app/testing",
         "//core/javatests/androidx/test/core/app/testing:manifest",
-        "@maven//:androidx_multidex_multidex",
     ],
 )
 

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

@@ -49,11 +49,6 @@ final class InputManagerEventInjectionStrategy implements EventInjectionStrategy
       new ReflectiveMethod<>(
           InputManager.class, "injectInputEvent", InputEvent.class, Integer.TYPE);
 
-  // only used on APIs < 23
-  private final ReflectiveMethod<InputManager> getInstanceMethod =
-      new ReflectiveMethod<>(InputManager.class, "getInstance");
-  ;
-
   // hardcoded copies of private InputManager fields.
   // historically these were obtained via reflection, but that seems
   // wasteful as these values have not changed since they were introduced
@@ -72,7 +67,9 @@ final class InputManagerEventInjectionStrategy implements EventInjectionStrategy
   public boolean injectKeyEvent(KeyEvent keyEvent) throws InjectEventSecurityException {
     try {
       return injectInputEventMethod.invoke(
-          getInputManager(), keyEvent, INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);
+          getContext().getSystemService(InputManager.class),
+          keyEvent,
+          INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);
     } catch (ReflectionException e) {
       // annoyingly, ReflectiveMethod always rewraps the underlying exception
       Throwable cause = e.getCause().getCause();
@@ -104,7 +101,8 @@ private boolean innerInjectMotionEvent(MotionEvent motionEvent, boolean shouldRe
       }
       int eventMode =
           sync ? INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH : INJECT_INPUT_EVENT_MODE_ASYNC;
-      return injectInputEventMethod.invoke(getInputManager(), motionEvent, eventMode);
+      return injectInputEventMethod.invoke(
+          getContext().getSystemService(InputManager.class), motionEvent, eventMode);
     } catch (ReflectionException e) {
       Throwable cause = e.getCause().getCause();
       if (cause instanceof SecurityException) {
@@ -140,14 +138,6 @@ private static boolean isFromTouchpadInGlassDevice(MotionEvent motionEvent) {
         && ((motionEvent.getSource() & InputDevice.SOURCE_TOUCHPAD) != 0);
   }
 
-  private InputManager getInputManager() {
-    if (Build.VERSION.SDK_INT < 23) {
-      return getInstanceMethod.invokeStatic();
-    } else {
-      return getContext().getSystemService(InputManager.class);
-    }
-  }
-
   private static Context getContext() {
     try {
       return InstrumentationRegistry.getInstrumentation().getTargetContext();

espresso/core/java/androidx/test/espresso/base/InputManagerEventInjectionStrategy.java

@@ -27,7 +27,6 @@
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.os.Build;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.View;
@@ -1709,13 +1708,7 @@ public static Matcher<View> hasTextColor(final int colorResId) {
       protected boolean matchesSafely(TextView textView, Description mismatchDescription) {
         context = textView.getContext();
         int textViewColor = textView.getCurrentTextColor();
-        int expectedColor;
-
-        if (Build.VERSION.SDK_INT <= 22) {
-          expectedColor = context.getResources().getColor(colorResId);
-        } else {
-          expectedColor = context.getColor(colorResId);
-        }
+        int expectedColor = context.getColor(colorResId);
 
         mismatchDescription
             .appendText("textView.getCurrentTextColor() was ")
@@ -1729,10 +1722,7 @@ protected void describeMoreTo(Description description) {
         if (context == null) {
           description.appendText("ID ").appendValue(colorResId);
         } else {
-          int color =
-              (Build.VERSION.SDK_INT <= 22)
-                  ? context.getResources().getColor(colorResId)
-                  : context.getColor(colorResId);
+          int color = context.getColor(colorResId);
           description.appendText("value " + getColorHex(color));
         }
       }

espresso/core/java/androidx/test/espresso/matcher/ViewMatchers.java

@@ -22,14 +22,12 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.junit.Assert.assertTrue;
 
 import android.view.InputDevice;
 import android.view.MotionEvent;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.SdkSuppress;
 import androidx.test.ui.app.LargeViewActivity;
 import androidx.test.ui.app.R;
 import org.junit.Rule;
@@ -60,17 +58,4 @@ public void rightClickTest() {
     onView(withText(R.string.context_item_2_text)).check(matches(isDisplayed()));
     onView(withText(R.string.context_item_3_text)).check(matches(isDisplayed()));
   }
-
-  @Test
-  @SdkSuppress(maxSdkVersion = 13)
-  public void rightClickTest_unsupportedApiLevel() {
-    boolean exceptionThrown = false;
-    try {
-      onView(withId(R.id.large_view)).perform(click(0, 0));
-    } catch (UnsupportedOperationException e) {
-      exceptionThrown = true;
-    } finally {
-      assertTrue(exceptionThrown);
-    }
-  }
 }

espresso/core/javatests/androidx/test/espresso/action/ClickActionIntegrationTest.java

@@ -57,7 +57,6 @@
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.Rect;
-import android.os.Build;
 import android.text.SpannedString;
 import android.text.method.TransformationMethod;
 import android.view.View;
@@ -576,13 +575,7 @@ public void hasTextColorTest() {
     TextView textView = new TextView(context);
     textView.setText("text");
 
-    int color;
-    if (Build.VERSION.SDK_INT <= 22) {
-      color = context.getResources().getColor(R.color.green);
-    } else {
-      color = context.getColor(R.color.green);
-    }
-
+    int color = context.getColor(R.color.green);
     textView.setTextColor(color);
 
     assertTrue(hasTextColor(R.color.green).matches(textView));

espresso/core/javatests/androidx/test/espresso/matcher/ViewMatchers1Test.java

@@ -11,7 +11,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
 
 ext {
     minSdk = 23
-    targetSdk = 34
-    compileSdk = 34
+    targetSdk = 36
+    compileSdk = 36
     emulatorApi = 33
 }

gradle-tests/build.gradle

@@ -16,7 +16,6 @@ android {
     defaultConfig {
         minSdk rootProject.ext.minSdk
         targetSdk rootProject.ext.targetSdk
-        multiDexEnabled = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -44,7 +43,6 @@ android {
 }
 
 dependencies {
-    androidTestImplementation "androidx.multidex:multidex:2.0.0"
     androidTestImplementation libs.ext.junit
     androidTestImplementation libs.espresso.accessibility
     androidTestImplementation libs.espresso.core