react-native 0.65.0-rc.3 → 0.65.2

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.65.0-rc.3
+VERSION_NAME=0.65.2
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java

@@ -8,6 +8,7 @@
 package com.facebook.react;
 
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import androidx.annotation.Nullable;
@@ -120,6 +121,12 @@ public abstract class ReactActivity extends AppCompatActivity
     mDelegate.onWindowFocusChanged(hasFocus);
   }
 
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    mDelegate.onConfigurationChanged(newConfig);
+  }
+
   protected final ReactNativeHost getReactNativeHost() {
     return mDelegate.getReactNativeHost();
   }

package/ReactAndroid/src/main/java/com/facebook/react/ReactActivityDelegate.java

@@ -11,6 +11,7 @@ import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.KeyEvent;
@@ -154,6 +155,12 @@ public class ReactActivityDelegate {
     }
   }
 
+  public void onConfigurationChanged(Configuration newConfig) {
+    if (getReactNativeHost().hasInstance()) {
+      getReactInstanceManager().onConfigurationChanged(getContext(), newConfig);
+    }
+  }
+
   @TargetApi(Build.VERSION_CODES.M)
   public void requestPermissions(
       String[] permissions, int requestCode, PermissionListener listener) {

package/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.java

@@ -7,6 +7,7 @@
 
 package com.facebook.react.modules.appearance;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
 import androidx.annotation.Nullable;
@@ -74,7 +75,15 @@ public class AppearanceModule extends NativeAppearanceSpec {
 
   @Override
   public String getColorScheme() {
-    mColorScheme = colorSchemeForCurrentConfiguration(getReactApplicationContext());
+    // Attempt to use the Activity context first in order to get the most up to date
+    // scheme. This covers the scenario when AppCompatDelegate.setDefaultNightMode()
+    // is called directly (which can occur in Brownfield apps for example).
+    Activity activity = getCurrentActivity();
+
+    mColorScheme =
+        colorSchemeForCurrentConfiguration(
+            activity != null ? activity : getReactApplicationContext());
+
     return mColorScheme;
   }
 

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

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 65,
-      "patch", 0,
-      "prerelease", "rc.3");
+      "patch", 2,
+      "prerelease", null);
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java

@@ -325,6 +325,21 @@ import java.util.Map;
     }
   }
 
