[ConfigSample] Update versions

Author: JolandaVerhoef

.github/workflows/TestConfigurationSample.yaml

@@ -79,17 +79,29 @@ jobs:
           path: ~/.android/gradle/avd/dev29_aosp_x86_Pixel_2.*
           key: pixel2api29
 
+      - name: Cache pixel2api26 system image
+        uses: actions/cache@v2
+        with:
+          path: ~/.android/gradle/avd/dev26_aosp_x86_Pixel_2.*
+          key: pixel2api26
+
+      - name: Cache nexus9api29 system image
+        uses: actions/cache@v2
+        with:
+          path: ~/.android/gradle/avd/dev29_aosp_x86_Nexus_9.*
+          key: nexus9api29
+
       - name: Run all tests
         working-directory: ${{ env.SAMPLE_PATH }}
-        run: ./gradlew pixel2api29DebugAndroidTest
-
-#      - name: Run regression tests
-#        working-directory: ${{ env.SAMPLE_PATH }}
-#        run: ./gradlew -i pixel2api26DebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.android.testing.testconfigurationsample.TestDeviceApi26
-#
-#      - name: Run large screen tests
-#        working-directory: ${{ env.SAMPLE_PATH }}
-#        run: ./gradlew -i nexus9api29DebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.android.testing.testconfigurationsample.TestDeviceLargeScreen
+        run: ./gradlew pixel2api29DebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.example.android.testing.testconfigurationsample.TestDeviceLargeScreen
+
+      - name: Run regression tests
+        working-directory: ${{ env.SAMPLE_PATH }}
+        run: ./gradlew -i pixel2api26DebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.android.testing.testconfigurationsample.TestDeviceApi26
+
+      - name: Run large screen tests
+        working-directory: ${{ env.SAMPLE_PATH }}
+        run: ./gradlew -i nexus9api29DebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.android.testing.testconfigurationsample.TestDeviceLargeScreen
 
       - name: Upload test reports
         if: always()

TestConfigurationSample/app/build.gradle

@@ -1,5 +1,3 @@
-import com.android.build.api.dsl.ManagedVirtualDevice
-
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
@@ -50,21 +48,21 @@ android {
 
     testOptions {
         devices {
-            pixel2api29(ManagedVirtualDevice) {
+            pixel2api29(com.android.build.api.dsl.ManagedVirtualDevice) {
                 // Use device profiles you typically see in Android Studio
                 device = "Pixel 2"
                 apiLevel = 29
                 // You can also specify "google" if you require Google Play Services.
                 systemImageSource = "aosp"
                 abi = "x86"
             }
-            pixel2api26(ManagedVirtualDevice) {
+            pixel2api26(com.android.build.api.dsl.ManagedVirtualDevice) {
                 device = "Pixel 2"
                 apiLevel = 26
                 systemImageSource = "aosp"
                 abi = "x86"
             }
-            nexus9api29(ManagedVirtualDevice) {
+            nexus9api29(com.android.build.api.dsl.ManagedVirtualDevice) {
                 device = "Nexus 9"
                 apiLevel = 29
                 systemImageSource = "aosp"

TestConfigurationSample/build.gradle

@@ -16,8 +16,8 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.5.21'
-        compose_version = '1.0.2'
+        kotlin_version = '1.5.31'
+        compose_version = '1.0.4'
         activity_compose_version = '1.3.1'
         material_version = '1.4.0'
         junit_version = '1.1.3'
@@ -29,7 +29,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0-alpha11'
+        classpath 'com.android.tools.build:gradle:7.2.0-alpha02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }