Revert "Add emulator tests run on Github Actions"

This reverts commit 9bfbf25.
bumptech · Aug 24, 2023 · 4db0b30 · 4db0b30
1 parent 7583df0
commit 4db0b30
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 78 deletions.
diff --git a/.github/workflows/instrumentation.yml b/.github/workflows/instrumentation.yml
diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
@@ -27,8 +27,6 @@ dependencies {
     // Not totally clear why this is required, but it seems to be missing when tests are run on
     // 4.1.2 and 4.2.0 emulators.
     androidTestImplementation libs.findbugs.jsr305
-
-    coreLibraryDesugaring libs.android.tools.desugar
 }
 
 android {
@@ -47,7 +45,6 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
-        coreLibraryDesugaringEnabled true
     }
 
     buildTypes {

diff --git a/renovate.json b/renovate.json
@@ -18,14 +18,8 @@
       "allowedVersions": "<1.6.0"
     },
     {
-      "matchPackageNames": [
-        "androidx.appcompat:appcompat"
-      ],
+      "matchPackageNames": ["androidx.appcompat:appcompat"],
       "allowedVersions": "<1.4.0"
-    },
-    {
-      "matchPackageNames": ["com.android.tools:desugar_jdk_libs"],
-      "matchPackageNames": ["!/1\.2\.3/"]
     }
   ]
 }
diff --git a/settings.gradle b/settings.gradle
@@ -72,8 +72,6 @@ dependencyResolutionManagement {
             library('autoservice', 'com.google.auto.service:auto-service:1.0-rc3')
             library('autoservice.annotations', 'com.google.auto.service:auto-service-annotations:1.0.1')
             library('android-gradle', 'com.android.tools.build:gradle:7.3.0')
-            // 1.2.3 seems broken: https://issuetracker.google.com/issues/290507059
-            library('android-tools-desugar', 'com.android.tools:desugar_jdk_libs:1.2.2')
             library('androidx-cardview', 'androidx.cardview:cardview:1.0.0')
             library('androidx-core', 'androidx.core:core:1.6.0')
             // 1.6.0 seems to introduce: