From 62d42533b824d49b26911ea882e17a58d306375f Mon Sep 17 00:00:00 2001
From: Jolanda Verhoef <JolandaVerhoef@users.noreply.github.com>
Date: Thu, 16 Sep 2021 08:44:32 +0100
Subject: [PATCH] [ConfigSample] Upgrade Gradle plugin and remove opt-in
 parameter

---
 .github/workflows/TestConfigurationSample.yaml           | 6 +++---
 TestConfigurationSample/app/build.gradle                 | 9 ++++-----
 TestConfigurationSample/build.gradle                     | 2 +-
 .../gradle/wrapper/gradle-wrapper.properties             | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/TestConfigurationSample.yaml b/.github/workflows/TestConfigurationSample.yaml
index ac9a360f9..7033f6779 100644
--- a/.github/workflows/TestConfigurationSample.yaml
+++ b/.github/workflows/TestConfigurationSample.yaml
@@ -83,15 +83,15 @@ jobs:
 
       - name: Run all tests
         working-directory: ${{ env.SAMPLE_PATH }}
-        run: ./gradlew pixel2api29DebugAndroidTest -i -Pandroid.experimental.androidTest.useUnifiedTestPlatform=true -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.example.android.testing.testconfigurationsample.TestDeviceLargeScreen
+        run: ./gradlew -i pixel2api29DebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.example.android.testing.testconfigurationsample.TestDeviceLargeScreen
 
       - name: Run regression tests
         working-directory: ${{ env.SAMPLE_PATH }}
-        run: ./gradlew -i pixel2api23DebugAndroidTest -Pandroid.experimental.androidTest.useUnifiedTestPlatform=true -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.android.testing.testconfigurationsample.TestDeviceApi23
+        run: ./gradlew -i pixel2api23DebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.android.testing.testconfigurationsample.TestDeviceApi23
 
       - name: Run large screen tests
         working-directory: ${{ env.SAMPLE_PATH }}
-        run: ./gradlew -i nexus9api29DebugAndroidTest -Pandroid.experimental.androidTest.useUnifiedTestPlatform=true -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.android.testing.testconfigurationsample.TestDeviceLargeScreen
+        run: ./gradlew -i nexus9api29DebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.android.testing.testconfigurationsample.TestDeviceLargeScreen
 
       - name: Upload test reports
         if: always()
diff --git a/TestConfigurationSample/app/build.gradle b/TestConfigurationSample/app/build.gradle
index 0340d4f09..25ed0e12c 100644
--- a/TestConfigurationSample/app/build.gradle
+++ b/TestConfigurationSample/app/build.gradle
@@ -41,14 +41,13 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion compose_version
     }
-
     packagingOptions {
-        // Multiple dependency bring these files in. Exclude them to enable
-        // our test APK to build (has no effect on our AARs)
-        excludes += "/META-INF/AL2.0"
-        excludes += "/META-INF/LGPL2.1"
+        resources {
+            excludes += ['/META-INF/AL2.0', '/META-INF/LGPL2.1']
+        }
     }
 
+
     testOptions {
         devices {
             pixel2api29(ManagedVirtualDevice) {
diff --git a/TestConfigurationSample/build.gradle b/TestConfigurationSample/build.gradle
index dbffe1781..a4169fe46 100644
--- a/TestConfigurationSample/build.gradle
+++ b/TestConfigurationSample/build.gradle
@@ -29,7 +29,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.1.0-alpha11'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/TestConfigurationSample/gradle/wrapper/gradle-wrapper.properties b/TestConfigurationSample/gradle/wrapper/gradle-wrapper.properties
index 80d4a5a6b..d589a04fc 100644
--- a/TestConfigurationSample/gradle/wrapper/gradle-wrapper.properties
+++ b/TestConfigurationSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Sep 14 13:31:05 WEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME