react-native 0.69.0 → 0.69.3

package/Libraries/Blob/RCTFileReaderModule.mm

@@ -31,24 +31,26 @@ RCT_EXPORT_METHOD(readAsText:(NSDictionary<NSString *, id> *)blob
                   reject:(RCTPromiseRejectBlock)reject)
 {
   RCTBlobManager *blobManager = [_moduleRegistry moduleForName:"BlobModule"];
-  NSData *data = [blobManager resolve:blob];
+  dispatch_async(blobManager.methodQueue, ^{
+    NSData *data = [blobManager resolve:blob];
 
-  if (data == nil) {
-    reject(RCTErrorUnspecified,
-           [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]], nil);
-  } else {
-    NSStringEncoding stringEncoding;
-
-    if (encoding == nil) {
-      stringEncoding = NSUTF8StringEncoding;
+    if (data == nil) {
+      reject(RCTErrorUnspecified,
+             [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]], nil);
     } else {
-      stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef) encoding));
-    }
+      NSStringEncoding stringEncoding;
 
-    NSString *text = [[NSString alloc] initWithData:data encoding:stringEncoding];
+      if (encoding == nil) {
+        stringEncoding = NSUTF8StringEncoding;
+      } else {
+        stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef) encoding));
+      }
 
-    resolve(text);
-  }
+      NSString *text = [[NSString alloc] initWithData:data encoding:stringEncoding];
+
+      resolve(text);
+    }
+  });
 }
 
 RCT_EXPORT_METHOD(readAsDataURL:(NSDictionary<NSString *, id> *)blob
@@ -56,19 +58,21 @@ RCT_EXPORT_METHOD(readAsDataURL:(NSDictionary<NSString *, id> *)blob
                   reject:(RCTPromiseRejectBlock)reject)
 {
   RCTBlobManager *blobManager = [_moduleRegistry moduleForName:"BlobModule"];
-  NSData *data = [blobManager resolve:blob];
-
-  if (data == nil) {
-    reject(RCTErrorUnspecified,
-           [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]], nil);
-  } else {
-    NSString *type = [RCTConvert NSString:blob[@"type"]];
-    NSString *text = [NSString stringWithFormat:@"data:%@;base64,%@",
-                      type != nil && [type length] > 0 ? type : @"application/octet-stream",
-                      [data base64EncodedStringWithOptions:0]];
-
-    resolve(text);
-  }
+  dispatch_async(blobManager.methodQueue, ^{
+    NSData *data = [blobManager resolve:blob];
+
+    if (data == nil) {
+      reject(RCTErrorUnspecified,
+             [NSString stringWithFormat:@"Unable to resolve data for blob: %@", [RCTConvert NSString:blob[@"blobId"]]], nil);
+    } else {
+      NSString *type = [RCTConvert NSString:blob[@"type"]];
+      NSString *text = [NSString stringWithFormat:@"data:%@;base64,%@",
+                        type != nil && [type length] > 0 ? type : @"application/octet-stream",
+                        [data base64EncodedStringWithOptions:0]];
+
+      resolve(text);
+    }
+  });
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params

package/Libraries/Core/ReactNativeVersion.js

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

package/React/Base/RCTVersion.m

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

package/React/CxxBridge/RCTJSIExecutorRuntimeInstaller.mm

@@ -22,8 +22,14 @@ JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(JSIExecutor::Runtim
     bindNativeLogger(runtime, iosLoggingBinder);
 
     PerformanceNow iosPerformanceNowBinder = []() {
-      auto time = std::chrono::system_clock::now().time_since_epoch();
-      return std::chrono::duration_cast<std::chrono::milliseconds>(time).count();
+      auto time = std::chrono::steady_clock::now();
+      auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(
+                          time.time_since_epoch())
+                          .count();
+
+      constexpr double NANOSECONDS_IN_MILLISECOND = 1000000.0;
+
+      return duration / NANOSECONDS_IN_MILLISECOND;
     };
     bindNativePerformanceNow(runtime, iosPerformanceNowBinder);
 

package/React/Views/RCTShadowView.h

@@ -8,6 +8,8 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTComponent.h>
+// Keeps RCTConvert.h here before yoga for clang module to generate correct header imports.
+#import <React/RCTConvert.h>
 #import <React/RCTLayout.h>
 #import <React/RCTRootView.h>
 #import <yoga/Yoga.h>

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.69.0
+VERSION_NAME=0.69.3
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

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", 69,
-      "patch", 0,
+      "patch", 3,
       "prerelease", null);
 }

package/ReactAndroid/src/main/jni/react/jni/NativeTime.cpp

@@ -12,8 +12,14 @@ namespace facebook {
 namespace react {
 
 double reactAndroidNativePerformanceNowHook() {
-  auto time = std::chrono::system_clock::now().time_since_epoch();
-  return std::chrono::duration_cast<std::chrono::milliseconds>(time).count();
+  auto time = std::chrono::steady_clock::now();
+  auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(
+                      time.time_since_epoch())
+                      .count();
+
+  constexpr double NANOSECONDS_IN_MILLISECOND = 1000000.0;
+
+  return duration / NANOSECONDS_IN_MILLISECOND;
 }
 
 } // namespace react

package/ReactCommon/{react/bridging/React-bridging.podspec → React-bridging.podspec}

@@ -5,7 +5,7 @@
 
 require "json"
 
-package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "package.json")))
+package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
 version = package['version']
 
 source = { :git => 'https://github.com/facebook/react-native.git' }
@@ -28,9 +28,10 @@ Pod::Spec.new do |s|
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
-  s.source_files           = "**/*.{cpp,h}"
-  s.exclude_files          = "tests"
+  s.source_files           = "react/bridging/**/*.{cpp,h}"
+  s.exclude_files          = "react/bridging/tests"
   s.header_dir             = "react/bridging"
+  s.header_mappings_dir    = "."
   s.compiler_flags         = folly_compiler_flags
   s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\"",
                                "USE_HEADERMAP" => "YES",

package/ReactCommon/ReactCommon.podspec

@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.header_dir             = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/React-bridging\"",
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers\"",
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
 

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h

@@ -16,7 +16,6 @@
 #import <React/RCTModuleMethod.h>
 #import <ReactCommon/CallInvoker.h>
 #import <ReactCommon/TurboModule.h>
-#import <ReactCommon/TurboModuleUtils.h>
 #import <string>
 #import <unordered_map>
 
@@ -27,6 +26,7 @@
 namespace facebook {
 namespace react {
 
+class CallbackWrapper;
 class Instance;
 
 typedef std::weak_ptr<CallbackWrapper> (

package/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm

@@ -27,6 +27,7 @@
 #import <ReactCommon/TurboCxxModule.h>
 #import <ReactCommon/TurboModuleBinding.h>
 #import <ReactCommon/TurboModulePerfLogger.h>
+#import <ReactCommon/TurboModuleUtils.h>
 
 using namespace facebook;
 using namespace facebook::react;

package/ReactCommon/yoga/Yoga.podspec

@@ -47,25 +47,11 @@ Pod::Spec.new do |spec|
 
   # Set this environment variable when *not* using the `:path` option to install the pod.
   # E.g. when publishing this spec to a spec repo.
-  source_files = 'yoga/**/*.{cpp,h}', 'Yoga-umbrella.h'
-  source_files = source_files.map { |file| File.join('ReactCommon/yoga', file) } if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
+  source_files = 'yoga/**/*.{cpp,h}'
+  source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
   spec.source_files = source_files
 
-  spec.module_map = 'Yoga.modulemap'
-
-  # CocoaPods custom `module_map` + `header_dir` doesn't put the umbrella header in right place.
-  # Ideally, modulemap should be placed with the umbrella header, that would work for both use_frameworks! mode and non use_frameworks! mode.
-  # This script copy the umbrella header back to right place.
-  spec.script_phase = {
-    :name => 'Copy umbrella header',
-    :input_files => ["$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h"],
-    :output_files => ["$PODS_ROOT/Headers/Private/Yoga/Yoga-umbrella.h"],
-    :execution_position => :before_compile,
-    :shell_path => '/bin/bash',
-
-    # In use_frameworks! mode, the umbrella header will by copied to right place.
-    # This copy command will fail because "$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h" doesn't exist.
-    # The command is just a no-op in use_frameworks! mode.
-    :script => 'cp -f "$PODS_ROOT/Headers/Public/Yoga/yoga/Yoga-umbrella.h" "$PODS_ROOT/Headers/Private/Yoga/Yoga-umbrella.h" || true',
-  }
+  header_files = 'yoga/*.h'
+  header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
+  spec.public_header_files = header_files
 end

package/ReactCommon/yoga/yoga/BitUtils.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 #include <cstdio>
 #include <cstdint>
 #include "YGEnums.h"
@@ -65,3 +67,5 @@ inline void setBooleanData(uint8_t& flags, size_t index, bool value) {
 } // namespace detail
 } // namespace yoga
 } // namespace facebook
+
+#endif

package/ReactCommon/yoga/yoga/CompactValue.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 #include "YGValue.h"
 #include "YGMacros.h"
 #include <cmath>
@@ -182,3 +184,5 @@ constexpr bool operator!=(CompactValue a, CompactValue b) noexcept {
 } // namespace detail
 } // namespace yoga
 } // namespace facebook
+
+#endif

package/ReactCommon/yoga/yoga/Utils.h

@@ -6,6 +6,9 @@
  */
 
 #pragma once
+
+#ifdef __cplusplus
+
 #include "YGNode.h"
 #include "Yoga-internal.h"
 #include "CompactValue.h"
@@ -145,3 +148,5 @@ inline YGFloatOptional YGResolveValueMargin(
 }
 
 void throwLogicalErrorWithMessage(const char* message);
+
+#endif

package/ReactCommon/yoga/yoga/YGConfig.h

@@ -6,6 +6,9 @@
  */
 
 #pragma once
+
+#ifdef __cplusplus
+
 #include "Yoga-internal.h"
 #include "Yoga.h"
 
@@ -74,3 +77,5 @@ public:
     setCloneNodeCallback(YGCloneNodeFunc{nullptr});
   }
 };
