Upgrade to AGP 8.1.0 and kotlin 1.8.20.

Use AGP Upgrade Assistant to upgrade all projects to AGP 8.1.0
and follow recommendations on deprecated attributes, including:
 - rename compileSdkVersion to compileSdk
 - remove buildToolsVersion as its now bundled with AGP

Author: brettchabot

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 {

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"

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.0'
     repositories {
         // Insert local test repo here
         google()

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

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.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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'
 
 }
 

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"

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.0'
     repositories {
         // Insert local test repo here
         google()

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

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.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists