Merge pull request #872 from dturner/fix-ci-build

Attempt to fix CI build for AGP 7.2.2

Author: dturner

.github/ci-gradle.properties

@@ -15,7 +15,7 @@
 #
 
 org.gradle.daemon=false
-org.gradle.parallel=true
+org.gradle.parallel=false
 org.gradle.jvmargs=-Xmx5120m
 org.gradle.workers.max=2
 

.github/workflows/blueprints.yaml

@@ -51,13 +51,15 @@ jobs:
       - name: Compile AndroidTests
         run: ./gradlew compileDebugAndroidTestKotlin
 
-      - name: Run all tests pixel 2 api 30 ATD
-        working-directory: .
-        run: ./gradlew -Pandroid.sdk.channel=3 -Pandroid.experimental.androidTest.numManagedDeviceShards=1 -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" pixel2api30atdDebugAndroidTest
-
-      - name: Run all tests pixel 2 api 30 non-ATD
-        working-directory: .
-        run: ./gradlew -Pandroid.sdk.channel=3 -Pandroid.experimental.androidTest.numManagedDeviceShards=1 -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" pixel2api30DebugAndroidTest
+      - name: Run instrumentation tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 31
+          arch: x86_64
+          disable-animations: true
+          disk-size: 2000M
+          heap-size: 600M
+          script: ./gradlew connectedDebugAndroidTest
 
       - name: Upload build reports
         if: always()

app/build.gradle

@@ -83,35 +83,6 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion "$composeCompilerVersion"
     }
-
-    testOptions {
-        devices {
-            pixel2api30atd(com.android.build.api.dsl.ManagedVirtualDevice) {
-                // Use device profiles you typically see in Android Studio
-                device = "Pixel 2"
-                apiLevel = 30
-                // You can also specify "google" if you require Google Play Services.
-                systemImageSource = "aosp-atd"
-            }
-            pixel2api30(com.android.build.api.dsl.ManagedVirtualDevice) {
-                // Use device profiles you typically see in Android Studio
-                device = "Pixel 2"
-                apiLevel = 30
-                // You can also specify "google" if you require Google Play Services.
-                systemImageSource = "aosp"
-            }
-            pixel2api27(com.android.build.api.dsl.ManagedVirtualDevice) {
-                device = "Pixel 2"
-                apiLevel = 27
-                systemImageSource = "aosp"
-            }
-            nexus9api29(com.android.build.api.dsl.ManagedVirtualDevice) {
-                device = "Nexus 9"
-                apiLevel = 29
-                systemImageSource = "aosp"
-            }
-        }
-    }
 }
 
 /*

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0-beta05'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigationVersion"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hiltVersion"