react-native-tvos 0.71.7-0rc0 → 0.71.7-0rc1

package/Libraries/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 71,
   patch: 7,
-  prerelease: '0rc0',
+  prerelease: '0rc1',
 };

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(71),
                   RCTVersionPatch: @(7),
-                  RCTVersionPrerelease: @"0rc0",
+                  RCTVersionPrerelease: @"0rc1",
                   };
   });
   return __rnVersion;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.71.7-0rc0
+VERSION_NAME=0.71.7-0rc1
 
 # GROUP=com.facebook.react
 # Group for the TV repo

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 71,
       "patch", 7,
-      "prerelease", "0rc0");
+      "prerelease", "0rc1");
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 71;
   int32_t Patch = 7;
-  std::string_view Prerelease = "0rc0";
+  std::string_view Prerelease = "0rc1";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.71.7-0rc0",
+  "version": "0.71.7-0rc1",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",

package/template/android/app/build.gradle

@@ -156,7 +156,7 @@ dependencies {
     // in gradle.properties for now
     // We also use the io.github.react-native-tvos group for the react-android and hermes-android dependencies
 
-    implementation("io.github.react-native-tvos:react-android:${REACT_NATIVE_TV_VERSION_STRING}")
+    implementation("io.github.react-native-tvos:react-android")
 
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
 
@@ -167,7 +167,7 @@ dependencies {
 
     debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
     if (hermesEnabled.toBoolean()) {
-        implementation("io.github.react-native-tvos:hermes-android:${REACT_NATIVE_TV_VERSION_STRING}")
+        implementation("io.github.react-native-tvos:hermes-android")
     } else {
         implementation jscFlavor
     }

package/template/android/gradle.properties

@@ -42,7 +42,3 @@ newArchEnabled=false
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
-
-# react-native-gradle-plugin does not yet set the version automatically
-# for the TV repo, so we set the version here
-REACT_NATIVE_TV_VERSION_STRING=0.71.7-0rc0

package/template/package.json

@@ -3,6 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
+    "postinstall": "patch-package",
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "lint": "eslint .",
@@ -11,7 +12,7 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.71.7-0rc0"
+    "react-native": "npm:react-native-tvos@0.71.7-0rc1"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
@@ -26,6 +27,7 @@
     "eslint": "^8.19.0",
     "jest": "^29.2.1",
     "metro-react-native-babel-preset": "0.73.9",
+    "patch-package": "^7.0.0",
     "prettier": "^2.4.1",
     "react-test-renderer": "18.2.0",
     "typescript": "4.8.4"

package/template/patches/react-native-gradle-plugin+0.71.17.patch

@@ -0,0 +1,76 @@
+diff --git a/node_modules/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt b/node_modules/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
+index 10f4b74..ab8bdc1 100644
+--- a/node_modules/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
++++ b/node_modules/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
+@@ -19,6 +19,7 @@ import com.facebook.react.utils.AgpConfiguratorUtils.configureDevPorts
+ import com.facebook.react.utils.BackwardCompatUtils.configureBackwardCompatibilityReactMap
+ import com.facebook.react.utils.DependencyUtils.configureDependencies
+ import com.facebook.react.utils.DependencyUtils.configureRepositories
++import com.facebook.react.utils.DependencyUtils.readGroupString
+ import com.facebook.react.utils.DependencyUtils.readVersionString
+ import com.facebook.react.utils.JsonUtils
+ import com.facebook.react.utils.NdkConfiguratorUtils.configureReactNativeNdk
+@@ -56,7 +57,8 @@ class ReactPlugin : Plugin<Project> {
+         val reactNativeDir = extension.reactNativeDir.get().asFile
+         val propertiesFile = File(reactNativeDir, "ReactAndroid/gradle.properties")
+         val versionString = readVersionString(propertiesFile)
+-        configureDependencies(project, versionString)
++        val groupString = readGroupString(propertiesFile)
++        configureDependencies(project, versionString, groupString)
+         configureRepositories(project, reactNativeDir)
+       }
+ 
+diff --git a/node_modules/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt b/node_modules/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt
+index c8760f6..c28cd2c 100644
+--- a/node_modules/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt
++++ b/node_modules/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt
+@@ -43,7 +43,7 @@ internal object DependencyUtils {
+    * - 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(project: Project, versionString: String) {
++  fun configureDependencies(project: Project, versionString: String, groupString: String = defaultGroupString) {
+     if (versionString.isBlank()) return
+     project.rootProject.allprojects { eachProject ->
+       eachProject.configurations.all { configuration ->
+@@ -53,17 +53,17 @@ internal object DependencyUtils {
+         // implementation("com.facebook.react:react-native:+") and resolve the right dependency.
+         configuration.resolutionStrategy.dependencySubstitution {
+           it.substitute(it.module("com.facebook.react:react-native"))
+-              .using(it.module("com.facebook.react:react-android:${versionString}"))
++              .using(it.module("${groupString}:react-android:${versionString}"))
+               .because(
+                   "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210.")
+           it.substitute(it.module("com.facebook.react:hermes-engine"))
+-              .using(it.module("com.facebook.react:hermes-android:${versionString}"))
++              .using(it.module("${groupString}:hermes-android:${versionString}"))
+               .because(
+                   "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210.")
+         }
+         configuration.resolutionStrategy.force(
+-            "com.facebook.react:react-android:${versionString}",
+-            "com.facebook.react:hermes-android:${versionString}",
++            "${groupString}:react-android:${versionString}",
++            "${groupString}:hermes-android:${versionString}",
+         )
+       }
+     }
+@@ -81,9 +81,18 @@ internal object DependencyUtils {
+     }
+   }
+ 
++  // Allows react-native-tvos to get its dependencies correctly with its custom Maven group name
++  fun readGroupString(propertiesFile: File): String {
++    val reactAndroidProperties = Properties()
++    propertiesFile.inputStream().use { reactAndroidProperties.load(it) }
++    return reactAndroidProperties["GROUP"] as? String ?: defaultGroupString
++  }
++
+   fun Project.mavenRepoFromUrl(url: String): MavenArtifactRepository =
+       project.repositories.maven { it.url = URI.create(url) }
+ 
+   fun Project.mavenRepoFromURI(uri: URI): MavenArtifactRepository =
+       project.repositories.maven { it.url = uri }
++
++  val defaultGroupString = "com.facebook.react"
+ }