@react-native/gradle-plugin 0.75.0-rc.4 → 0.75.0-rc.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/gradle-plugin",
-  "version": "0.75.0-rc.4",
+  "version": "0.75.0-rc.6",
   "description": "Gradle Plugin for React Native",
   "license": "MIT",
   "repository": {

package/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GeneratePackageListTask.kt

@@ -85,6 +85,8 @@ abstract class GeneratePackageListTask : DefaultTask() {
     val packages = model?.dependencies?.values ?: emptyList()
     return packages
         .filter { it.platforms?.android != null }
+        // The pure C++ dependencies won't have a .java/.kt file to import
+        .filterNot { it.platforms?.android?.isPureCxxDependency == true }
         .associate { it.name to checkNotNull(it.platforms?.android) }
   }
 

package/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GeneratePackageListTaskTest.kt

@@ -177,6 +177,33 @@ class GeneratePackageListTaskTest {
     assertEquals(android, result["a-dependency"])
   }
 
+  @Test
+  fun filterAndroidPackages_withIsPureCxxDependencyObject_returnsIt() {
+    val task = createTestTask<GeneratePackageListTask>()
+    val android =
+        ModelAutolinkingDependenciesPlatformAndroidJson(
+            sourceDir = "./a/directory/android",
+            packageImportPath = "import com.facebook.react.aPackage;",
+            packageInstance = "new APackage()",
+            buildTypes = emptyList(),
+            isPureCxxDependency = true)
+
+    val result =
+        task.filterAndroidPackages(
+            ModelAutolinkingConfigJson(
+                reactNativeVersion = "1000.0.0",
+                dependencies =
+                    mapOf(
+                        "a-pure-cxx-dependency" to
+                            ModelAutolinkingDependenciesJson(
+                                root = "./a/directory",
+                                name = "a-pure-cxx-dependency",
+                                platforms =
+                                    ModelAutolinkingDependenciesPlatformJson(android = android))),
+                project = null))
+    assertEquals(emptyMap<String, ModelAutolinkingDependenciesPlatformAndroidJson>(), result)
+  }
+
   @Test
   fun composeFileContent_withNoPackages_returnsValidFile() {
     val task = createTestTask<GeneratePackageListTask>()

package/settings-plugin/src/main/kotlin/com/facebook/react/ReactSettingsExtension.kt

@@ -13,8 +13,10 @@ import java.math.BigInteger
 import java.security.MessageDigest
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
+import org.gradle.api.GradleException
 import org.gradle.api.file.FileCollection
 import org.gradle.api.initialization.Settings
+import org.gradle.api.logging.Logging
 
 abstract class ReactSettingsExtension @Inject constructor(val settings: Settings) {
 
@@ -42,17 +44,32 @@ abstract class ReactSettingsExtension @Inject constructor(val settings: Settings
       lockFiles: FileCollection =
           settings.layout.rootDirectory
               .dir("../")
-              .files("yarn.lock", "package-lock.json", "package.json")
+              .files("yarn.lock", "package-lock.json", "package.json", "react-native.config.js")
   ) {
     outputFile.parentFile.mkdirs()
     val lockFilesChanged = checkAndUpdateLockfiles(lockFiles, outputFolder)
-    if (lockFilesChanged || outputFile.exists().not()) {
-      ProcessBuilder(command)
-          .directory(workingDirectory)
-          .redirectOutput(ProcessBuilder.Redirect.to(outputFile))
-          .redirectError(ProcessBuilder.Redirect.INHERIT)
-          .start()
-          .waitFor(5, TimeUnit.MINUTES)
+    if (lockFilesChanged || outputFile.exists().not() || outputFile.length() != 0L) {
+      val process =
+          ProcessBuilder(command)
+              .directory(workingDirectory)
+              .redirectOutput(ProcessBuilder.Redirect.to(outputFile))
+              .redirectError(ProcessBuilder.Redirect.INHERIT)
+              .start()
+      val finished = process.waitFor(5, TimeUnit.MINUTES)
+      if (!finished || (process.exitValue() != 0)) {
+        val prefixCommand =
+            "ERROR: autolinkLibrariesFromCommand: process ${command.joinToString(" ")}"
+        val message =
+            if (!finished) "${prefixCommand} timed out"
+            else "${prefixCommand} exited with error code: ${process.exitValue()}"
+        val logger = Logging.getLogger("ReactSettingsExtension")
+        logger.error(message)
+        if (outputFile.length() != 0L) {
+          logger.error(outputFile.readText().substring(0, 1024))
+        }
+        outputFile.delete()
+        throw GradleException(message)
+      }
     }
     linkLibraries(getLibrariesToAutolink(outputFile))
   }
@@ -118,6 +135,8 @@ abstract class ReactSettingsExtension @Inject constructor(val settings: Settings
           // We handle scenarios where there are deps that are
           // iOS-only or missing the Android configs.
           ?.filter { it.platforms?.android?.sourceDir != null }
+          // We want to skip dependencies that are pure C++ as they won't contain a .gradle file.
+          ?.filterNot { it.platforms?.android?.isPureCxxDependency == true }
           ?.associate { deps ->
             ":${deps.nameCleansed}" to File(deps.platforms?.android?.sourceDir)
           } ?: emptyMap()

package/settings-plugin/src/test/kotlin/com/facebook/react/ReactSettingsExtensionTest.kt

@@ -86,7 +86,8 @@ class ReactSettingsExtensionTest {
                 "cxxModuleCMakeListsModuleName": null,
                 "cxxModuleCMakeListsPath": null,
                 "cxxModuleHeaderName": null,
-                "dependencyConfiguration": "implementation"
+                "dependencyConfiguration": "implementation",
+                "isPureCxxDependency": false
               }
             }
           }

package/shared/src/main/kotlin/com/facebook/react/model/ModelAutolinkingDependenciesPlatformAndroidJson.kt

@@ -18,5 +18,6 @@ data class ModelAutolinkingDependenciesPlatformAndroidJson(
     val cxxModuleCMakeListsModuleName: String? = null,
     val cxxModuleCMakeListsPath: String? = null,
     val cxxModuleHeaderName: String? = null,
-    val dependencyConfiguration: String? = null
+    val dependencyConfiguration: String? = null,
+    val isPureCxxDependency: Boolean? = null
 )

package/shared/src/test/kotlin/com/facebook/react/utils/JsonUtilsTest.kt

@@ -216,7 +216,8 @@ class JsonUtilsTest {
                 "cxxModuleCMakeListsModuleName": null,
                 "cxxModuleCMakeListsPath": null,
                 "cxxModuleHeaderName": null,
-                "dependencyConfiguration": "implementation"
+                "dependencyConfiguration": "implementation",
+                "isPureCxxDependency": false
               }
             }
           }
@@ -298,6 +299,11 @@ class JsonUtilsTest {
             .platforms!!
             .android!!
             .dependencyConfiguration)
+    assertFalse(
+        parsed.dependencies!!["@react-native/oss-library-example"]!!
+            .platforms!!
+            .android!!
+            .isPureCxxDependency!!)
   }
 
   private fun createJsonFile(@Language("JSON") input: String) =