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

package/gradle/libs.versions.toml

@@ -5,6 +5,7 @@ guava = "31.0.1-jre"
 javapoet = "1.13.0"
 junit = "4.13.2"
 kotlin = "1.9.24"
+assertj = "3.25.1"
 
 [libraries]
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -13,6 +14,7 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 javapoet = { module = "com.squareup:javapoet", version.ref = "javapoet" }
 junit = {module = "junit:junit", version.ref = "junit" }
+assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/gradle-plugin",
-  "version": "0.75.0-rc.6",
+  "version": "0.75.0",
   "description": "Gradle Plugin for React Native",
   "license": "MIT",
   "repository": {
@@ -32,6 +32,7 @@
     "README.md",
     "react-native-gradle-plugin",
     "settings-plugin",
-    "shared"
+    "shared",
+    "shared-testutil"
   ]
 }

package/react-native-gradle-plugin/build.gradle.kts

@@ -50,6 +50,8 @@ dependencies {
   implementation(libs.javapoet)
 
   testImplementation(libs.junit)
+  testImplementation(libs.assertj)
+  testImplementation(project(":shared-testutil"))
 
   testRuntimeOnly(
       files(

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

@@ -184,19 +184,23 @@ abstract class ReactExtension @Inject constructor(val project: Project) {
     internal fun getGradleDependenciesToApply(inputFile: File): MutableList<Pair<String, String>> {
       val model = JsonUtils.fromAutolinkingConfigJson(inputFile)
       val result = mutableListOf<Pair<String, String>>()
-      model?.dependencies?.values?.forEach { deps ->
-        val nameCleansed = deps.nameCleansed
-        val dependencyConfiguration = deps.platforms?.android?.dependencyConfiguration
-        val buildTypes = deps.platforms?.android?.buildTypes ?: emptyList()
-        if (buildTypes.isEmpty()) {
-          result.add((dependencyConfiguration ?: "implementation") to ":$nameCleansed")
-        } else {
-          buildTypes.forEach { buildType ->
-            result.add(
-                (dependencyConfiguration ?: "${buildType}Implementation") to ":$nameCleansed")
+      model
+          ?.dependencies
+          ?.values
+          ?.filter { it.platforms?.android !== null }
+          ?.forEach { deps ->
+            val nameCleansed = deps.nameCleansed
+            val dependencyConfiguration = deps.platforms?.android?.dependencyConfiguration
+            val buildTypes = deps.platforms?.android?.buildTypes ?: emptyList()
+            if (buildTypes.isEmpty()) {
+              result.add((dependencyConfiguration ?: "implementation") to ":$nameCleansed")
+            } else {
+              buildTypes.forEach { buildType ->
+                result.add(
+                    (dependencyConfiguration ?: "${buildType}Implementation") to ":$nameCleansed")
+              }
+            }
           }
-        }
-      }
       return result
     }
   }

package/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/NdkConfiguratorUtils.kt

@@ -113,6 +113,7 @@ internal object NdkConfiguratorUtils {
               "**/libreact_utils.so",
               "**/librrc_image.so",
               "**/librrc_legacyviewmanagerinterop.so",
+              "**/librrc_textinput.so",
               "**/librrc_view.so",
               "**/libruntimeexecutor.so",
               "**/libturbomodulejsijni.so",

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

@@ -8,8 +8,8 @@
 package com.facebook.react
 
 import com.facebook.react.ReactExtension.Companion.getGradleDependenciesToApply
+import org.assertj.core.api.Assertions.assertThat
 import org.intellij.lang.annotations.Language
-import org.junit.Assert.*
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
@@ -30,7 +30,7 @@ class ReactExtensionTest {
                 .trimIndent())
 
     val deps = getGradleDependenciesToApply(validJsonFile)
-    assertEquals(0, deps.size)
+    assertThat(deps).isEmpty()
   }
 
   @Test
@@ -57,8 +57,7 @@ class ReactExtensionTest {
                 .trimIndent())
 
     val deps = getGradleDependenciesToApply(validJsonFile)
-    assertEquals(1, deps.size)
-    assertTrue("implementation" to ":react-native_oss-library-example" in deps)
+    assertThat(deps).containsExactly("implementation" to ":react-native_oss-library-example")
   }
 
   @Test
@@ -86,8 +85,7 @@ class ReactExtensionTest {
                 .trimIndent())
 
     val deps = getGradleDependenciesToApply(validJsonFile)
-    assertEquals(1, deps.size)
-    assertTrue("compileOnly" to ":react-native_oss-library-example" in deps)
+    assertThat(deps).containsExactly("compileOnly" to ":react-native_oss-library-example")
   }
 
   @Test
@@ -115,9 +113,10 @@ class ReactExtensionTest {
                 .trimIndent())
 
     val deps = getGradleDependenciesToApply(validJsonFile)
-    assertEquals(2, deps.size)
-    assertTrue("debugImplementation" to ":react-native_oss-library-example" in deps)
-    assertTrue("releaseImplementation" to ":react-native_oss-library-example" in deps)
+    assertThat(deps)
+        .containsExactly(
+            "debugImplementation" to ":react-native_oss-library-example",
+            "releaseImplementation" to ":react-native_oss-library-example")
   }
 
   @Test
@@ -154,9 +153,40 @@ class ReactExtensionTest {
                 .trimIndent())
 
     val deps = getGradleDependenciesToApply(validJsonFile)
-    assertEquals(2, deps.size)
-    assertTrue("implementation" to ":react-native_oss-library-example" in deps)
-    assertTrue("implementation" to ":react-native_another-library-for-testing" in deps)
+    assertThat(deps)
+        .containsExactly(
+            "implementation" to ":react-native_oss-library-example",
+            "implementation" to ":react-native_another-library-for-testing")
+  }
+
+  @Test
+  fun getGradleDependenciesToApply_withiOSOnlyLibrary_returnsEmptyDepsMap() {
+    val validJsonFile =
+        createJsonFile(
+            """
+      {
+        "reactNativeVersion": "1000.0.0",
+        "dependencies": {
+          "@react-native/oss-library-example": {
+            "root": "./node_modules/@react-native/oss-library-example",
+            "name": "@react-native/oss-library-example",
+            "platforms": {
+              "ios": {
+                "podspecPath": "./node_modules/@react-native/oss-library-example/oss-library-example.podspec",
+                "version": "0.0.0",
+                "configurations": [],
+                "scriptPhases": []
+              },
+              "android": null
+            }
+          }
+        }
+      }
+      """
+                .trimIndent())
+
+    val deps = getGradleDependenciesToApply(validJsonFile)
+    assertThat(deps).isEmpty()
   }
 
   private fun createJsonFile(@Language("JSON") input: String) =

package/settings-plugin/build.gradle.kts

@@ -40,6 +40,7 @@ dependencies {
   implementation(libs.javapoet)
 
   testImplementation(libs.junit)
+  testImplementation(project(":shared-testutil"))
 
   testRuntimeOnly(
       files(

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

@@ -8,6 +8,7 @@
 package com.facebook.react
 
 import com.facebook.react.utils.JsonUtils
+import com.facebook.react.utils.windowsAwareCommandLine
 import java.io.File
 import java.math.BigInteger
 import java.security.MessageDigest
@@ -25,6 +26,11 @@ abstract class ReactSettingsExtension @Inject constructor(val settings: Settings
   private val outputFolder =
       settings.layout.rootDirectory.file("build/generated/autolinking/").asFile
 
+  private val defaultConfigCommand: List<String> =
+      windowsAwareCommandLine(listOf("npx", "@react-native-community/cli", "config")).map {
+        it.toString()
+      }
+
   /**
    * Utility function to autolink libraries using an external command as source of truth.
    *
@@ -39,7 +45,7 @@ abstract class ReactSettingsExtension @Inject constructor(val settings: Settings
    */
   @JvmOverloads
   public fun autolinkLibrariesFromCommand(
-      command: List<String> = listOf("npx", "@react-native-community/cli", "config"),
+      command: List<String> = defaultConfigCommand,
       workingDirectory: File? = settings.layout.rootDirectory.dir("../").asFile,
       lockFiles: FileCollection =
           settings.layout.rootDirectory

package/settings.gradle.kts

@@ -19,6 +19,7 @@ include(
     ":react-native-gradle-plugin",
     ":settings-plugin",
     ":shared",
+    ":shared-testutil",
 )
 
 rootProject.name = "gradle-plugins-root"

package/shared/build.gradle.kts

@@ -18,6 +18,7 @@ dependencies {
   implementation(libs.gson)
   implementation(libs.guava)
   testImplementation(libs.junit)
+  testImplementation(project(":shared-testutil"))
 }
 
 java { targetCompatibility = JavaVersion.VERSION_11 }

package/{react-native-gradle-plugin → shared}/src/main/kotlin/com/facebook/react/utils/Os.kt

@@ -10,7 +10,7 @@ package com.facebook.react.utils
 import com.facebook.react.utils.KotlinStdlibCompatUtils.lowercaseCompat
 import java.io.File
 
-internal object Os {
+object Os {
 
   fun isWindows(): Boolean =
       System.getProperty("os.name")?.lowercaseCompat()?.contains("windows") ?: false

package/{react-native-gradle-plugin → shared}/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt

@@ -7,17 +7,17 @@
 
 package com.facebook.react.utils
 
-internal fun windowsAwareCommandLine(vararg args: Any): List<Any> =
+fun windowsAwareCommandLine(vararg args: Any): List<Any> =
     windowsAwareCommandLine(args.toList())
 
-internal fun windowsAwareCommandLine(args: List<Any>): List<Any> =
+fun windowsAwareCommandLine(args: List<Any>): List<Any> =
     if (Os.isWindows()) {
       listOf("cmd", "/c") + args
     } else {
       args
     }
 
-internal fun windowsAwareBashCommandLine(
+fun windowsAwareBashCommandLine(
     vararg args: String,
     bashWindowsHome: String? = null
 ): List<String> =

package/shared-testutil/build.gradle.kts

@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins { alias(libs.plugins.kotlin.jvm) }
+
+repositories { mavenCentral() }
+
+group = "com.facebook.react"
+
+dependencies { implementation(libs.junit) }
+
+java { targetCompatibility = JavaVersion.VERSION_11 }
+
+kotlin { jvmToolchain(17) }
+
+tasks.withType<KotlinCompile>().configureEach {
+  kotlinOptions {
+    apiVersion = "1.6"
+    jvmTarget = "11"
+    allWarningsAsErrors = true
+  }
+}
+
+tasks.withType<Test>().configureEach {
+  testLogging {
+    exceptionFormat = TestExceptionFormat.FULL
+    showExceptions = true
+    showCauses = true
+    showStackTraces = true
+  }
+}