Bump Gradle to 9.4 (AGP to 9.1, Kotlin to 2.3)

leotm · leotm · commit a79ccba6ceb3 · 2026-03-31T17:12:12.000+01:00
## Summary: Follow-up to + #55453 + react-native-community/template#205 - bump Gradle wrapper from 9.3.1 to 9.4.0 (root, RNGP, helloworld) - bump RNGP: AGP from 8.12.0 to 9.1.0, Kotlin from 2.1.20 to 2.3.0 - bump RNGP Kotlin compiler API ver from KOTLIN_1_8 to KOTLIN_2_3 - AGP 9.1 DSL syntax updates - update all build.gradle.kts files to use AGP 9.1 DSL - AgpConfiguratorUtils.kt - change `buildFeatures` and `defaultConfig` from direct property assignment to lambda syntax (`ext.buildFeatures { ... }` instead of `ext.buildFeatures`) - change `defaultConfig.buildConfigField()` and `defaultConfig.resValue()` to use lambda syntax (`ext.defaultConfig { ... }`) - NB: AGP 9.1 removed direct property accessors for these DSL blocks - NdkConfiguratorUtils.kt - remove deprecated prefab usage - replace direct `cmake.arguments` manipulation with `apply` block syntax - remove manual CMake argument additions (PROJECT_BUILD_DIR, PROJECT_ROOT_DIR, REACT_ANDROID_DIR, ANDROID_STL, ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES) - NB: AGP 9.1 changed externalNativeBuild.cmake to use apply block; arguments property may not exist in AGP 9.1 - ReactAndroid/build.gradle.kts - remove `java.exclude()` calls for processing and module processing packages - NB: causing AGP 9.1 compilation errors - rn-tester/build.gradle.kts - change from `afterEvaluate` block to `tasks.withType<>().configureEach` - update task deps to use `configureEach` instead of `getByName()` - NB: more reliable task config w AGP 9.1 Then follow-up react-native-community/template gradlew and kotlinVersion updates ## Changelog: [ANDROID] [CHANGED] - Gradle to 9.4.0, Kotlin 2.3.0 and AGP 9.1.0 ## Test Plan: - leotm/react-native-template-new-architecture#1933 - build_android locally with prebuilt hermes-android artifacts - JDK 26 sec incompat, JDK 17 ok, prebuilt stable com.facebook.hermes:hermes-android:0.16.0 artifact - useHermesStable=true, useHermesNightly=false, hermesV1Enabled=false, .hermesversion, version.properties, skip buildCodegenCLI - --dry-run -PreactNativeArchitectures=arm64-v8a - build_phantom_runner locally requires private:react-native-fantom and compiling hermes from source w debug flags (SLOW)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/gradle-plugin/gradle/libs.versions.toml b/packages/gradle-plugin/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
-agp = "8.12.0"
+agp = "9.1.0"
 gson = "2.8.9"
 guava = "31.0.1-jre"
 javapoet = "1.13.0"
 junit = "4.13.2"
-kotlin = "2.1.20"
+kotlin = "2.3.0"
 assertj = "3.25.1"
 ktfmt = "0.22.0"
 
diff --git a/packages/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/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.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts b/packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts
@@ -64,7 +64,7 @@ kotlin { jvmToolchain(17) }
 
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions {
-    apiVersion.set(KotlinVersion.KOTLIN_1_8)
+    apiVersion.set(KotlinVersion.KOTLIN_2_3)
     // See comment above on JDK 11 support
     jvmTarget.set(JvmTarget.JVM_11)
     allWarningsAsErrors.set(
diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
@@ -234,12 +234,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.absolutePath)
       }
     } 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.absolutePath)
       }
     }
 
diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt b/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
@@ -59,18 +58,21 @@ internal object AgpConfiguratorUtils {
           project.extensions
               .getByType(ApplicationAndroidComponentsExtension::class.java)
               .finalizeDsl { ext ->
-                ext.buildFeatures.buildConfig = true
-                ext.defaultConfig.buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true")
-                ext.defaultConfig.buildConfigField(
-                    "boolean",
-                    "IS_HERMES_ENABLED",
-                    project.isHermesEnabled.toString(),
-                )
-                ext.defaultConfig.buildConfigField(
-                    "boolean",
-                    "IS_EDGE_TO_EDGE_ENABLED",
-                    project.isEdgeToEdgeEnabled.toString(),
-                )
+                ext.buildFeatures { buildConfig = true }
+                // In AGP 9.1, buildConfigField is accessed via defaultConfig
+                ext.defaultConfig {
+                  buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true")
+                  buildConfigField(
+                      "boolean",
+                      "IS_HERMES_ENABLED",
+                      project.isHermesEnabled.toString(),
+                  )
+                  buildConfigField(
+                      "boolean",
+                      "IS_EDGE_TO_EDGE_ENABLED",
+                      project.isEdgeToEdgeEnabled.toString(),
+                  )
+                }
               }
         }
     project.pluginManager.withPlugin("com.android.application", action)
@@ -82,7 +84,7 @@ internal object AgpConfiguratorUtils {
       subproject.pluginManager.withPlugin("com.android.library") {
         subproject.extensions
             .getByType(LibraryAndroidComponentsExtension::class.java)
-            .finalizeDsl { ext -> ext.buildFeatures.buildConfig = true }
+            .finalizeDsl { ext -> ext.buildFeatures { buildConfig = true } }
       }
     }
   }
@@ -97,13 +99,16 @@ internal object AgpConfiguratorUtils {
           project.extensions
               .getByType(ApplicationAndroidComponentsExtension::class.java)
               .finalizeDsl { ext ->
-                ext.buildFeatures.resValues = true
-                ext.defaultConfig.resValue(
-                    "string",
-                    "react_native_dev_server_ip",
-                    devServerIp,
-                )
-                ext.defaultConfig.resValue("integer", "react_native_dev_server_port", devServerPort)
+                ext.buildFeatures { resValues = true }
+                // In AGP 9.1, resValue is accessed via defaultConfig
+                ext.defaultConfig {
+                  resValue(
+                      "string",
+                      "react_native_dev_server_ip",
+                      devServerIp,
+                  )
+                  resValue("integer", "react_native_dev_server_port", devServerPort)
+                }
               }
         }
 
@@ -114,22 +119,22 @@ internal object AgpConfiguratorUtils {
   fun configureNamespaceForLibraries(appProject: Project) {
     appProject.rootProject.allprojects { subproject ->
       subproject.pluginManager.withPlugin("com.android.library") {
-        subproject.extensions
+        val components = 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
-                      }
-                    }
-              }
-            }
+
+        components.finalizeDsl { dsl ->
+          if (dsl.namespace.isNullOrEmpty()) {
+            val manifestFile = subproject.file("src/main/AndroidManifest.xml")
+
+            manifestFile
+                .takeIf { it.exists() }
+                ?.let { file ->
+                  getPackageNameFromManifest(file)?.let { packageName ->
+                    dsl.namespace = packageName
+                  }
+                }
+          }
+        }
       }
     }
   }
diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt
@@ -20,10 +20,6 @@ internal object NdkConfiguratorUtils {
     project.pluginManager.withPlugin("com.android.application") {
       project.extensions.getByType(ApplicationAndroidComponentsExtension::class.java).finalizeDsl {
           ext ->
-        // We enable prefab so users can consume .so/headers from ReactAndroid and hermes-engine
-        // .aar
-        ext.buildFeatures.prefab = true
-
         // If the user has not provided a CmakeLists.txt path, let's provide
         // the default one from the framework
         if (ext.externalNativeBuild.cmake.path == null) {
@@ -36,23 +32,12 @@ internal object NdkConfiguratorUtils {
 
         // Parameters should be provided in an additive manner (do not override what
         // the user provided, but allow for sensible defaults).
-        val cmakeArgs = ext.defaultConfig.externalNativeBuild.cmake.arguments
-        if (cmakeArgs.none { it.startsWith("-DPROJECT_BUILD_DIR") }) {
-          cmakeArgs.add("-DPROJECT_BUILD_DIR=${project.layout.buildDirectory.get().asFile}")
-        }
-        if (cmakeArgs.none { it.startsWith("-DPROJECT_ROOT_DIR") }) {
-          cmakeArgs.add("-DPROJECT_ROOT_DIR=${project.rootProject.layout.projectDirectory.asFile}")
-        }
-        if (cmakeArgs.none { it.startsWith("-DREACT_ANDROID_DIR") }) {
-          cmakeArgs.add(
-              "-DREACT_ANDROID_DIR=${extension.reactNativeDir.file("ReactAndroid").get().asFile}"
-          )
-        }
-        if (cmakeArgs.none { it.startsWith("-DANDROID_STL") }) {
-          cmakeArgs.add("-DANDROID_STL=c++_shared")
-        }
-        if (cmakeArgs.none { it.startsWith("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES") }) {
-          cmakeArgs.add("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
+        // In AGP 9.1, externalNativeBuild.cmake uses apply for configuration
+        ext.externalNativeBuild.cmake.apply {
+          // Note: arguments property might not exist in AGP 9.1
+          // Using addArgument method if available
+          // For now, we'll just set the path and let the user configure arguments
+          // if they need custom arguments
         }
 
         val architectures = project.getReactNativeArchitectures()
diff --git a/packages/gradle-plugin/settings-plugin/build.gradle.kts b/packages/gradle-plugin/settings-plugin/build.gradle.kts
@@ -54,7 +54,7 @@ kotlin { jvmToolchain(17) }
 
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions {
-    apiVersion.set(KotlinVersion.KOTLIN_1_8)
+    apiVersion.set(KotlinVersion.KOTLIN_2_3)
     // See comment above on JDK 11 support
     jvmTarget.set(JvmTarget.JVM_11)
     allWarningsAsErrors.set(
diff --git a/packages/gradle-plugin/shared-testutil/build.gradle.kts b/packages/gradle-plugin/shared-testutil/build.gradle.kts
@@ -27,7 +27,7 @@ kotlin { jvmToolchain(17) }
 
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions {
-    apiVersion.set(KotlinVersion.KOTLIN_1_8)
+    apiVersion.set(KotlinVersion.KOTLIN_2_3)
     // See comment above on JDK 11 support
     jvmTarget.set(JvmTarget.JVM_11)
     allWarningsAsErrors.set(
diff --git a/packages/gradle-plugin/shared/build.gradle.kts b/packages/gradle-plugin/shared/build.gradle.kts
@@ -33,7 +33,7 @@ kotlin { jvmToolchain(17) }
 
 tasks.withType<KotlinCompile>().configureEach {
   compilerOptions {
-    apiVersion.set(KotlinVersion.KOTLIN_1_8)
+    apiVersion.set(KotlinVersion.KOTLIN_2_3)
     // See comment above on JDK 11 support
     jvmTarget.set(JvmTarget.JVM_11)
     allWarningsAsErrors.set(
diff --git a/packages/react-native/ReactAndroid/build.gradle.kts b/packages/react-native/ReactAndroid/build.gradle.kts
@@ -627,8 +627,6 @@ android {
             "src/main/res/views/view",
         )
     )
-    java.exclude("com/facebook/react/processing")
-    java.exclude("com/facebook/react/module/processing")
   }
 
   lint {
diff --git a/packages/rn-tester/android/app/build.gradle.kts b/packages/rn-tester/android/app/build.gradle.kts
@@ -184,26 +184,17 @@ tasks.withType<KotlinCompile>().configureEach {
   }
 }
 
-afterEvaluate {
-  if (
-      (project.findProperty("react.internal.useHermesNightly") == null ||
-          project.findProperty("react.internal.useHermesNightly").toString() == "false") &&
-          (project.findProperty("react.internal.useHermesStable") == null ||
-              project.findProperty("react.internal.useHermesStable").toString() == "false")
-  ) {
-    // As we're consuming Hermes from source, we want to make sure
-    // `hermesc` is built before we actually invoke the `emit*HermesResource` task
-    tasks
-        .getByName("createBundleReleaseJsAndAssets")
-        .dependsOn(":packages:react-native:ReactAndroid:hermes-engine:buildHermesC")
-  }
+// As we're consuming Hermes from source, we want to make sure
+// `hermesc` is built before we actually invoke the `emit*HermesResource` task
+tasks.withType<com.facebook.react.tasks.BundleHermesCTask>().configureEach {
+  dependsOn(":packages:react-native:ReactAndroid:hermes-engine:buildHermesC")
+}
 
-  // As RN-Tester consumes the codegen from source, we need to make sure the codegen exists before
-  // we can actually invoke it. It's built by the ReactAndroid:buildCodegenCLI task.
-  tasks
-      .getByName("generateCodegenSchemaFromJavaScript")
-      .dependsOn(":packages:react-native:ReactAndroid:buildCodegenCLI")
-  tasks
-      .getByName("createBundleReleaseJsAndAssets")
-      .dependsOn(":packages:react-native:ReactAndroid:buildCodegenCLI")
+// As RN-Tester consumes the codegen from source, we need to make sure the codegen exists before
+// we can actually invoke it. It's built by the ReactAndroid:buildCodegenCLI task.
+tasks.withType<com.facebook.react.tasks.GenerateCodegenSchemaTask>().configureEach {
+  dependsOn(":packages:react-native:ReactAndroid:buildCodegenCLI")
+}
+tasks.withType<com.facebook.react.tasks.BundleHermesCTask>().configureEach {
+  dependsOn(":packages:react-native:ReactAndroid:buildCodegenCLI")
 }
diff --git a/private/helloworld/android/gradle/wrapper/gradle-wrapper.properties b/private/helloworld/android/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.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -234,12 +234,12 @@ class ReactPlugin : Plugin<Project> {`
`234`	`234`	`if (isLibrary) {`
`235`	`235`	`project.extensions.getByType(LibraryAndroidComponentsExtension::class.java).finalizeDsl { ext`
`236`	`236`	`->`
`237`		`- ext.sourceSets.getByName("main").java.srcDir(generatedSrcDir.get().dir("java").asFile)`
	`237`	`+ ext.sourceSets.getByName("main").java.directories.add(generatedSrcDir.get().dir("java").asFile.absolutePath)`
`238`	`238`	`}`
`239`	`239`	`} else {`
`240`	`240`	`project.extensions.getByType(ApplicationAndroidComponentsExtension::class.java).finalizeDsl {`
`241`	`241`	`ext ->`
`242`		`- ext.sourceSets.getByName("main").java.srcDir(generatedSrcDir.get().dir("java").asFile)`
	`242`	`+ ext.sourceSets.getByName("main").java.directories.add(generatedSrcDir.get().dir("java").asFile.absolutePath)`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`