Merge pull request #485 from android/updateagp

Update to AGP 8.1.1, kotlin 1.8.20, and robolectric 4.10.3
android · Sep 5, 2023 · e60b0b0 · e60b0b0
2 parents 2fc9a4c + a8d4940
commit e60b0b0
Show file tree

Hide file tree

Showing 119 changed files with 253 additions and 225 deletions.
diff --git a/integration/ServiceTestRuleSample/app/build.gradle b/integration/ServiceTestRuleSample/app/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion rootProject.buildToolsVersion
+    compileSdk 33
     defaultConfig {
         applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
         minSdkVersion 14
@@ -12,9 +11,6 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-    lintOptions {
-        abortOnError false
-    }
     productFlavors {
     }
     testOptions {
@@ -31,6 +27,10 @@ android {
             }
         }
     }
+    namespace 'com.example.android.testing.ServiceTestRuleSample'
+    lint {
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/integration/ServiceTestRuleSample/app/src/main/AndroidManifest.xml b/integration/ServiceTestRuleSample/app/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
   -->
 
 
-<manifest package="com.example.android.testing.ServiceTestRuleSample"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@mipmap/ic_launcher"

diff --git a/integration/ServiceTestRuleSample/build.gradle b/integration/ServiceTestRuleSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "7.3.1"
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
@@ -24,7 +24,6 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = "32.0.0"
     coreVersion = "1.6.0-alpha01"
     extJUnitVersion = "1.2.0-alpha01"
     runnerVersion = "1.6.0-alpha03"

diff --git a/integration/ServiceTestRuleSample/gradle.properties b/integration/ServiceTestRuleSample/gradle.properties
@@ -16,4 +16,7 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
diff --git a/integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties b/integration/ServiceTestRuleSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/runner/AndroidJunitRunnerSample/app/build.gradle b/runner/AndroidJunitRunnerSample/app/build.gradle
@@ -2,8 +2,7 @@ apply plugin: 'com.android.application'
 
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion rootProject.buildToolsVersion
+    compileSdk 33
     defaultConfig {
         applicationId "com.example.android.testing.androidjunitrunnersample"
         minSdkVersion 14
@@ -39,6 +38,7 @@ android {
 
     useLibrary 'android.test.base'
     useLibrary 'android.test.mock'
+    namespace 'com.example.android.testing.androidjunitrunnersample'
 
 }
 

diff --git a/runner/AndroidJunitRunnerSample/app/src/main/AndroidManifest.xml b/runner/AndroidJunitRunnerSample/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.testing.androidjunitrunnersample" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@drawable/ic_launcher"

diff --git a/runner/AndroidJunitRunnerSample/build.gradle b/runner/AndroidJunitRunnerSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "7.3.1"
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()

diff --git a/runner/AndroidJunitRunnerSample/gradle.properties b/runner/AndroidJunitRunnerSample/gradle.properties
@@ -16,5 +16,8 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 android.useAndroidX=true
diff --git a/runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties b/runner/AndroidJunitRunnerSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/runner/AndroidTestOrchestratorSample/app/build.gradle b/runner/AndroidTestOrchestratorSample/app/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion rootProject.buildToolsVersion
+    compileSdk 33
     defaultConfig {
         applicationId "com.example.android.testing.androidtestorchestratorsample"
         minSdkVersion 14
@@ -37,6 +36,7 @@ android {
             }
         }
     }
+    namespace 'com.example.android.testing.androidtestorchestratorsample'
 }
 
 dependencies {

diff --git a/runner/AndroidTestOrchestratorSample/app/src/main/AndroidManifest.xml b/runner/AndroidTestOrchestratorSample/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.testing.androidtestorchestratorsample" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@drawable/ic_launcher"

diff --git a/runner/AndroidTestOrchestratorSample/build.gradle b/runner/AndroidTestOrchestratorSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "7.3.1"
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
@@ -24,7 +24,6 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     guavaVersion = "31.1-android"
     coreVersion = "1.6.0-alpha01"

diff --git a/runner/AndroidTestOrchestratorSample/gradle.properties b/runner/AndroidTestOrchestratorSample/gradle.properties
@@ -16,5 +16,8 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true 
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 android.useAndroidX=true
diff --git a/runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties b/runner/AndroidTestOrchestratorSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/app/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion rootProject.buildToolsVersion
+    compileSdk 33
     defaultConfig {
         applicationId "com.example.android.testing.androidtestorchestratorsample"
         minSdkVersion 14
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 
@@ -22,6 +21,7 @@ android {
     testOptions {
         execution 'ANDROIDX_TEST_ORCHESTRATOR'
     }
+    namespace 'com.example.android.testing.androidtestorchestratorsample'
 }
 
 dependencies {

diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/app/src/main/AndroidManifest.xml b/runner/AndroidTestOrchestratorWithTestCoverageSample/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
   limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.testing.androidtestorchestratorsample" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@drawable/ic_launcher"

diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle b/runner/AndroidTestOrchestratorWithTestCoverageSample/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.agpVersion = "7.3.0-beta01"
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
@@ -24,15 +24,14 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = "31.0.0"
     androidxAnnotationVersion = "1.2.0"
     guavaVersion = "30.1.1-android"
-    coreVersion = "1.4.1-alpha03"
-    extJUnitVersion = "1.1.4-alpha03"
-    runnerVersion = "1.4.1-alpha03"
-    rulesVersion = "1.4.1-alpha03"
-    testServicesVersion = "1.4.1-alpha03"
-    orchestratorVersion = "1.4.1-alpha03"
-    espressoVersion = "3.5.0-alpha03"
+    coreVersion = "1.6.0-alpha01"
+    extJUnitVersion = "1.2.0-alpha01"
+    runnerVersion = "1.6.0-alpha03"
+    rulesVersion = "1.6.0-alpha01"
+    testServicesVersion = "1.5.0-alpha01"
+    orchestratorVersion = "1.5.0-alpha01"
+    espressoVersion = "3.6.0-alpha01"
     truthVersion = "1.1.3"
 }
diff --git a/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle.properties b/runner/AndroidTestOrchestratorWithTestCoverageSample/gradle.properties
@@ -17,4 +17,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true 
 android.useAndroidX=true
-android.enableAdditionalTestOutput=false
+android.enableAdditionalTestOutput=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/...er/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties b/...er/AndroidTestOrchestratorWithTestCoverageSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jun 01 11:09:45 PDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/test_all.sh b/test_all.sh
@@ -9,7 +9,7 @@ for p in $(cat projects.conf); do
    echo "====================================================================="
 
    pushd $p > /dev/null  # Silent pushd
-   ./gradlew $@ testDebug nexusOneApi30DebugAndroidTest | sed "s@^@$p @"  # Prefix every line with directory
+   ./gradlew $@ testDebug nexusOneApi30DebugAndroidTest --info | sed "s@^@$p @"  # Prefix every line with directory
    code=${PIPESTATUS[0]}
    if [ "$code" -ne "0" ]; then
        exit $code

diff --git a/ui/espresso/AccessibilitySample/app/build.gradle b/ui/espresso/AccessibilitySample/app/build.gradle
@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion rootProject.buildToolsVersion
+    compileSdk 33
     defaultConfig {
         applicationId "com.example.android.testing.espresso.AccessibilitySample"
         minSdkVersion 14
@@ -14,9 +13,6 @@ android {
 
         multiDexEnabled true
     }
-    lintOptions {
-        abortOnError false
-    }
     productFlavors {
     }
     testOptions {
@@ -40,6 +36,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.example.android.testing.espresso.AccessibilitySample'
+    testNamespace 'com.example.android.testing.espresso.AccessibilitySample.test'
+    lint {
+        abortOnError false
+    }
 }
 
 

diff --git a/ui/espresso/AccessibilitySample/app/src/androidTest/AndroidManifest.xml b/ui/espresso/AccessibilitySample/app/src/androidTest/AndroidManifest.xml
@@ -16,8 +16,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:tools="http://schemas.android.com/tools"
-      package="com.example.android.testing.espresso.AccessibilitySample.test"
-      android:versionCode="1"
+    android:versionCode="1"
       android:versionName="1.0">
 
     <instrumentation android:targetPackage="com.example.android.testing.espresso.AccessibilitySample"

diff --git a/ui/espresso/AccessibilitySample/app/src/main/AndroidManifest.xml b/ui/espresso/AccessibilitySample/app/src/main/AndroidManifest.xml
@@ -15,8 +15,7 @@
 ~ limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.testing.espresso.AccessibilitySample" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@drawable/ic_launcher"

diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext.kotlinVersion = "1.7.10"
-    ext.agpVersion = "7.3.1"
+    ext.agpVersion = '8.1.1'
     repositories {
         // Insert local test repo here
         google()
@@ -26,7 +26,6 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = "32.0.0"
     androidxAnnotationVersion = "1.5.0"
     robolectricVersion = "4.9"
     extTruthVersion = "1.6.0-alpha01"

diff --git a/ui/espresso/AccessibilitySample/gradle.properties b/ui/espresso/AccessibilitySample/gradle.properties
@@ -16,5 +16,8 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true 
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 
diff --git a/ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties b/ui/espresso/AccessibilitySample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists