react-native 0.67.1 → 0.67.2

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 67,
-  patch: 1,
+  patch: 2,
   prerelease: null,
 };

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(67),
-                  RCTVersionPatch: @(1),
+                  RCTVersionPatch: @(2),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.67.1
+VERSION_NAME=0.67.2
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative
@@ -12,7 +12,7 @@ JUNIT_VERSION=4.12
 
 ANDROIDX_TEST_VERSION=1.1.0
 FRESCO_VERSION=2.5.0
-OKHTTP_VERSION=4.9.1
+OKHTTP_VERSION=4.9.2
 SO_LOADER_VERSION=0.10.1
 
 BOOST_VERSION=1_63_0

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

@@ -26,6 +26,7 @@ import android.view.Surface;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import androidx.annotation.Nullable;
@@ -775,9 +776,12 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
       getRootView().getWindowVisibleDisplayFrame(mVisibleViewArea);
       int notchHeight = 0;
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-        DisplayCutout displayCutout = getRootView().getRootWindowInsets().getDisplayCutout();
-        if (displayCutout != null) {
-          notchHeight = displayCutout.getSafeInsetTop();
+        WindowInsets insets = getRootView().getRootWindowInsets();
+        if (insets != null) {
+          DisplayCutout displayCutout = insets.getDisplayCutout();
+          if (displayCutout != null) {
+            notchHeight = displayCutout.getSafeInsetTop();
+          }
         }
       }
       final int heightDiff =

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", 67,
-      "patch", 1,
+      "patch", 2,
       "prerelease", null);
 }

package/ReactAndroid/src/main/third-party/java/okhttp/BUCK

@@ -30,8 +30,8 @@ rn_prebuilt_jar(
 
 fb_native.remote_file(
     name = "okhttp3-binary.jar",
-    sha1 = "51215279c3fe472c59b6b7dd7491e6ac2e28a81b",
-    url = "mvn:com.squareup.okhttp3:okhttp:jar:4.9.1",
+    sha1 = "5302714ee9320b64cf65ed865e5f65981ef9ba46",
+    url = "mvn:com.squareup.okhttp3:okhttp:jar:4.9.2",
 )
 
 rn_prebuilt_jar(
@@ -41,6 +41,6 @@ rn_prebuilt_jar(
 
 fb_native.remote_file(
     name = "okhttp3-urlconnection-binary.jar",
-    sha1 = "f45e809215bd0961350148cf5b78707865084e6f",
-    url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:4.9.1",
+    sha1 = "3b9e64d3d56370bc7488ed8b336d17a8013cb336",
+    url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:4.9.2",
 )

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,7 +17,7 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 67;
-  int32_t Patch = 1;
+  int32_t Patch = 2;
   std::string_view Prerelease = "";
 } ReactNativeVersion;
 

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

@@ -0,0 +1 @@
+283c3ad2a09a9b26bcf8632c2d0cc7ab

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

@@ -0,0 +1 @@
+6abbadc0b8174e42fb4f5d9f4a578deac714cc94

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

@@ -0,0 +1 @@
+393697ad0a9bfe604f6f249cb23abc590b32ad3fb36cfc8c5d86327951b82fae

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

@@ -0,0 +1 @@
+9fa54c888fd61fce49b65610c0eb3cd6795e5e31683105b3048a5b31c34f59dd749c48e55d5577ba45fcd624bb4041028071cde82a91208d402f9352a70337af

package/android/com/facebook/react/react-native/{0.67.1/react-native-0.67.1.module → 0.67.2/react-native-0.67.2.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "com.facebook.react",
     "module": "react-native",
-    "version": "0.67.1",
+    "version": "0.67.2",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -104,14 +104,14 @@
           "group": "com.squareup.okhttp3",
           "module": "okhttp",
           "version": {
-            "requires": "4.9.1"
+            "requires": "4.9.2"
           }
         },
         {
           "group": "com.squareup.okhttp3",
           "module": "okhttp-urlconnection",
           "version": {
-            "requires": "4.9.1"
+            "requires": "4.9.2"
           }
         },
         {
@@ -131,13 +131,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.67.1.aar",
-          "url": "react-native-0.67.1.aar",
-          "size": 17805003,
-          "sha512": "b2034a082707872a96fb32b275a401553d65024b5e28d65c8be05201989d58a3379ccf8ca4f58cf392a947bf34035c70828b466480b7878f5249e2ff3c8a5355",
-          "sha256": "a175bab26779def1b808e18963925998686d6f0a3e3c7c2381d8381f08cd202a",
-          "sha1": "99776638316fb1d7ba0cd3f7a3950d934e045b52",
-          "md5": "305b0d8c0acfa99c67563e216253202e"
+          "name": "react-native-0.67.2.aar",
+          "url": "react-native-0.67.2.aar",
+          "size": 17805049,
+          "sha512": "9fa54c888fd61fce49b65610c0eb3cd6795e5e31683105b3048a5b31c34f59dd749c48e55d5577ba45fcd624bb4041028071cde82a91208d402f9352a70337af",
+          "sha256": "393697ad0a9bfe604f6f249cb23abc590b32ad3fb36cfc8c5d86327951b82fae",
+          "sha1": "6abbadc0b8174e42fb4f5d9f4a578deac714cc94",
+          "md5": "283c3ad2a09a9b26bcf8632c2d0cc7ab"
         }
       ]
     },
@@ -231,14 +231,14 @@
           "group": "com.squareup.okhttp3",
           "module": "okhttp",
           "version": {
-            "requires": "4.9.1"
+            "requires": "4.9.2"
           }
         },
         {
           "group": "com.squareup.okhttp3",
           "module": "okhttp-urlconnection",
           "version": {
-            "requires": "4.9.1"
+            "requires": "4.9.2"
           }
         },
         {
@@ -258,13 +258,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.67.1.aar",
-          "url": "react-native-0.67.1.aar",
-          "size": 17805003,
-          "sha512": "b2034a082707872a96fb32b275a401553d65024b5e28d65c8be05201989d58a3379ccf8ca4f58cf392a947bf34035c70828b466480b7878f5249e2ff3c8a5355",
-          "sha256": "a175bab26779def1b808e18963925998686d6f0a3e3c7c2381d8381f08cd202a",
-          "sha1": "99776638316fb1d7ba0cd3f7a3950d934e045b52",
-          "md5": "305b0d8c0acfa99c67563e216253202e"
+          "name": "react-native-0.67.2.aar",
+          "url": "react-native-0.67.2.aar",
+          "size": 17805049,
+          "sha512": "9fa54c888fd61fce49b65610c0eb3cd6795e5e31683105b3048a5b31c34f59dd749c48e55d5577ba45fcd624bb4041028071cde82a91208d402f9352a70337af",
+          "sha256": "393697ad0a9bfe604f6f249cb23abc590b32ad3fb36cfc8c5d86327951b82fae",
+          "sha1": "6abbadc0b8174e42fb4f5d9f4a578deac714cc94",
+          "md5": "283c3ad2a09a9b26bcf8632c2d0cc7ab"
         }
       ]
     }

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

@@ -0,0 +1 @@
+8306d9526b64d13db397518401120c8d

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

@@ -0,0 +1 @@
+888a319cc189582061bd4bd83be7936b955ef96b

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

@@ -0,0 +1 @@
+e65f086a817ed67457f9d20c1b2458cf50ee5023d9201a27dbd27522ca57f848

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

@@ -0,0 +1 @@
+22a3aed0c26fbca4195b524f8f026d35496789b0bdb179e559e11cc26f19c0a585b887873748e88b477c303952a272907131bce579e63031c1de7c5d10c53a59

package/android/com/facebook/react/react-native/{0.67.1/react-native-0.67.1.pom → 0.67.2/react-native-0.67.2.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.67.1</version>
+  <version>0.67.2</version>
   <packaging>aar</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>
@@ -102,13 +102,13 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.9.1</version>
+      <version>4.9.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp-urlconnection</artifactId>
-      <version>4.9.1</version>
+      <version>4.9.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

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

@@ -0,0 +1 @@
+ed630b2ddccd5b319a6fbaff2739384d

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

@@ -0,0 +1 @@
+f9eda3ab5913e1170f7af9d6f0fa3d0cfb100983

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

@@ -0,0 +1 @@
+6822a0883d3963ee87d0cfc29cbf7b7ba118c839d3fd452de75c610cc77f1e8b

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

@@ -0,0 +1 @@
+529f01e0c31fef37fc71c76795f2a4e93f4c022002c0357a9b25975b33b68fe0b967f5e64499148a5c56d8a3485e7fd82163abee2b2a48592c7cdb898e1a30ce

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.67.1</latest>
-    <release>0.67.1</release>
+    <latest>0.67.2</latest>
+    <release>0.67.2</release>
     <versions>
-      <version>0.67.1</version>
+      <version>0.67.2</version>
     </versions>
-    <lastUpdated>20220120191730</lastUpdated>
+    <lastUpdated>20220131172717</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-ac280b6461853bea3be14b7e9b732483
+9b0545c6bb0eb1658389321435d5885c

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

@@ -1 +1 @@
-61d6282dcd2efccf6ec103569fd388de184ff09a
+8299afcdcc6a5954b76e55326f1ac55b5c13d078

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

@@ -1 +1 @@
-fd2eb34b4a6a06e78c6c699ec0c6a21cdfbb53d36d66a6a1e2ef4abf4b5b17b2
+051604138bb47c3367f02ef0435982f8693194b3217d8681f984f5cbc948ce72

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

@@ -1 +1 @@
-9b751dfcd350698cc6a5170688c7bc7a0aa48e4d084aed70665123cdf5299d71735266f4be69b0fa723b3a2f629056e697bfa83185f19c0af9bc7a6a1dfb277e
+b16dc6917de8de9b40150e0d9528c07dad2f2a62ae34a6eecad27264f63fa2d26c4f71e146b920a653364a62bbd907e85ae4e11fe5b94b51786795cd14f44d4c

package/jest/mockModal.js

@@ -13,11 +13,11 @@
 'use strict';
 
 const React = require('react');
-const Modal = require('../Libraries/Modal/Modal');
+import typeof Modal from '../Libraries/Modal/Modal';
 
 function mockModal(BaseComponent: $FlowFixMe) {
   class ModalMock extends BaseComponent {
-    render(): React.Element<typeof Modal> {
+    render(): React.Element<Modal> {
       return (
         <BaseComponent {...this.props}>
           {this.props.visible !== true ? null : this.props.children}

package/package.json

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

package/scripts/find-node.sh

@@ -19,12 +19,16 @@ fi
 # Define NVM_DIR and source the nvm.sh setup script
 [ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
 
+# Source nvm with '--no-use' and then `nvm use` to respect .nvmrc
+# See: https://github.com/nvm-sh/nvm/issues/2053
 if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
   # shellcheck source=/dev/null
-  . "$HOME/.nvm/nvm.sh"
+  . "$HOME/.nvm/nvm.sh" --no-use
+  nvm use 2> /dev/null || nvm use default
 elif [[ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]]; then
   # shellcheck source=/dev/null
-  . "$(brew --prefix nvm)/nvm.sh"
+  . "$(brew --prefix nvm)/nvm.sh" --no-use
+  nvm use 2> /dev/null || nvm use default
 fi
 
 # Set up the nodenv node version manager if present

package/scripts/react_native_pods.rb

@@ -393,5 +393,6 @@ def __apply_Xcode_12_5_M1_post_install_workaround(installer)
   #   "Time.h:52:17: error: typedef redefinition with different types"
   # We need to make a patch to RCT-Folly - remove the `__IPHONE_OS_VERSION_MIN_REQUIRED` check.
   # See https://github.com/facebook/flipper/issues/834 for more details.
-  `sed -i -e  $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' Pods/RCT-Folly/folly/portability/Time.h`
+  time_header = "#{Pod::Config.instance.installation_root.to_s}/Pods/RCT-Folly/folly/portability/Time.h"
+  `sed -i -e  $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' #{time_header}`
 end

package/template/Gemfile.lock

@@ -63,7 +63,7 @@ GEM
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     json (2.6.1)
     minitest (5.15.0)
@@ -85,7 +85,7 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.5.3)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "17.0.2",
-    "react-native": "0.67.1"
+    "react-native": "0.67.2"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

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

@@ -1 +0,0 @@
-305b0d8c0acfa99c67563e216253202e

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

@@ -1 +0,0 @@
-99776638316fb1d7ba0cd3f7a3950d934e045b52

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

@@ -1 +0,0 @@
-a175bab26779def1b808e18963925998686d6f0a3e3c7c2381d8381f08cd202a

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

@@ -1 +0,0 @@
-b2034a082707872a96fb32b275a401553d65024b5e28d65c8be05201989d58a3379ccf8ca4f58cf392a947bf34035c70828b466480b7878f5249e2ff3c8a5355

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

@@ -1 +0,0 @@
-8b2995e6e951b25e32c7ea1357a7408d

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

@@ -1 +0,0 @@
-500445e7158cb452ac095c73b2328abcb710b067

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

@@ -1 +0,0 @@
-d033a4bb4fb5ce5dc7dee913fe82e20ecc8a75005f3bef57419fdae4baf30a60

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

@@ -1 +0,0 @@
-9171108183ad41efe77a12ab646df76dd895633089781226cf036f4526a7198e781bfe74e3432d0af794b4dd1d57339616358fee4ccdb54bf8b97d9d690c3e94

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

@@ -1 +0,0 @@
-3a1aa7952952ca62e0bcb315e60124c1

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

@@ -1 +0,0 @@
-fbb5a6f0c6fe40ad1803572de892dd99b3d6e66d

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

@@ -1 +0,0 @@
-bef4960456d5b159b4cb837503923822cd05858e0ac20c5796ff690c7c0d6b98

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

@@ -1 +0,0 @@
-99afe22a931927907ad3de140e2dad230eeb96b6fbac35a359c2f260a30d767f7a65ecef7bd48d9835f86184ddf83014229912684c22a066f97d2813194f4707