+  private static class BoxedColorPropSetter extends PropSetter {
+
+    public BoxedColorPropSetter(ReactProp prop, Method setter) {
+      super(prop, "mixed", setter);
+    }
+
+    @Override
+    protected @Nullable Object getValueOrDefault(Object value, Context context) {
+      if (value != null) {
+        return ColorPropConverter.getColor(value, context);
+      }
+      return null;
+    }
+  }
+
   /*package*/ static Map<String, String> getNativePropsForView(
       Class<? extends ViewManager> viewManagerTopClass,
       Class<? extends ReactShadowNode> shadowNodeTopClass) {
@@ -418,7 +433,7 @@ import java.util.Map;
       return new BoxedBooleanPropSetter(annotation, method);
     } else if (propTypeClass == Integer.class) {
       if ("Color".equals(annotation.customType())) {
-        return new ColorPropSetter(annotation, method);
+        return new BoxedColorPropSetter(annotation, method);
       }
       return new BoxedIntPropSetter(annotation, method);
     } else if (propTypeClass == ReadableArray.class) {

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,8 +17,8 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 65;
-  int32_t Patch = 0;
-  std::string_view Prerelease = "rc.3";
+  int32_t Patch = 2;
+  std::string_view Prerelease = "";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.aar.md5

@@ -0,0 +1 @@
+9f12b8b1b21dc36149c63b362be0a824

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.aar.sha1

@@ -0,0 +1 @@
+ae8570c226297eee1206e33c8fbcaa956b4105fc

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.aar.sha256

@@ -0,0 +1 @@
+d13d4762755816a83930c2704a58174b03689dc65d2314d5844d26ced608ecfd

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.aar.sha512

@@ -0,0 +1 @@
+4380186a22b704f5272c2b2e549d53c9422197b1bf1b71ddaef2ea27d03056cadf121d49aa70a1d13e33e7e7bb4f41e48c25dffe4887d87a6b51d74870f69af4

package/android/com/facebook/react/react-native/{0.65.0-rc.3/react-native-0.65.0-rc.3.module → 0.65.2/react-native-0.65.2.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "com.facebook.react",
     "module": "react-native",
-    "version": "0.65.0-rc.3",
+    "version": "0.65.2",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -11,7 +11,7 @@
   "createdBy": {
     "gradle": {
       "version": "6.9",
-      "buildId": "vnyvpcgkj5cwddxuwylywsyyty"
+      "buildId": "2sbetvekoncltfz7ihbu43oj4i"
     }
   },
   "variants": [
@@ -125,13 +125,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.65.0-rc.3.aar",
-          "url": "react-native-0.65.0-rc.3.aar",
-          "size": 17646548,
-          "sha512": "7866095d4f1a689856231636e16d3d40a5a8eda99271d91023c98a1429801b28f172c05f3a9918a3bd0955a90aea134e9982186fe1aa8aaa956dfdd93b92ea8b",
-          "sha256": "0dc661a2f33f37acac50cb546f7cb6425c3bc06410cfb69b6f405641e879b197",
-          "sha1": "cd6458c0f8700ea1972bcc298a05eb6c9ac1ac1f",
-          "md5": "f1e9c4941681b43175620f69d8aefcc1"
+          "name": "react-native-0.65.2.aar",
+          "url": "react-native-0.65.2.aar",
+          "size": 17647573,
+          "sha512": "4380186a22b704f5272c2b2e549d53c9422197b1bf1b71ddaef2ea27d03056cadf121d49aa70a1d13e33e7e7bb4f41e48c25dffe4887d87a6b51d74870f69af4",
+          "sha256": "d13d4762755816a83930c2704a58174b03689dc65d2314d5844d26ced608ecfd",
+          "sha1": "ae8570c226297eee1206e33c8fbcaa956b4105fc",
+          "md5": "9f12b8b1b21dc36149c63b362be0a824"
         }
       ]
     },
@@ -245,13 +245,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.65.0-rc.3.aar",
-          "url": "react-native-0.65.0-rc.3.aar",
-          "size": 17646548,
-          "sha512": "7866095d4f1a689856231636e16d3d40a5a8eda99271d91023c98a1429801b28f172c05f3a9918a3bd0955a90aea134e9982186fe1aa8aaa956dfdd93b92ea8b",
-          "sha256": "0dc661a2f33f37acac50cb546f7cb6425c3bc06410cfb69b6f405641e879b197",
-          "sha1": "cd6458c0f8700ea1972bcc298a05eb6c9ac1ac1f",
-          "md5": "f1e9c4941681b43175620f69d8aefcc1"
+          "name": "react-native-0.65.2.aar",
+          "url": "react-native-0.65.2.aar",
+          "size": 17647573,
+          "sha512": "4380186a22b704f5272c2b2e549d53c9422197b1bf1b71ddaef2ea27d03056cadf121d49aa70a1d13e33e7e7bb4f41e48c25dffe4887d87a6b51d74870f69af4",
+          "sha256": "d13d4762755816a83930c2704a58174b03689dc65d2314d5844d26ced608ecfd",
+          "sha1": "ae8570c226297eee1206e33c8fbcaa956b4105fc",
+          "md5": "9f12b8b1b21dc36149c63b362be0a824"
         }
       ]
     }

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.module.md5

@@ -0,0 +1 @@
+92cf8478aa5bd70f71b7339799e01f4c

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.module.sha1

@@ -0,0 +1 @@
+fbb6013b12fc2eec44ee4985060eb931d5df74ba

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.module.sha256

@@ -0,0 +1 @@
+d3be54c8a6ef6706e312d24ed5aec328d027aae1a5dea99c9ead5797a7793ddf

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.module.sha512

@@ -0,0 +1 @@
+8603a7fa7f35a05a3a0e34a0b4c8ce04ba488a0f8b9d25aa417033f1a2e2802d373c8443fda36a963074f1e15d6bb98a44709ee81fb7c320fd35ed5924085aad

package/android/com/facebook/react/react-native/{0.65.0-rc.3/react-native-0.65.0-rc.3.pom → 0.65.2/react-native-0.65.2.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.65.0-rc.3</version>
+  <version>0.65.2</version>
   <packaging>aar</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.pom.md5

@@ -0,0 +1 @@
+c2e880374444723e5b7f487ac88f5a26

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.pom.sha1

@@ -0,0 +1 @@
+751b1842f50e6488f158073949f2701ccce24d19

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.pom.sha256

@@ -0,0 +1 @@
+e54f9c3f4ddd9821e6b25fc1dc756d7aebee3d0bc3df844fdc28d17922f525c2

package/android/com/facebook/react/react-native/0.65.2/react-native-0.65.2.pom.sha512

@@ -0,0 +1 @@
+8c8ce04d110988c323ebfce8421688753efd953edeefdd0ec6c430b8c511aa31968e4933faad4de999cd6d6ffd5b456d85918ea8ddd986ebd7ed3f2772ae7174

package/android/com/facebook/react/react-native/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <latest>0.65.0-rc.3</latest>
-    <release>0.65.0-rc.3</release>
+    <latest>0.65.2</latest>
+    <release>0.65.2</release>
     <versions>
-      <version>0.65.0-rc.3</version>
+      <version>0.65.2</version>
     </versions>
-    <lastUpdated>20210723160406</lastUpdated>
+    <lastUpdated>20211104072303</lastUpdated>
   </versioning>
 </metadata>

package/android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -1 +1 @@
-d923fc898c96cd8032c1e944fe5d8403
+b8b576a7b77c7f163d6b7270ac09ce35

package/android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -1 +1 @@
-048d07b9829c3f24bd02a2f86ba1e3fa8d89dd2a
+d5042457c67ee8dc7bd7f5b0a0ae7f95a0571074

package/android/com/facebook/react/react-native/maven-metadata.xml.sha256

@@ -1 +1 @@
-6de87d21cff951660efbb538aa487afab79f545501a63a6de5744b3babe181bb
+2def014f5f410150f7286b2b4f57889117230b535e9d16543dc7dd8bb34768e1

package/android/com/facebook/react/react-native/maven-metadata.xml.sha512

@@ -1 +1 @@
-171dfb77d02292b3fbfde9171b1bb078c0ab9e76748fd90d856dc39b0f9df3b46035bda98469bdf2fc4f46db9d47424438e87358a748b956aa981011fb75cb4d
+32e345c332bbc42058e86b12cfe4e936071fd23abedc0ee6dab02582bfa5fadd0e41ef8208ccdff291c6e1ae8e3ad531b75b6c3e4a0b0e180528fae26858bae0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.65.0-rc.3",
+  "version": "0.65.2",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -85,9 +85,9 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^27.0.1",
-    "@react-native-community/cli": "^6.0.0-rc.0",
-    "@react-native-community/cli-platform-android": "^6.0.0-rc.0",
-    "@react-native-community/cli-platform-ios": "^6.0.0-rc.0",
+    "@react-native-community/cli": "^6.0.0",
+    "@react-native-community/cli-platform-android": "^6.0.0",
+    "@react-native-community/cli-platform-ios": "^6.0.0",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "1.0.0",
     "@react-native/polyfills": "1.0.0",
@@ -109,7 +109,7 @@
     "react-devtools-core": "^4.6.0",
     "react-refresh": "^0.4.0",
     "regenerator-runtime": "^0.13.2",
-    "scheduler": "^0.20.1",
+    "scheduler": "^0.20.2",
     "stacktrace-parser": "^0.1.3",
     "use-subscription": "^1.0.0",
     "whatwg-fetch": "^3.0.0",

package/scripts/generate-specs.sh

@@ -27,13 +27,14 @@ set -e
 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 TEMP_DIR=$(mktemp -d /tmp/react-native-codegen-XXXXXXXX)
 RN_DIR=$(cd "$THIS_DIR/.." && pwd)
-NODE_BINARY="${NODE_BINARY:-$(command -v node || true)}"
 USE_FABRIC="${USE_FABRIC:-0}"
 
 # Find path to Node
 # shellcheck source=/dev/null
 source "$RN_DIR/scripts/find-node.sh"
 
+NODE_BINARY="${NODE_BINARY:-$(command -v node || true)}"
+
 cleanup () {
   set +e
   rm -rf "$TEMP_DIR"

package/scripts/react_native_pods.rb

@@ -152,31 +152,33 @@ end
 def use_react_native_codegen!(spec, options={})
   return if ENV['DISABLE_CODEGEN'] == '1'
 
-  # The path to react-native
-  prefix = options[:path] ||= "${PODS_TARGET_SRCROOT}/../.."
+  # The prefix to react-native
+  prefix = options[:react_native_path] ||= "../.."
 
   # The path to JavaScript files
   js_srcs = options[:js_srcs_dir] ||= "#{prefix}/Libraries"
 
   # Library name (e.g. FBReactNativeSpec)
-  modules_library_name = spec.name
-  modules_output_dir = "React/#{modules_library_name}/#{modules_library_name}"
+  modules_library_name = options[:library_name] ||= spec.name
 
-  # Run the codegen as part of the Xcode build pipeline.
-  env_vars = "SRCS_DIR=#{js_srcs}"
-  env_vars += " MODULES_OUTPUT_DIR=#{prefix}/#{modules_output_dir}"
-  env_vars += " MODULES_LIBRARY_NAME=#{modules_library_name}"
+  # Output dir, relative to podspec that invoked this method
+  modules_output_dir = options[:modules_output_dir] ||= "#{prefix}/React/#{modules_library_name}/#{modules_library_name}"
 
   generated_dirs = [ modules_output_dir ]
   generated_filenames = [ "#{modules_library_name}.h", "#{modules_library_name}-generated.mm" ]
   generated_files = generated_filenames.map { |filename| "#{modules_output_dir}/#{filename}" }
 
+  # Run the codegen as part of the Xcode build pipeline.
+  env_vars = "SRCS_DIR='${PODS_TARGET_SRCROOT}/#{js_srcs}'"
+  env_vars += " MODULES_OUTPUT_DIR='${PODS_TARGET_SRCROOT}/#{modules_output_dir}'"
+  env_vars += " MODULES_LIBRARY_NAME='#{modules_library_name}'"
+
   if ENV['USE_FABRIC'] == '1'
     # We use a different library name for components, as well as an additional set of files.
     # Eventually, we want these to be part of the same library as #{modules_library_name} above.
-    components_output_dir = "ReactCommon/react/renderer/components/rncore/"
+    components_output_dir = options[:components_output_dir] ||= "#{prefix}/ReactCommon/react/renderer/components/rncore/"
     generated_dirs.push components_output_dir
-    env_vars += " COMPONENTS_OUTPUT_DIR=#{prefix}/#{components_output_dir}"
+    env_vars += " COMPONENTS_OUTPUT_DIR='${PODS_TARGET_SRCROOT}/#{components_output_dir}'"
     components_generated_filenames = [
       "ComponentDescriptors.h",
       "EventEmitters.cpp",
@@ -190,13 +192,21 @@ def use_react_native_codegen!(spec, options={})
     generated_files = generated_files.concat(components_generated_filenames.map { |filename| "#{components_output_dir}/#{filename}" })
   end
 
+  # Prepare filesystem by creating empty files that will be picked up as references by CocoaPods.
+  prepare_command = "mkdir -p #{generated_dirs.join(" ")} && touch -a #{generated_files.join(" ")}"
+  system(prepare_command) # Always run prepare_command when a podspec uses the codegen, as CocoaPods may skip invoking this command in certain scenarios
+  spec.prepare_command = prepare_command
+
   spec.script_phase = {
     :name => 'Generate Specs',
-    :input_files => [js_srcs],
-    :output_files => ["${DERIVED_FILE_DIR}/codegen-#{modules_library_name}.log"].concat(generated_files.map { |filename| "#{prefix}/#{filename}"} ),
-    :script => "set -o pipefail\n\nbash -l -c '#{env_vars} ${PODS_TARGET_SRCROOT}/../../scripts/generate-specs.sh' 2>&1 | tee \"${SCRIPT_OUTPUT_FILE_0}\"",
+    :input_files => [ "${PODS_TARGET_SRCROOT}/#{js_srcs}" ], # This also needs to be relative to Xcode
+    :output_files => ["${DERIVED_FILE_DIR}/codegen-#{modules_library_name}.log"].concat(generated_files.map { |filename| " ${PODS_TARGET_SRCROOT}/#{filename}"} ),
+    # The final generated files will be created when this script is invoked at Xcode build time.
+    :script => %{set -o pipefail
+
+bash -l -c '#{env_vars} $\{PODS_TARGET_SRCROOT\}/#{prefix}/scripts/generate-specs.sh' 2>&1 | tee "${SCRIPT_OUTPUT_FILE_0}"
+    },
     :execution_position => :before_compile,
     :show_env_vars_in_log => true
   }
-  spec.prepare_command = "mkdir -p #{generated_dirs.reduce("") { |str, dir| "#{str} ../../#{dir}" }} && touch #{generated_files.reduce("") { |str, filename| "#{str} ../../#{filename}" }}"
 end

package/template/android/app/build.gradle

@@ -210,7 +210,7 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "17.0.2",
-    "react-native": "0.65.0-rc.3"
+    "react-native": "0.65.2"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",
@@ -22,7 +22,7 @@
     "jest": "^26.6.3",
     "metro-react-native-babel-preset": "^0.66.0",
     "react-native-codegen": "^0.0.7",
-    "react-test-renderer": "17.0.1"
+    "react-test-renderer": "17.0.2"
   },
   "jest": {
     "preset": "react-native"

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.aar.md5

@@ -1 +0,0 @@
-f1e9c4941681b43175620f69d8aefcc1

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.aar.sha1

@@ -1 +0,0 @@
-cd6458c0f8700ea1972bcc298a05eb6c9ac1ac1f

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.aar.sha256

@@ -1 +0,0 @@
-0dc661a2f33f37acac50cb546f7cb6425c3bc06410cfb69b6f405641e879b197

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.aar.sha512

@@ -1 +0,0 @@
-7866095d4f1a689856231636e16d3d40a5a8eda99271d91023c98a1429801b28f172c05f3a9918a3bd0955a90aea134e9982186fe1aa8aaa956dfdd93b92ea8b

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.module.md5

@@ -1 +0,0 @@
-914ca8f9ce1f8e035ed9693d521548a3

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.module.sha1

@@ -1 +0,0 @@
-95551ec3d2a3068d9bbdee20cbbce03a8377ae24

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.module.sha256

@@ -1 +0,0 @@
-3e171e7e8424950f931b762d99e1a9e79db9de0ea16b4f90b456db6c3092e7d0

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.module.sha512

@@ -1 +0,0 @@
-0ca2b5566ca71b69a9433575f2f17d461fa3e1947c8cac8897ba211e8d46e3eb7d4499a346275dec19ac56732e1c6eb4768b47564831edb3906bff8d584d9b31

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.pom.md5

@@ -1 +0,0 @@
-27992c8af709eb479c8a12f5eab9a87b

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.pom.sha1

@@ -1 +0,0 @@
-ba43dd489d0e7da7f49cb6fa0823e646e53a29cb

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.pom.sha256

@@ -1 +0,0 @@
-725c8d6334ec6d6ddf53031e9d661e9705c10cd85e497f33b3901e7b05631fdc

package/android/com/facebook/react/react-native/0.65.0-rc.3/react-native-0.65.0-rc.3.pom.sha512

@@ -1 +0,0 @@
-f4e8a911b077e3edeed6c5b3d667f473636adccb294851c9c7c80f47b5ec41bb971cf9ff03a1c561750e33445bf8a99327e33465dcc3eb83101f00b75f20641a