Update to AGP 9 (#9264)

* Update to AGP 9

First milestone with compat workarounds in place.

Author: yschimke

android-test-app/build.gradle.kts

@@ -2,7 +2,6 @@
 
 plugins {
   id("com.android.application")
-  id("kotlin-android")
 }
 
 android {
@@ -23,16 +22,13 @@ android {
     sourceCompatibility(JavaVersion.VERSION_11)
   }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.toString()
-  }
 
   buildTypes {
     release {
       isShrinkResources = true
       isMinifyEnabled = true
       signingConfig = signingConfigs.getByName("debug")
-      setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"))
+      setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"))
       testProguardFiles("test-proguard-rules.pro")
     }
   }

android-test/build.gradle.kts

@@ -2,7 +2,6 @@
 
 plugins {
   id("com.android.library")
-  kotlin("android")
   id("de.mannodermaus.android-junit5")
 }
 
@@ -44,9 +43,6 @@ android {
     unitTests.isIncludeAndroidResources = true
   }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.toString()
-  }
 
   // issue merging due to conflict with httpclient and something else
   packagingOptions.resources.excludes += setOf(

build.gradle.kts

@@ -111,15 +111,6 @@ subprojects {
     }
   }
 
-  // Skip samples parent
-  if (project.buildFile.exists() && project.name != "okhttp") {
-    apply(plugin = "com.android.lint")
-
-    dependencies {
-      "lintChecks"(rootProject.libs.androidx.lint.gradle)
-    }
-  }
-
   tasks.withType<JavaCompile> {
     options.encoding = Charsets.UTF_8.toString()
   }
@@ -309,7 +300,7 @@ subprojects {
 
 /** Configure publishing and signing for published Java and JavaPlatform subprojects. */
 subprojects {
-  plugins.withId("com.vanniktech.maven.publish.base") {
+  if (plugins.hasPlugin("com.vanniktech.maven.publish.base")) {
     if (dokkaBuild) {
       apply(plugin = "org.jetbrains.dokka")
 
@@ -329,7 +320,7 @@ subprojects {
             url.set(URI.create("https://square.github.io/okio/3.x/okio/"))
             packageListUrl.set(URI.create("https://square.github.io/okio/3.x/okio/okio/package-list"))
           }
-          
+
           externalDocumentationLinks.named("jdk") {
              url.set(URI.create("https://docs.oracle.com/en/java/javase/21/docs/api/"))
              packageListUrl.set(URI.create("https://docs.oracle.com/en/java/javase/21/docs/api/element-list"))
@@ -342,6 +333,15 @@ subprojects {
       }
     }
 
+    // Only enable lint checks for published modules
+    if (project.name != "okhttp") {
+      apply(plugin = "com.android.lint")
+
+      dependencies {
+        "lintChecks"(rootProject.libs.androidx.lint.gradle)
+      }
+    }
+
     configure<MavenPublishBaseExtension> {
       publishToMavenCentral(automaticRelease = true)
       signAllPublications()

gradle.properties

@@ -13,3 +13,6 @@ okhttpDokka=false
 
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 
+# AGP 9.0 Workarounds
+android.builtInKotlin=false
+android.newDsl=false

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.13.1"
+agp = "9.0.0"
 biz-aQute-bnd = "7.1.0"
 checkStyle = "12.3.1"
 com-squareup-moshi = "1.15.2"

regression-test/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
   id("com.android.library")
-  kotlin("android")
 }
 
 android {
@@ -24,9 +23,6 @@ android {
     sourceCompatibility(JavaVersion.VERSION_11)
   }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.toString()
-  }
 
   // issue merging due to conflict with httpclient and something else
   packagingOptions.resources.excludes += setOf(