feat: adopt AGP v9

gradle.properties

@@ -4,12 +4,6 @@ org.gradle.caching=true
 
 android.useAndroidX=true
 
-# Those 2 properties are needed to make our project compatible with
-# AGP 9.0.0 for the time being. Ideally we should not opt-out of
-# builtInKotlin and newDsl once AGP 9.0.0 hits stable.
-# More on this: https://developer.android.com/build/releases/agp-preview#android-gradle-plugin-built-in-kotlin
-android.builtInKotlin=false
-android.newDsl=false
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

packages/gradle-plugin/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.12.0"
+agp = "9.2.1"
 gson = "2.8.9"
 guava = "31.0.1-jre"
 javapoet = "1.13.0"

packages/gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt

@@ -116,9 +116,9 @@ class ReactPlugin : Plugin<Project> {
     }
 
     // Library Only Configuration
-    configureBuildConfigFieldsForLibraries(project)
-    configureNamespaceForLibraries(project)
     project.pluginManager.withPlugin("com.android.library") {
+      configureBuildConfigFieldsForLibraries(project)
+      configureNamespaceForLibraries(project)
       configureCodegen(project, extension, rootExtension, isLibrary = true)
     }
   }
@@ -222,12 +222,12 @@ class ReactPlugin : Plugin<Project> {
     if (isLibrary) {
       project.extensions.getByType(LibraryAndroidComponentsExtension::class.java).finalizeDsl { ext
         ->
-        ext.sourceSets.getByName("main").java.srcDir(generatedSrcDir.get().dir("java").asFile)
+        ext.sourceSets.getByName("main").java.directories.add(generatedSrcDir.get().dir("java").asFile.path)
       }
     } else {
       project.extensions.getByType(ApplicationAndroidComponentsExtension::class.java).finalizeDsl {
           ext ->
-        ext.sourceSets.getByName("main").java.srcDir(generatedSrcDir.get().dir("java").asFile)
+        ext.sourceSets.getByName("main").java.directories.add(generatedSrcDir.get().dir("java").asFile.path)
       }
     }
 

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt

@@ -9,7 +9,6 @@ package com.facebook.react.utils
 
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
-import com.android.build.gradle.LibraryExtension
 import com.facebook.react.ReactExtension
 import com.facebook.react.utils.ProjectUtils.isEdgeToEdgeEnabled
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
@@ -18,7 +17,6 @@ import java.net.Inet4Address
 import java.net.NetworkInterface
 import javax.xml.parsers.DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory
-import kotlin.plus
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.plugins.AppliedPlugin
@@ -77,14 +75,12 @@ internal object AgpConfiguratorUtils {
     project.pluginManager.withPlugin("com.android.library", action)
   }
 
-  fun configureBuildConfigFieldsForLibraries(appProject: Project) {
-    appProject.rootProject.allprojects { subproject ->
-      subproject.pluginManager.withPlugin("com.android.library") {
-        subproject.extensions
-            .getByType(LibraryAndroidComponentsExtension::class.java)
-            .finalizeDsl { ext -> ext.buildFeatures.buildConfig = true }
+  fun configureBuildConfigFieldsForLibraries(project: Project) {
+    project.extensions
+      .getByType(LibraryAndroidComponentsExtension::class.java)
+      .finalizeDsl { ext ->
+        ext.buildFeatures.buildConfig = true
       }
-    }
   }
 
   fun configureDevServerLocation(project: Project) {
@@ -111,27 +107,22 @@ internal object AgpConfiguratorUtils {
     project.pluginManager.withPlugin("com.android.library", action)
   }
 
-  fun configureNamespaceForLibraries(appProject: Project) {
-    appProject.rootProject.allprojects { subproject ->
-      subproject.pluginManager.withPlugin("com.android.library") {
-        subproject.extensions
-            .getByType(LibraryAndroidComponentsExtension::class.java)
-            .finalizeDsl { ext ->
-              if (ext.namespace == null) {
-                val android = subproject.extensions.getByType(LibraryExtension::class.java)
-                val manifestFile = android.sourceSets.getByName("main").manifest.srcFile
-
-                manifestFile
-                    .takeIf { it.exists() }
-                    ?.let { file ->
-                      getPackageNameFromManifest(file)?.let { packageName ->
-                        ext.namespace = packageName
-                      }
-                    }
+  fun configureNamespaceForLibraries(project: Project) {
+    project.extensions
+      .getByType(LibraryAndroidComponentsExtension::class.java)
+      .finalizeDsl { ext ->
+        if (ext.namespace == null) {
+          val manifestFile =
+            project.layout.projectDirectory.file("src/main/AndroidManifest.xml").asFile
+          manifestFile
+            .takeIf { it.exists() }
+            ?.let { file ->
+              getPackageNameFromManifest(file)?.let { packageName ->
+                ext.namespace = packageName
               }
             }
+        }
       }
-    }
   }
 }
 

packages/react-native-popup-menu-android/android/build.gradle.kts

@@ -8,7 +8,6 @@
 plugins {
   id("com.facebook.react")
   id("com.android.library")
-  id("org.jetbrains.kotlin.android")
 }
 
 android {

packages/react-native/ReactAndroid/build.gradle.kts

@@ -18,7 +18,6 @@ plugins {
   id("com.facebook.react")
   alias(libs.plugins.android.library)
   alias(libs.plugins.download)
-  alias(libs.plugins.kotlin.android)
   alias(libs.plugins.ktfmt)
 }
 
@@ -611,19 +610,19 @@ android {
       ":packages:react-native:ReactAndroid:hermes-engine:preBuild"
   )
 
-  sourceSets.getByName("main") {
-    res.setSrcDirs(
-        listOf(
-            "src/main/res/devsupport",
-            "src/main/res/shell",
-            "src/main/res/views/alert",
-            "src/main/res/views/modal",
-            "src/main/res/views/uimanager",
-            "src/main/res/views/view",
-        )
-    )
-    java.exclude("com/facebook/react/processing")
-    java.exclude("com/facebook/react/module/processing")
+  sourceSets {
+    named("main") {
+      res.directories.addAll(
+          listOf(
+              "src/main/res/devsupport",
+              "src/main/res/shell",
+              "src/main/res/views/alert",
+              "src/main/res/views/modal",
+              "src/main/res/views/uimanager",
+              "src/main/res/views/view",
+          )
+      )
+    }
   }
 
   lint {
@@ -676,6 +675,11 @@ android {
   }
 }
 
+tasks.withType<JavaCompile>().configureEach {
+  exclude("com/facebook/react/processing/**")
+  exclude("com/facebook/react/module/processing/**")
+}
+
 tasks.withType<KotlinCompile>().configureEach {
   exclude("com/facebook/annotationprocessors/**")
   exclude("com/facebook/react/processing/**")
@@ -690,6 +694,7 @@ dependencies {
   api(libs.androidx.appcompat)
   api(libs.androidx.appcompat.resources)
   api(libs.androidx.autofill)
+  api(libs.androidx.collection)
   api(libs.androidx.swiperefreshlayout)
   api(libs.androidx.tracing)
   api(libs.androidx.window)

packages/react-native/ReactAndroid/hermes-engine/build.gradle.kts

@@ -408,9 +408,16 @@ android {
     }
   }
 
-  sourceSets.getByName("main") {
-    manifest.srcFile("$hermesDir/android/hermes/src/main/AndroidManifest.xml")
-    java.srcDirs("$hermesDir/lib/Platform/Intl/java", "$hermesDir/lib/Platform/Unicode/java")
+  sourceSets {
+    named("main") {
+      manifest.srcFile("$hermesDir/android/hermes/src/main/AndroidManifest.xml")
+      java.directories.addAll(
+          listOf(
+              "$hermesDir/lib/Platform/Intl/java",
+              "$hermesDir/lib/Platform/Unicode/java",
+          )
+      )
+    }
   }
 
   buildFeatures {

packages/react-native/gradle/libs.versions.toml

@@ -6,10 +6,11 @@ compileSdk = "36"
 buildTools = "36.0.0"
 ndkVersion = "27.1.12297006"
 # Dependencies versions
-agp = "8.12.0"
+agp = "9.2.1"
 androidx-annotation = "1.6.0"
 androidx-appcompat = "1.7.0"
 androidx-autofill = "1.3.0"
+androidx-collection = "1.4.0"
 androidx-benchmark-macro-junit4 = "1.3.3"
 androidx-profileinstaller = "1.4.1"
 androidx-swiperefreshlayout = "1.1.0"
@@ -56,6 +57,7 @@ androidx-annotation = { module = "androidx.annotation:annotation", version.ref =
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
 androidx-appcompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "androidx-appcompat" }
 androidx-autofill = { module = "androidx.autofill:autofill", version.ref = "androidx-autofill" }
+androidx-collection = { module = "androidx.collection:collection", version.ref = "androidx-collection" }
 androidx-benchmark-macro-junit4 = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidx-benchmark-macro-junit4" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-junit" }

packages/rn-tester/android/app/benchmark/build.gradle.kts

@@ -7,7 +7,6 @@
 
 plugins {
   alias(libs.plugins.android.test)
-  alias(libs.plugins.kotlin.android)
 }
 
 android {

packages/rn-tester/android/app/build.gradle.kts

@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   id("com.facebook.react")
   alias(libs.plugins.android.application)
-  alias(libs.plugins.kotlin.android)
 }
 
 val reactNativeDirPath = "$rootDir/packages/react-native"
@@ -135,15 +134,18 @@ android {
   }
   sourceSets.named("main") {
     // SampleTurboModule.
-    java.srcDirs(
-        "$reactNativeDirPath/ReactCommon/react/nativemodule/samples/platform/android",
-    )
-    res.setSrcDirs(
-        listOf(
-            "src/main/res",
-            "src/main/public_res",
-        )
+    kotlin.directories.add(
+        "$reactNativeDirPath/ReactCommon/react/nativemodule/samples/platform/android"
     )
+    res.directories.apply {
+      clear() // Mimics setSrcDirs by wiping out the defaults
+      addAll(
+          listOf(
+              "src/main/res",
+              "src/main/public_res"
+          )
+      )
+    }
   }
 }