@react-native/gradle-plugin 0.72.3 → 0.72.5

package/build.gradle.kts

@@ -11,7 +11,7 @@ import org.gradle.configurationcache.extensions.serviceOf
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  kotlin("jvm") version "1.6.10"
+  kotlin("jvm") version "1.7.22"
   id("java-gradle-plugin")
 }
 
@@ -33,7 +33,7 @@ group = "com.facebook.react"
 
 dependencies {
   implementation(gradleApi())
-  implementation("com.android.tools.build:gradle:7.4.1")
+  implementation("com.android.tools.build:gradle:7.4.2")
   implementation("com.google.code.gson:gson:2.8.9")
   implementation("com.google.guava:guava:31.0.1-jre")
   implementation("com.squareup:javapoet:1.13.0")
@@ -54,8 +54,12 @@ java {
   targetCompatibility = JavaVersion.VERSION_11
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.majorVersion }
+tasks.withType<KotlinCompile> {
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
+    apiVersion = "1.5"
+    languageVersion = "1.5"
+  }
 }
 
 tasks.withType<Test>().configureEach {

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

package/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/gradle-plugin",
-  "version": "0.72.3",
+  "version": "0.72.5",
   "description": "⚛️ Gradle Plugin for React Native",
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/react-native-gradle-plugin",
   "repository": {

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

@@ -9,6 +9,7 @@ package com.facebook.react
 
 import com.android.build.api.variant.Variant
 import com.facebook.react.tasks.BundleHermesCTask
+import com.facebook.react.utils.KotlinStdlibCompatUtils.capitalizeCompat
 import com.facebook.react.utils.NdkConfiguratorUtils.configureJsEnginePackagingOptions
 import com.facebook.react.utils.NdkConfiguratorUtils.configureNewArchPackagingOptions
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
@@ -19,7 +20,7 @@ import org.gradle.api.Project
 
 @Suppress("SpreadOperator", "UnstableApiUsage")
 internal fun Project.configureReactTasks(variant: Variant, config: ReactExtension) {
-  val targetName = variant.name.replaceFirstChar { it.uppercase() }
+  val targetName = variant.name.capitalizeCompat()
   val targetPath = variant.name
 
   // Resources: generated/assets/react/<variant>/index.android.bundle
@@ -51,13 +52,14 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
   configureJsEnginePackagingOptions(config, variant, isHermesEnabledInThisVariant)
 
   if (!isDebuggableVariant) {
+    val entryFileEnvVariable = System.getenv("ENTRY_FILE")
     val bundleTask =
         tasks.register("createBundle${targetName}JsAndAssets", BundleHermesCTask::class.java) {
           it.root.set(config.root)
           it.nodeExecutableAndArgs.set(config.nodeExecutableAndArgs)
           it.cliFile.set(cliFile)
           it.bundleCommand.set(config.bundleCommand)
-          it.entryFile.set(detectedEntryFile(config))
+          it.entryFile.set(detectedEntryFile(config, entryFileEnvVariable))
           it.extraPackagerArgs.set(config.extraPackagerArgs)
           it.bundleConfig.set(config.bundleConfig)
           it.bundleAssetName.set(config.bundleAssetName)

package/src/main/kotlin/com/facebook/react/internal/PrivateReactExtension.kt

@@ -25,11 +25,32 @@ abstract class PrivateReactExtension @Inject constructor(project: Project) {
 
   private val objects = project.objects
 
-  val root: DirectoryProperty = objects.directoryProperty()
-
-  val reactNativeDir: DirectoryProperty = objects.directoryProperty()
-
-  val nodeExecutableAndArgs: ListProperty<String> = objects.listProperty(String::class.java)
-
-  val codegenDir: DirectoryProperty = objects.directoryProperty()
+  val root: DirectoryProperty =
+      objects
+          .directoryProperty()
+          .convention(
+              // This is the default for the project root if the users hasn't specified anything.
+              // If the project is called "react-native-github"
+              //   - We're inside the Github Repo -> root is defined by RN Tester (so no default
+              // needed)
+              //   - We're inside an includedBuild as we're performing a build from source
+              //     (then we're inside `node_modules/react-native`, so default should be ../../)
+              // If the project is called in any other name
+              //   - We're inside a user project, so inside the ./android folder. Default should be
+              // ../
+              // User can always override this default by setting a `root =` inside the template.
+              if (project.rootProject.name == "react-native-github") {
+                project.rootProject.layout.projectDirectory.dir("../../")
+              } else {
+                project.rootProject.layout.projectDirectory.dir("../")
+              })
+
+  val reactNativeDir: DirectoryProperty =
+      objects.directoryProperty().convention(root.dir("node_modules/react-native"))
+
+  val nodeExecutableAndArgs: ListProperty<String> =
+      objects.listProperty(String::class.java).convention(listOf("node"))
+
+  val codegenDir: DirectoryProperty =
+      objects.directoryProperty().convention(root.dir("node_modules/@react-native/codegen"))
 }

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

@@ -133,35 +133,37 @@ abstract class BundleHermesCTask : DefaultTask() {
     }
   }
 
-  internal fun getBundleCommand(bundleFile: File, sourceMapFile: File): List<Any> =
-      windowsAwareCommandLine(
-          buildList {
-            val rootFile = root.get().asFile
-            addAll(nodeExecutableAndArgs.get())
-            add(cliFile.get().asFile.cliPath(rootFile))
-            add(bundleCommand.get())
-            add("--platform")
-            add("android")
-            add("--dev")
-            add(devEnabled.get().toString())
-            add("--reset-cache")
-            add("--entry-file")
-            add(entryFile.get().asFile.cliPath(rootFile))
-            add("--bundle-output")
-            add(bundleFile.cliPath(rootFile))
-            add("--assets-dest")
-            add(resourcesDir.get().asFile.cliPath(rootFile))
-            add("--sourcemap-output")
-            add(sourceMapFile.cliPath(rootFile))
-            if (bundleConfig.isPresent) {
-              add("--config")
-              add(bundleConfig.get().asFile.cliPath(rootFile))
-            }
-            add("--minify")
-            add(minifyEnabled.get().toString())
-            addAll(extraPackagerArgs.get())
-            add("--verbose")
-          })
+  internal fun getBundleCommand(bundleFile: File, sourceMapFile: File): List<Any> {
+    val rootFile = root.get().asFile
+    val commandLine =
+        mutableListOf<String>().apply {
+          addAll(nodeExecutableAndArgs.get())
+          add(cliFile.get().asFile.cliPath(rootFile))
+          add(bundleCommand.get())
+          add("--platform")
+          add("android")
+          add("--dev")
+          add(devEnabled.get().toString())
+          add("--reset-cache")
+          add("--entry-file")
+          add(entryFile.get().asFile.cliPath(rootFile))
+          add("--bundle-output")
+          add(bundleFile.cliPath(rootFile))
+          add("--assets-dest")
+          add(resourcesDir.get().asFile.cliPath(rootFile))
+          add("--sourcemap-output")
+          add(sourceMapFile.cliPath(rootFile))
+          if (bundleConfig.isPresent) {
+            add("--config")
+            add(bundleConfig.get().asFile.cliPath(rootFile))
+          }
+          add("--minify")
+          add(minifyEnabled.get().toString())
+          addAll(extraPackagerArgs.get())
+          add("--verbose")
+        }
+    return windowsAwareCommandLine(commandLine)
+  }
 
   internal fun getHermescCommand(
       hermesCommand: String,

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

@@ -38,13 +38,10 @@ abstract class GenerateCodegenSchemaTask : Exec() {
         // Those are known build paths where the source map or other
         // .js files could be stored/generated. We want to make sure we don't pick them up
         // for execution avoidance.
-        it.exclude("**/generated/source/codegen/**/*")
         it.exclude("**/build/ASSETS/**/*")
         it.exclude("**/build/RES/**/*")
-        it.exclude("**/build/generated/assets/react/**/*")
-        it.exclude("**/build/generated/res/react/**/*")
-        it.exclude("**/build/generated/sourcemaps/react/**/*")
-        it.exclude("**/build/intermediates/sourcemaps/react/**/*")
+        it.exclude("**/build/generated/**/*")
+        it.exclude("**/build/intermediates/**/*")
       }
 
   @get:OutputFile

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

@@ -28,7 +28,10 @@ internal object DependencyUtils {
         }
         // We add the snapshot for users on nightlies.
         mavenRepoFromUrl("https://oss.sonatype.org/content/repositories/snapshots/")
-        repositories.mavenCentral()
+        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") }
+        }
         // Android JSC is installed from npm
         mavenRepoFromURI(File(reactNativeDir, "../jsc-android/dist").toURI())
         repositories.google()

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

@@ -0,0 +1,32 @@
+/*
+ * 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.utils
+
+import java.util.Locale
+
+object KotlinStdlibCompatUtils {
+  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
+  fun String.lowercaseCompat(): String = (this as java.lang.String).toLowerCase(Locale.ROOT)
+
+  fun String.capitalizeCompat(): String =
+      if (isNotEmpty()) {
+        val firstChar = this[0]
+        val uppercaseChar = Character.toUpperCase(firstChar)
+        val restString = this@capitalizeCompat.substring(1)
+        uppercaseChar + restString
+      } else {
+        this
+      }
+
+  fun String.toBooleanStrictOrNullCompat(): Boolean? =
+      when (this) {
+        "true" -> true
+        "false" -> false
+        else -> null
+      }
+}

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

@@ -7,18 +7,19 @@
 
 package com.facebook.react.utils
 
+import com.facebook.react.utils.KotlinStdlibCompatUtils.lowercaseCompat
 import java.io.File
 
 internal object Os {
 
   fun isWindows(): Boolean =
-      System.getProperty("os.name")?.lowercase()?.contains("windows") ?: false
+      System.getProperty("os.name")?.lowercaseCompat()?.contains("windows") ?: false
 
-  fun isMac(): Boolean = System.getProperty("os.name")?.lowercase()?.contains("mac") ?: false
+  fun isMac(): Boolean = System.getProperty("os.name")?.lowercaseCompat()?.contains("mac") ?: false
 
   fun isLinuxAmd64(): Boolean {
-    val osNameMatch = System.getProperty("os.name")?.lowercase()?.contains("linux") ?: false
-    val archMatch = System.getProperty("os.arch")?.lowercase()?.contains("amd64") ?: false
+    val osNameMatch = System.getProperty("os.name")?.lowercaseCompat()?.contains("linux") ?: false
+    val archMatch = System.getProperty("os.arch")?.lowercaseCompat()?.contains("amd64") ?: false
     return osNameMatch && archMatch
   }
 

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

@@ -11,6 +11,7 @@ package com.facebook.react.utils
 
 import com.facebook.react.ReactExtension
 import com.facebook.react.model.ModelPackageJson
+import com.facebook.react.utils.KotlinStdlibCompatUtils.capitalizeCompat
 import com.facebook.react.utils.Os.cliPath
 import java.io.File
 import org.gradle.api.Project
@@ -25,9 +26,11 @@ import org.gradle.api.file.DirectoryProperty
  *
  * @param config The [ReactExtension] configured for this project
  */
-internal fun detectedEntryFile(config: ReactExtension): File =
+internal fun detectedEntryFile(config: ReactExtension, envVariableOverride: String? = null): File =
     detectEntryFile(
-        entryFile = config.entryFile.orNull?.asFile, reactRoot = config.root.get().asFile)
+        entryFile = config.entryFile.orNull?.asFile,
+        reactRoot = config.root.get().asFile,
+        envVariableOverride = envVariableOverride)
 
 /**
  * Computes the CLI file for React Native. The Algo follows this order:
@@ -54,9 +57,13 @@ internal fun detectedCliFile(config: ReactExtension): File =
 internal fun detectedHermesCommand(config: ReactExtension): String =
     detectOSAwareHermesCommand(config.root.get().asFile, config.hermesCommand.get())
 
-private fun detectEntryFile(entryFile: File?, reactRoot: File): File =
+private fun detectEntryFile(
+    entryFile: File?,
+    reactRoot: File,
+    envVariableOverride: String? = null
+): File =
     when {
-      System.getenv("ENTRY_FILE") != null -> File(System.getenv("ENTRY_FILE"))
+      envVariableOverride != null -> File(reactRoot, envVariableOverride)
       entryFile != null -> entryFile
       File(reactRoot, "index.android.js").exists() -> File(reactRoot, "index.android.js")
       else -> File(reactRoot, "index.js")
@@ -182,7 +189,7 @@ internal fun getHermesOSBin(): String {
 internal fun projectPathToLibraryName(projectPath: String): String =
     projectPath
         .split(':', '-', '_', '.')
-        .joinToString("") { token -> token.replaceFirstChar { it.uppercase() } }
+        .joinToString("") { token -> token.capitalizeCompat() }
         .plus("Spec")
 
 /**

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

@@ -8,6 +8,8 @@
 package com.facebook.react.utils
 
 import com.facebook.react.model.ModelPackageJson
+import com.facebook.react.utils.KotlinStdlibCompatUtils.lowercaseCompat
+import com.facebook.react.utils.KotlinStdlibCompatUtils.toBooleanStrictOrNullCompat
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
 
@@ -22,13 +24,18 @@ internal object ProjectUtils {
   internal val Project.isHermesEnabled: Boolean
     get() =
         if (project.hasProperty("hermesEnabled")) {
-          project.property("hermesEnabled").toString().lowercase().toBooleanStrictOrNull() ?: true
+          project
+              .property("hermesEnabled")
+              .toString()
+              .lowercaseCompat()
+              .toBooleanStrictOrNullCompat()
+              ?: true
         } else if (project.extensions.extraProperties.has("react")) {
           @Suppress("UNCHECKED_CAST")
           val reactMap = project.extensions.extraProperties.get("react") as? Map<String, Any?>
           when (val enableHermesKey = reactMap?.get("enableHermes")) {
             is Boolean -> enableHermesKey
-            is String -> enableHermesKey.lowercase().toBooleanStrictOrNull() ?: true
+            is String -> enableHermesKey.lowercaseCompat().toBooleanStrictOrNullCompat() ?: true
             else -> HERMES_FALLBACK
           }
         } else {