+
+#endif

package/ReactCommon/yoga/yoga/YGFloatOptional.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 #include <cmath>
 #include <limits>
 #include "Yoga-internal.h"
@@ -68,3 +70,5 @@ inline bool operator>=(YGFloatOptional lhs, YGFloatOptional rhs) {
 inline bool operator<=(YGFloatOptional lhs, YGFloatOptional rhs) {
   return lhs < rhs || lhs == rhs;
 }
+
+#endif

package/ReactCommon/yoga/yoga/YGLayout.h

@@ -6,6 +6,9 @@
  */
 
 #pragma once
+
+#ifdef __cplusplus
+
 #include "BitUtils.h"
 #include "YGFloatOptional.h"
 #include "Yoga-internal.h"
@@ -85,3 +88,5 @@ public:
   bool operator==(YGLayout layout) const;
   bool operator!=(YGLayout layout) const { return !(*this == layout); }
 };
+
+#endif

package/ReactCommon/yoga/yoga/YGNodePrint.h

@@ -6,7 +6,11 @@
  */
 
 #ifdef DEBUG
+
 #pragma once
+
+#ifdef __cplusplus
+
 #include <string>
 
 #include "Yoga.h"
@@ -22,4 +26,7 @@ void YGNodeToString(
 
 } // namespace yoga
 } // namespace facebook
+
+#endif
+
 #endif

package/ReactCommon/yoga/yoga/Yoga-internal.h

@@ -6,6 +6,9 @@
  */
 
 #pragma once
+
+#ifdef __cplusplus
+
 #include <algorithm>
 #include <array>
 #include <cmath>
@@ -148,3 +151,5 @@ static const float kDefaultFlexShrink = 0.0f;
 static const float kWebDefaultFlexShrink = 1.0f;
 
 extern bool YGFloatsEqual(const float a, const float b);
+
+#endif

package/ReactCommon/yoga/yoga/log.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 #include "YGEnums.h"
 
 struct YGNode;
@@ -36,3 +38,5 @@ struct Log {
 } // namespace detail
 } // namespace yoga
 } // namespace facebook
+
+#endif

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-debug-javadoc.jar.md5

@@ -0,0 +1 @@
+b9f5f479261cc062fd887cf5c03a8c85

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-debug-javadoc.jar.sha1

@@ -0,0 +1 @@
+f4d50331a533a38973771ced2872090df8a16c8a

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-debug-javadoc.jar.sha256

@@ -0,0 +1 @@
+98f7e0de3ca53d54c16e39090dd1d5d585dbe8e497b63dba571cef12641f6a56

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-debug-javadoc.jar.sha512

@@ -0,0 +1 @@
+09e9e3979b1380bb6e0d6c02f2c571b4105ed9b64b88c2f6c550de60f3170f200fcbfdabaa2755193454f41eb3e05d69da011488b114985c38ffbd1d9c481b27

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-debug.aar.md5

@@ -0,0 +1 @@
+df7654fdb8eff0f9d3ca208b7256994d

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-debug.aar.sha1

@@ -0,0 +1 @@
+c12506059beeccfe8eb4fcb4c743fa547d6c5d99

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-debug.aar.sha256

@@ -0,0 +1 @@
+ef668d0e6090c5f6156d7409e577f04c91c658a131c92708683c8e9862e4ab0e

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-debug.aar.sha512

@@ -0,0 +1 @@
+01b48aa63b2bbee802ac7c4e5fb78098d55d13bec9010ed21db9bc9ba38a77a38bb924afd3f1bb636640aa66a9efd6305778a205625c21c576f28eddeea08723

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-release-javadoc.jar.md5

@@ -0,0 +1 @@
+b9f5f479261cc062fd887cf5c03a8c85

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-release-javadoc.jar.sha1

@@ -0,0 +1 @@
+f4d50331a533a38973771ced2872090df8a16c8a

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-release-javadoc.jar.sha256

@@ -0,0 +1 @@
+98f7e0de3ca53d54c16e39090dd1d5d585dbe8e497b63dba571cef12641f6a56

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-release-javadoc.jar.sha512

@@ -0,0 +1 @@
+09e9e3979b1380bb6e0d6c02f2c571b4105ed9b64b88c2f6c550de60f3170f200fcbfdabaa2755193454f41eb3e05d69da011488b114985c38ffbd1d9c481b27

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-release.aar.md5

@@ -0,0 +1 @@
+4e7b9f13b6880b0cc02a20790519f533

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-release.aar.sha1

@@ -0,0 +1 @@
+42891038b17389bfdf5b61b71ca5d633191213db

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-release.aar.sha256

@@ -0,0 +1 @@
+3e021a2cdc1868f40d2e7b652f376be051411a18de3850f78ea2fb0ebc191045

package/android/com/facebook/react/hermes-engine/0.69.3/hermes-engine-0.69.3-release.aar.sha512

@@ -0,0 +1 @@
+2d6ce6385a582cf900559a613cf9d62c527cf57a04355645f8e4e6fc86bc2ecffe26124548a9d9fb09ac0e85a29900da072d42704cb947d5f690f90100f655da