react-native 0.68.1 → 0.69.0-rc.1

package/ReactCommon/react/utils/BUCK

@@ -42,7 +42,10 @@ rn_xplat_cxx_library(
     fbobjc_frameworks = ["Foundation"],
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/utils/CMakeLists.txt

@@ -0,0 +1,24 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+        -DLOG_TAG=\"Fabric\")
+
+file(GLOB react_utils_SRC CONFIGURE_DEPENDS *.cpp *.mm)
+add_library(react_utils SHARED ${react_utils_SRC})
+
+target_include_directories(react_utils PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_utils
+        glog
+        glog_init
+        react_debug)

package/ReactCommon/react/utils/ContextContainer.h

@@ -9,11 +9,11 @@
 
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <string>
 
 #include <butter/map.h>
 #include <butter/mutex.h>
-#include <butter/optional.h>
 
 #include <react/debug/flags.h>
 #include <react/debug/react_native_assert.h>
@@ -92,7 +92,7 @@ class ContextContainer final {
    * Returns an empty optional if the instance could not be found.
    */
   template <typename T>
-  butter::optional<T> find(std::string const &key) const {
+  std::optional<T> find(std::string const &key) const {
     std::shared_lock<butter::shared_mutex> lock(mutex_);
 
     auto iterator = instances_.find(key);

package/ReactCommon/react/utils/ManagedObjectWrapper.h

@@ -9,6 +9,10 @@
 
 #include <react/debug/react_native_assert.h>
 
+#if defined(__APPLE__)
+#include <TargetConditionals.h>
+#endif
+
 #if defined(__OBJC__) && defined(__cplusplus)
 #if TARGET_OS_MAC && TARGET_OS_IPHONE
 

package/ReactCommon/react/utils/SimpleThreadSafeCache.h

@@ -8,8 +8,8 @@
 #include <functional>
 #include <memory>
 #include <mutex>
+#include <optional>
 
-#include <butter/optional.h>
 #include <folly/container/EvictingCacheMap.h>
 
 namespace facebook {
@@ -48,7 +48,7 @@ class SimpleThreadSafeCache {
    * If the value wasn't found in the cache, returns empty optional.
    * Can be called from any thread.
    */
-  butter::optional<ValueT> get(const KeyT &key) const {
+  std::optional<ValueT> get(const KeyT &key) const {
     std::lock_guard<std::mutex> lock(mutex_);
     auto iterator = map_.find(key);
     if (iterator == map_.end()) {

package/ReactCommon/react/utils/Telemetry.h

@@ -68,7 +68,7 @@ static inline double telemetryTimePointToSteadyClockSeconds(
   auto nanoseconds = std::chrono::duration_cast<std::chrono::nanoseconds>(
                          timePoint.time_since_epoch())
                          .count();
-  return nanoseconds / 1.0e9;
+  return (double)nanoseconds / 1.0e9;
 }
 
 /*
@@ -96,7 +96,7 @@ static inline double telemetryTimePointToSecondsSinceEpoch(
   auto systemClockTimePoint =
       clockCast<std::chrono::system_clock::time_point, TelemetryTimePoint>(
           timePoint);
-  return std::chrono::duration_cast<std::chrono::microseconds>(
+  return (double)std::chrono::duration_cast<std::chrono::microseconds>(
              systemClockTimePoint.time_since_epoch())
              .count() /
       1000000.0;

package/ReactCommon/reactperflogger/Android.mk

@@ -20,6 +20,7 @@ LOCAL_MODULE := reactperflogger
 
 # Compile all local c++ files under ./ReactCommon
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/reactperflogger/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 # Build the files in this directory as a shared library
 include $(BUILD_STATIC_LIBRARY)

package/ReactCommon/reactperflogger/BUCK

@@ -11,7 +11,10 @@ rn_xplat_cxx_library(
     compiler_flags = [
         "-Wno-global-constructors",
     ],
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = (ANDROID, APPLE),
     preferred_linkage = "static",
     preprocessor_flags = [

package/ReactCommon/reactperflogger/CMakeLists.txt

@@ -0,0 +1,14 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall)
+
+file(GLOB reactperflogger_SRC CONFIGURE_DEPENDS reactperflogger/*.cpp)
+add_library(reactperflogger STATIC ${reactperflogger_SRC})
+
+target_include_directories(reactperflogger PUBLIC .)

package/ReactCommon/reactperflogger/React-perflogger.podspec

@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "reactperflogger"

package/ReactCommon/runtimeexecutor/BUCK

@@ -32,7 +32,10 @@ rn_xplat_cxx_library(
     fbobjc_frameworks = ["Foundation"],
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/runtimeexecutor/CMakeLists.txt

@@ -0,0 +1,17 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall)
+
+file(GLOB_RECURSE runtimeexecutor_SRC CONFIGURE_DEPENDS *.cpp *.h)
+
+add_library(runtimeexecutor SHARED ${runtimeexecutor_SRC})
+
+target_include_directories(runtimeexecutor PUBLIC .)
+
+target_link_libraries(runtimeexecutor jsi)

package/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec

@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "ReactCommon"

package/ReactCommon/yoga/Android.mk

@@ -11,6 +11,7 @@ LOCAL_MODULE := yogacore
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/yoga/*.cpp)
 LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/yoga/*/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)

package/ReactCommon/yoga/CMakeLists.txt

@@ -0,0 +1,16 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -O3 -Wall)
+
+file(GLOB_RECURSE yogacore_SRC CONFIGURE_DEPENDS yoga/*.cpp)
+add_library(yogacore STATIC ${yogacore_SRC})
+
+target_include_directories(yogacore PUBLIC .)
+
+target_link_libraries(yogacore android log)

package/ReactCommon/yoga/Yoga-umbrella.h

@@ -0,0 +1,21 @@
+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
+#endif
+
+#import "yoga/YGEnums.h"
+#import "yoga/YGMacros.h"
+#import "yoga/YGNode.h"
+#import "yoga/YGStyle.h"
+#import "yoga/YGValue.h"
+#import "yoga/Yoga.h"
+
+FOUNDATION_EXPORT double yogaVersionNumber;
+FOUNDATION_EXPORT const unsigned char yogaVersionString[];

package/ReactCommon/yoga/Yoga.modulemap

@@ -0,0 +1,6 @@
+framework module yoga {
+  umbrella header "Yoga-umbrella.h"
+
+  export *
+  module * { export * }
+}

package/ReactCommon/yoga/Yoga.podspec

@@ -38,20 +38,34 @@ Pod::Spec.new do |spec|
       '-fexceptions',
       '-Wall',
       '-Werror',
-      '-std=c++1y',
+      '-std=c++17',
       '-fPIC'
   ]
 
   # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "11.0" }
+  spec.platforms = { :ios => "12.4" }
 
   # 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}'
-  source_files = File.join('ReactCommon/yoga', source_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
+  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']
   spec.source_files = source_files
 
-  header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGNode,YGStyle,YGValue}.h'
-  header_files = File.join('ReactCommon/yoga', header_files) if ENV['INSTALL_YOGA_WITHOUT_PATH_OPTION']
-  spec.public_header_files = header_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',
+  }
 end

package/ReactCommon/yoga/yoga/Yoga.cpp

@@ -2229,7 +2229,7 @@ static float YGDistributeFreeSpaceSecondPass(
         depth,
         generationCount);
     node->setLayoutHadOverflow(
-        node->getLayout().hadOverflow() |
+        node->getLayout().hadOverflow() ||
         currentRelativeChild->getLayout().hadOverflow());
   }
   return deltaFreeSpace;

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug-javadoc.jar.md5

@@ -0,0 +1 @@
+835b90f78ed29885f7ef883aecf53744

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug-javadoc.jar.sha1

@@ -0,0 +1 @@
+181857ade84dbc82e2b95268c6312407d4a70f1f

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug-javadoc.jar.sha256

@@ -0,0 +1 @@
+d485f3ac395c13865504654edd9be739d79e38253d109fbb3fd35b5b809f9eaa

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug-javadoc.jar.sha512

@@ -0,0 +1 @@
+fca8e9c1f2091d254f5bec69613ecc27396b934ed8dae09beacdb6d1d66eb26173cd0f8facaf49d93b55d90778d77fb4696dfa5e8744905799b2c9c01e58e50e

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug-sources.jar.md5

@@ -0,0 +1 @@
+7b864274b543d21ee7d7c9c8e7f7b043

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug-sources.jar.sha1

@@ -0,0 +1 @@
+75340c383a5d55a37d68181f12b1d8d939a3f065

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug-sources.jar.sha256

@@ -0,0 +1 @@
+1fe6791aeefb0391d319d763c655a6f8232676141b886d0a467b8834a0b86497

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug-sources.jar.sha512

@@ -0,0 +1 @@
+b6d659b87a103dd21026d8715420d047b70e76219d39121795598811cff2c7bb6cf3a860d8836fe6eeb753f785d7c2f7b961ea48c5cba27626a6e1cb5b07ee62

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug.aar.md5

@@ -0,0 +1 @@
+086cd6e6135a73114da7aa2437f83ce1

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug.aar.sha1

@@ -0,0 +1 @@
+a50c3ac539eb66d607a2a98c66a88c2c5578ee60

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug.aar.sha256

@@ -0,0 +1 @@
+0742cf8971af07ae87605f77754d0cfa144cab16ff5b192083a10550b0665af1

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-debug.aar.sha512

@@ -0,0 +1 @@
+cd0bbb707bafb80ff7f43cf07cd022d61069245a27f8756081f10331fabe3996b104c5fe3a8b25c66d15ef2c9310bc82a15afb294749f96d6da83689c86abb80

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release-javadoc.jar.md5

@@ -0,0 +1 @@
+835b90f78ed29885f7ef883aecf53744

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release-javadoc.jar.sha1

@@ -0,0 +1 @@
+181857ade84dbc82e2b95268c6312407d4a70f1f

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release-javadoc.jar.sha256

@@ -0,0 +1 @@
+d485f3ac395c13865504654edd9be739d79e38253d109fbb3fd35b5b809f9eaa

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release-javadoc.jar.sha512

@@ -0,0 +1 @@
+fca8e9c1f2091d254f5bec69613ecc27396b934ed8dae09beacdb6d1d66eb26173cd0f8facaf49d93b55d90778d77fb4696dfa5e8744905799b2c9c01e58e50e

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release-sources.jar.md5

@@ -0,0 +1 @@
+c8db891c3be1b407d7079c02c303243b

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release-sources.jar.sha1

@@ -0,0 +1 @@
+34cf662170d553da87ddd8ef2213f13212955d1d

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release-sources.jar.sha256

@@ -0,0 +1 @@
+e622d9a7db5ba1a2161785ab8745dda58d1012aad04f7f9489fce207cf567f8a

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release-sources.jar.sha512

@@ -0,0 +1 @@
+205a0fd395d6d02c27c4611ae1ceca7ccb4f3554f17f44d338f9ffef2e3521e933616e74ac1b17bb7d300891ede5ecf58e966a11becda27f6760f862f2316783

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release.aar.md5

@@ -0,0 +1 @@
+78538b158fb96d82305bda42c61a3826

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release.aar.sha1

@@ -0,0 +1 @@
+1f426315cc9bcc846e5165b70fe93b2447324b4f

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release.aar.sha256

@@ -0,0 +1 @@
+e537a5c6d87c85bf0fd163877878a305c044f2910a0aa939b3382f83c11c8949

package/android/com/facebook/react/hermes-engine/0.69.0-rc.1/hermes-engine-0.69.0-rc.1-release.aar.sha512

@@ -0,0 +1 @@
+0cc348b9fd315151833920fb4e8fd638ed0f0efdd8fd1cd02140d56c9873054a582987f3e9b57bef404a1f6f9ab04782b9006598340bc3797706fdc41e6a33c7