From 4db0b300c43f127313211774a1784ac873aa45cf Mon Sep 17 00:00:00 2001
From: Sam Judd <sam.a.judd@gmail.com>
Date: Wed, 23 Aug 2023 18:30:42 -0700
Subject: [PATCH] Revert "Add emulator tests run on Github Actions"

This reverts commit 9bfbf25c53b00f70ddde09ccd634902b101f9e11.
---
 .github/workflows/instrumentation.yml | 66 ---------------------------
 instrumentation/build.gradle          |  3 --
 renovate.json                         |  8 +---
 settings.gradle                       |  2 -
 4 files changed, 1 insertion(+), 78 deletions(-)
 delete mode 100644 .github/workflows/instrumentation.yml

diff --git a/.github/workflows/instrumentation.yml b/.github/workflows/instrumentation.yml
deleted file mode 100644
index 41f4d5c252..0000000000
--- a/.github/workflows/instrumentation.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-name: Instrumentation Tests
-
-on:
-    push:
-    pull_request:
-
-jobs:
-  test:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        include:
-          - api-level: 22
-            arch: x86
-            target: default
-          - api-level: 23
-            arch: x86
-            target: default
-          - api-level: 31
-            arch: x86_64
-            target: google_apis
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'zulu'
-      - name: Gradle cache
-        uses: gradle/gradle-build-action@v2
-
-      - name: AVD cache
-        uses: actions/cache@v3
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: avd-${{ matrix.api-level }}-${{ matrix.arch }}-${{ matrix.target }}
-
-      - name: create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          arch: ${{ matrix.arch }}
-          target: ${{ matrix.target }}
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: false
-          ram-size: 4096M
-          emulator-boot-timeout: 12000
-          script: echo "Generated AVD snapshot for caching."
-
-      - name: run tests
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          arch: ${{ matrix.arch }}
-          target: ${{ matrix.target }}
-          force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          ram-size: 4096M
-          emulator-boot-timeout: 12000
-          script: ./gradlew :instrumentation:connectedCheck :integration:compose:connectedCheck
\ No newline at end of file
diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
index a46e98b8a6..b1c8699a1c 100644
--- 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
index 1649a8d4f1..3e936818e8 100644
--- 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
index d63e42485a..2d425d86ef 100644
--- 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: