@react-native/gradle-plugin 0.74.0 → 0.75.0-main

package/build.gradle.kts

@@ -26,6 +26,10 @@ gradlePlugin {
       id = "com.facebook.react"
       implementationClass = "com.facebook.react.ReactPlugin"
     }
+    create("reactrootproject") {
+      id = "com.facebook.react.rootproject"
+      implementationClass = "com.facebook.react.ReactRootProjectPlugin"
+    }
   }
 }
 
@@ -63,7 +67,7 @@ kotlin { jvmToolchain(17) }
 
 tasks.withType<KotlinCompile>().configureEach {
   kotlinOptions {
-    apiVersion = "1.5"
+    apiVersion = "1.6"
     // See comment above on JDK 11 support
     jvmTarget = "11"
     allWarningsAsErrors = true

package/gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-agp = "8.1.1"
+agp = "8.2.1"
 gson = "2.8.9"
 guava = "31.0.1-jre"
 javapoet = "1.13.0"
 junit = "4.13.2"
-kotlin = "1.8.0"
+kotlin = "1.9.22"
 
 [libraries]
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }

package/gradle/wrapper/gradle-wrapper.properties

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

package/gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/gradle-plugin",
-  "version": "0.74.0",
+  "version": "0.75.0-main",
   "description": "Gradle Plugin for React Native",
   "license": "MIT",
   "repository": {
@@ -31,7 +31,5 @@
     "gradlew.bat",
     "src/main",
     "README.md"
-  ],
-  "dependencies": {},
-  "devDependencies": {}
+  ]
 }

package/src/main/kotlin/com/facebook/react/ReactPlugin.kt

@@ -12,8 +12,10 @@ import com.android.build.gradle.internal.tasks.factory.dependsOn
 import com.facebook.react.internal.PrivateReactExtension
 import com.facebook.react.tasks.GenerateCodegenArtifactsTask
 import com.facebook.react.tasks.GenerateCodegenSchemaTask
-import com.facebook.react.utils.AgpConfiguratorUtils.configureBuildConfigFields
+import com.facebook.react.utils.AgpConfiguratorUtils.configureBuildConfigFieldsForApp
+import com.facebook.react.utils.AgpConfiguratorUtils.configureBuildConfigFieldsForLibraries
 import com.facebook.react.utils.AgpConfiguratorUtils.configureDevPorts
+import com.facebook.react.utils.AgpConfiguratorUtils.configureNamespaceForLibraries
 import com.facebook.react.utils.BackwardCompatUtils.configureBackwardCompatibilityReactMap
 import com.facebook.react.utils.DependencyUtils.configureDependencies
 import com.facebook.react.utils.DependencyUtils.configureRepositories
@@ -66,9 +68,10 @@ class ReactPlugin : Plugin<Project> {
       }
 
       configureReactNativeNdk(project, extension)
-      configureBuildConfigFields(project, extension)
+      configureBuildConfigFieldsForApp(project, extension)
       configureDevPorts(project)
       configureBackwardCompatibilityReactMap(project)
+      configureJavaToolChains(project)
 
       project.extensions.getByType(AndroidComponentsExtension::class.java).apply {
         onVariants(selector().all()) { variant ->
@@ -79,12 +82,11 @@ class ReactPlugin : Plugin<Project> {
     }
 
     // Library Only Configuration
+    configureBuildConfigFieldsForLibraries(project)
+    configureNamespaceForLibraries(project)
     project.pluginManager.withPlugin("com.android.library") {
       configureCodegen(project, extension, rootExtension, isLibrary = true)
     }
-
-    // Library and App Configurations
-    configureJavaToolChains(project)
   }
 
   private fun checkJvmVersion(project: Project) {
@@ -159,6 +161,8 @@ class ReactPlugin : Plugin<Project> {
               val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
 
               val jsSrcsDirInPackageJson = parsedPackageJson?.codegenConfig?.jsSrcsDir
+              val includesGeneratedCode =
+                  parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false
               if (jsSrcsDirInPackageJson != null) {
                 it.jsRootDir.set(File(packageJson.parentFile, jsSrcsDirInPackageJson))
               } else {
@@ -166,7 +170,7 @@ class ReactPlugin : Plugin<Project> {
               }
               val needsCodegenFromPackageJson =
                   project.needsCodegenFromPackageJson(rootExtension.root)
-              it.onlyIf { isLibrary || needsCodegenFromPackageJson }
+              it.onlyIf { (isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode }
             }
 
     // We create the task to generate Java code from schema.
@@ -186,7 +190,11 @@ class ReactPlugin : Plugin<Project> {
               // Therefore, the appNeedsCodegen needs to be invoked inside this lambda.
               val needsCodegenFromPackageJson =
                   project.needsCodegenFromPackageJson(rootExtension.root)
-              it.onlyIf { isLibrary || needsCodegenFromPackageJson }
+              val packageJson = findPackageJsonFile(project, rootExtension.root)
+              val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
+              val includesGeneratedCode =
+                  parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false
+              it.onlyIf { (isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode }
             }
 
     // We update the android configuration to include the generated sources.

package/src/main/kotlin/com/facebook/react/ReactRootProjectPlugin.kt

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+/**
+ * Gradle plugin applied to the `android/build.gradle` file.
+ *
+ * This plugin allows to specify project wide configurations that can be applied to both apps and
+ * libraries before they're evaluated.
+ */
+class ReactRootProjectPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    project.subprojects {
+      // As the :app project (i.e. ReactPlugin) configures both namespaces and JVM toolchains
+      // for libraries, its evaluation must happen before the libraries' evaluation.
+      // Eventually the configuration of namespace/JVM toolchain can be moved inside this plugin.
+      if (it.path != ":app") {
+        it.evaluationDependsOn(":app")
+      }
+    }
+  }
+}

package/src/main/kotlin/com/facebook/react/TaskConfiguration.kt

@@ -23,7 +23,7 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
   val targetName = variant.name.capitalizeCompat()
   val targetPath = variant.name
 
-  val buildDir = this.layout.buildDirectory.get().asFile
+  val buildDir = layout.buildDirectory.get().asFile
   // Resources: generated/assets/react/<variant>/index.android.bundle
   val resourcesDir = File(buildDir, "generated/res/react/$targetPath")
   // Bundle: generated/assets/react/<variant>/index.android.bundle

package/src/main/kotlin/com/facebook/react/model/ModelCodegenConfig.kt

@@ -11,5 +11,6 @@ data class ModelCodegenConfig(
     val name: String?,
     val type: String?,
     val jsSrcsDir: String?,
-    val android: ModelCodegenConfigAndroid?
+    val android: ModelCodegenConfigAndroid?,
+    val includesGeneratedCode: Boolean?,
 )

package/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt

@@ -67,6 +67,8 @@ abstract class GenerateCodegenSchemaTask : Exec() {
                 .cliPath(workingDir),
             "--platform",
             "android",
+            "--exclude",
+            "NativeSampleTurboModule",
             generatedSchemaFile.get().asFile.cliPath(workingDir),
             jsRootDir.asFile.get().cliPath(workingDir),
         ))

package/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt

@@ -40,7 +40,7 @@ abstract class PrepareBoostTask : DefaultTask() {
       it.into(outputDir)
     }
     File(outputDir.asFile.get(), "boost").apply {
-      renameTo(File(this.parentFile, "boost_${boostVersion.get()}"))
+      renameTo(File(parentFile, "boost_${boostVersion.get()}"))
     }
   }
 }

package/src/main/kotlin/com/facebook/react/utils/AgpConfiguratorUtils.kt

@@ -8,17 +8,22 @@
 package com.facebook.react.utils
 
 import com.android.build.api.variant.AndroidComponentsExtension
+import com.android.build.gradle.LibraryExtension
 import com.facebook.react.ReactExtension
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
 import com.facebook.react.utils.ProjectUtils.isNewArchEnabled
+import java.io.File
+import javax.xml.parsers.DocumentBuilder
+import javax.xml.parsers.DocumentBuilderFactory
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.plugins.AppliedPlugin
+import org.w3c.dom.Element
 
 @Suppress("UnstableApiUsage")
 internal object AgpConfiguratorUtils {
 
-  fun configureBuildConfigFields(project: Project, extension: ReactExtension) {
+  fun configureBuildConfigFieldsForApp(project: Project, extension: ReactExtension) {
     val action =
         Action<AppliedPlugin> {
           project.extensions.getByType(AndroidComponentsExtension::class.java).finalizeDsl { ext ->
@@ -35,24 +40,67 @@ 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(AndroidComponentsExtension::class.java).finalizeDsl { ext ->
+          ext.buildFeatures.buildConfig = true
+        }
+      }
+    }
+  }
+
   fun configureDevPorts(project: Project) {
     val devServerPort =
         project.properties["reactNativeDevServerPort"]?.toString() ?: DEFAULT_DEV_SERVER_PORT
-    val inspectorProxyPort =
-        project.properties["reactNativeInspectorProxyPort"]?.toString() ?: devServerPort
 
     val action =
         Action<AppliedPlugin> {
           project.extensions.getByType(AndroidComponentsExtension::class.java).finalizeDsl { ext ->
             ext.defaultConfig.resValue("integer", "react_native_dev_server_port", devServerPort)
-            ext.defaultConfig.resValue(
-                "integer", "react_native_inspector_proxy_port", inspectorProxyPort)
           }
         }
 
     project.pluginManager.withPlugin("com.android.application", action)
     project.pluginManager.withPlugin("com.android.library", action)
   }
+
+  fun configureNamespaceForLibraries(appProject: Project) {
+    appProject.rootProject.allprojects { subproject ->
+      subproject.pluginManager.withPlugin("com.android.library") {
+        subproject.extensions.getByType(AndroidComponentsExtension::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
+                  }
+                }
+          }
+        }
+      }
+    }
+  }
 }
 
 const val DEFAULT_DEV_SERVER_PORT = "8081"
+
+fun getPackageNameFromManifest(manifest: File): String? {
+  val factory: DocumentBuilderFactory = DocumentBuilderFactory.newInstance()
+  val builder: DocumentBuilder = factory.newDocumentBuilder()
+
+  try {
+    val xmlDocument = builder.parse(manifest)
+
+    val manifestElement = xmlDocument.getElementsByTagName("manifest").item(0) as? Element
+    val packageName = manifestElement?.getAttribute("package")
+
+    return if (packageName.isNullOrEmpty()) null else packageName
+  } catch (e: Exception) {
+    return null
+  }
+}

package/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt

@@ -36,6 +36,12 @@ internal object DependencyUtils {
         repositories.mavenCentral { repo ->
           // We don't want to fetch JSC from Maven Central as there are older versions there.
           repo.content { it.excludeModule("org.webkit", "android-jsc") }
+
+          // If the user provided a react.internal.mavenLocalRepo, do not attempt to load
+          // anything from Maven Central that is react related.
+          if (hasProperty(INTERNAL_REACT_NATIVE_MAVEN_LOCAL_REPO)) {
+            repo.content { it.excludeGroup("com.facebook.react") }
+          }
         }
         // Android JSC is installed from npm
         mavenRepoFromURI(File(reactNativeDir, "../jsc-android/dist").toURI())
@@ -48,8 +54,7 @@ internal object DependencyUtils {
   /**
    * This method takes care of configuring the resolution strategy for both the app and all the 3rd
    * party libraries which are auto-linked. Specifically it takes care of:
-   * - Forcing the react-android/hermes-android/flipper-integration version to the one specified in
-   *   the package.json
+   * - Forcing the react-android/hermes-android version to the one specified in the package.json
    * - Substituting `react-native` with `react-android` and `hermes-engine` with `hermes-android`.
    */
   fun configureDependencies(
@@ -71,7 +76,6 @@ internal object DependencyUtils {
         }
         configuration.resolutionStrategy.force(
             "${groupString}:react-android:${versionString}",
-            "${groupString}:flipper-integration:${versionString}",
         )
         if (!(eachProject.findProperty(INTERNAL_USE_HERMES_NIGHTLY) as? String).toBoolean()) {
           // Contributors only: The hermes-engine version is forced only if the user has
@@ -115,7 +119,7 @@ internal object DependencyUtils {
   fun readVersionAndGroupStrings(propertiesFile: File): Pair<String, String> {
     val reactAndroidProperties = Properties()
     propertiesFile.inputStream().use { reactAndroidProperties.load(it) }
-    val versionStringFromFile = reactAndroidProperties[INTERNAL_VERSION_NAME] as? String ?: ""
+    val versionStringFromFile = (reactAndroidProperties[INTERNAL_VERSION_NAME] as? String).orEmpty()
     // If on a nightly, we need to fetch the -SNAPSHOT artifact from Sonatype.
     val versionString =
         if (versionStringFromFile.startsWith("0.0.0") || "-nightly-" in versionStringFromFile) {

package/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt

@@ -102,6 +102,7 @@ internal object NdkConfiguratorUtils {
               "**/libreact_debug.so",
               "**/libreact_nativemodule_core.so",
               "**/libreact_newarchdefaults.so",
+              "**/libreact_cxxreactpackage.so",
               "**/libreact_render_componentregistry.so",
               "**/libreact_render_core.so",
               "**/libreact_render_debug.so",

package/src/main/kotlin/com/facebook/react/utils/Os.kt

@@ -40,6 +40,6 @@ internal object Os {
       if (isWindows()) {
         this.relativeTo(base).path
       } else {
-        this.absolutePath
+        absolutePath
       }
 }

package/src/main/kotlin/com/facebook/react/tasks/internal/PrepareLibeventTask.kt

@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react.tasks.internal
-
-import java.io.File
-import org.gradle.api.DefaultTask
-import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.*
-
-/**
- * A task that takes care of extracting Libevent from a source folder/zip and preparing it to be
- * consumed by the NDK.
- */
-abstract class PrepareLibeventTask : DefaultTask() {
-
-  @get:InputFiles abstract val libeventPath: ConfigurableFileCollection
-
-  @get:Input abstract val libeventVersion: Property<String>
-
-  @get:OutputDirectory abstract val outputDir: DirectoryProperty
-
-  @TaskAction
-  fun taskAction() {
-    project.copy { it ->
-      it.from(libeventPath)
-      it.from(project.file("src/main/jni/third-party/libevent/"))
-      it.include(
-          "libevent-${libeventVersion.get()}-stable/*.c",
-          "libevent-${libeventVersion.get()}-stable/*.h",
-          "libevent-${libeventVersion.get()}-stable/include/**/*",
-          "evconfig-private.h",
-          "event-config.h",
-          "CMakeLists.txt")
-      it.eachFile { it.path = it.path.removePrefix("libevent-${libeventVersion.get()}-stable/") }
-      it.includeEmptyDirs = false
-      it.into(outputDir)
-    }
-    File(outputDir.asFile.get(), "event-config.h").apply {
-      val destination =
-          File(this.parentFile, "include/event2/event-config.h").apply { parentFile.mkdirs() }
-      renameTo(destination)
-    }
-  }
-}