react-native-reanimated 2.10.0 → 2.12.0

package/Common/cpp/AnimatedSensor/AnimatedSensorModule.cpp

@@ -2,6 +2,9 @@
 #include "MutableValue.h"
 #include "ValueWrapper.h"
 
+#include <memory>
+#include <utility>
+
 namespace reanimated {
 
 AnimatedSensorModule::AnimatedSensorModule(

package/Common/cpp/LayoutAnimations/LayoutAnimationsProxy.cpp

@@ -4,6 +4,8 @@
 #include "ShareableValue.h"
 #include "ValueWrapper.h"
 
+#include <utility>
+
 namespace reanimated {
 
 const long long idOffset = 1e9;

package/Common/cpp/NativeModules/NativeReanimatedModule.cpp

@@ -2,6 +2,8 @@
 #include <functional>
 #include <memory>
 #include <thread>
+#include <unordered_map>
+
 #include "EventHandlerRegistry.h"
 #include "FeaturesConfig.h"
 #include "FrozenObject.h"

package/Common/cpp/{headers/NativeModules → NativeModules}/NativeReanimatedModule.h

@@ -13,6 +13,7 @@
 #include "RuntimeDecorator.h"
 #include "RuntimeManager.h"
 #include "Scheduler.h"
+#include "SingleInstanceChecker.h"
 
 namespace reanimated {
 
@@ -111,6 +112,10 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec,
   ConfigurePropsFunction configurePropsPlatformFunction;
   KeyboardEventSubscribeFunction subscribeForKeyboardEventsFunction;
   KeyboardEventUnsubscribeFunction unsubscribeFromKeyboardEventsFunction;
+
+#ifdef DEBUG
+  SingleInstanceChecker<NativeReanimatedModule> singleInstanceChecker_;
+#endif
 };
 
 } // namespace reanimated

package/Common/cpp/NativeModules/NativeReanimatedModuleSpec.cpp

@@ -1,5 +1,7 @@
 #include "NativeReanimatedModuleSpec.h"
 
+#include <utility>
+
 #define SPEC_PREFIX(FN_NAME) __hostFunction_NativeReanimatedModuleSpec_##FN_NAME
 
 namespace reanimated {

package/Common/cpp/{headers/NativeModules → NativeModules}/NativeReanimatedModuleSpec.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#ifdef ONANDROID
+#ifdef ANDROID
 #include "TurboModule.h"
 #else
 #include <ReactCommon/TurboModule.h>

package/Common/cpp/Registries/MapperRegistry.cpp

@@ -1,8 +1,10 @@
 #include "MapperRegistry.h"
+#include "Mapper.h"
+
 #include <array>
 #include <map>
 #include <set>
-#include "Mapper.h"
+#include <utility>
 
 namespace reanimated {
 

package/Common/cpp/Registries/WorkletsCache.cpp

@@ -2,6 +2,9 @@
 #include "FrozenObject.h"
 #include "ShareableValue.h"
 
+#include <string>
+#include <utility>
+
 using namespace facebook;
 
 namespace reanimated {

package/Common/cpp/SharedItems/MutableValue.cpp

@@ -4,6 +4,8 @@
 #include "ShareableValue.h"
 #include "SharedParent.h"
 
+#include <string>
+
 namespace reanimated {
 
 void MutableValue::setValue(jsi::Runtime &rt, const jsi::Value &newValue) {

package/Common/cpp/SharedItems/ShareableValue.cpp

@@ -1,10 +1,13 @@
 #include <cxxabi.h>
+#include <utility>
+
 #include "FrozenObject.h"
 #include "MutableValue.h"
 #include "MutableValueSetterProxy.h"
 #include "RemoteObject.h"
 #include "RuntimeDecorator.h"
 #include "RuntimeManager.h"
+#include "ShareableValue.h"
 #include "SharedParent.h"
 
 namespace reanimated {
@@ -394,8 +397,10 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
             } else {
               res = funPtr->call(rt, args, count);
             }
-          } catch (jsi::JSError &e) {
-            throw e;
+          } catch (std::exception &e) {
+            std::string str = e.what();
+            runtimeManager->errorHandler->setError(str);
+            runtimeManager->errorHandler->raise();
           } catch (...) {
             if (demangleExceptionName(
                     abi::__cxa_current_exception_type()->name()) ==

package/Common/cpp/Tools/JSIStoreValueUser.cpp

@@ -1,6 +1,6 @@
 #include "JSIStoreValueUser.h"
 #include "RuntimeManager.h"
-#ifdef ONANDROID
+#ifdef ANDROID
 #include <AndroidScheduler.h>
 #endif
 
@@ -32,7 +32,7 @@ StoreUser::~StoreUser() {
   std::shared_ptr<Scheduler> strongScheduler = scheduler.lock();
   if (strongScheduler != nullptr) {
     std::shared_ptr<StaticStoreUser> sud = storeUserData;
-#ifdef ONANDROID
+#ifdef ANDROID
     jni::ThreadScope::WithClassLoader([&] {
       strongScheduler->scheduleOnUI([id, sud]() {
         const std::lock_guard<std::recursive_mutex> lock(sud->storeMutex);

package/Common/cpp/{headers/Tools → Tools}/ReanimatedHiddenHeaders.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(ONANDROID)
+#ifdef ANDROID
 #include "Logger.h"
 #include "LoggerInterface.h"
 #include "SpeedChecker.h"

package/Common/cpp/Tools/SingleInstanceChecker.h

@@ -0,0 +1,58 @@
+#pragma once
+
+#ifdef DEBUG
+
+#include <cxxabi.h>
+
+#include <iostream>
+#include <string>
+
+namespace reanimated {
+
+// This is a class that counts how many instances of a different class there
+// are. It is meant only to be used with classes that should only have one
+// instance.
+
+template <class T>
+class SingleInstanceChecker {
+ public:
+  SingleInstanceChecker();
+  ~SingleInstanceChecker();
+
+ private:
+  void assertWithMessage(bool condition, std::string message) {
+    if (!condition) {
+      std::cerr << message << std::endl;
+      assert(condition);
+    }
+  }
+
+  // A static field will exist separately for every class template.
+  // This has to be inline for automatic initialization.
+  inline static int instanceCount_;
+};
+
+template <class T>
+SingleInstanceChecker<T>::SingleInstanceChecker() {
+  int status = 0;
+  std::string className =
+      __cxxabiv1::__cxa_demangle(typeid(T).name(), nullptr, nullptr, &status);
+
+  // Only one instance should exist, but it is possible for two instances
+  // to co-exist during a reload.
+  assertWithMessage(
+      instanceCount_ <= 1,
+      "More than one instance of " + className +
+          " present. This may indicate a memory leak due to a retain cycle.");
+
+  instanceCount_++;
+}
+
+template <class T>
+SingleInstanceChecker<T>::~SingleInstanceChecker() {
+  instanceCount_--;
+}
+
+} // namespace reanimated
+
+#endif // DEBUG

package/RNReanimated.podspec

@@ -1,73 +1,21 @@
 require "json"
+require_relative './scripts/reanimated_utils'
 
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+reanimated_package_json = JSON.parse(File.read(File.join(__dir__, "package.json")))
+config = find_config()
+assert_no_multiple_instances(config)
+assert_no_reanimated2_with_new_architecture(reanimated_package_json)
 
-reactVersion = '0.0.0'
-reactTargetTvOS = false
-isUserApp = false
-
-begin
-  # user app
-  # /appName/node_modules/react-native-reanimated/RNReanimated.podspec
-  # /appName/node_modules/react-native/package.json
-  reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")))
-  reactVersion = reactJson["version"]
-  reactTargetTvOS = reactJson["name"] == "react-native-tvos"
-  isUserApp = true
-rescue
-  begin
-    # monorepo
-    # /monorepo/packages/appName/node_modules/react-native-reanimated/RNReanimated.podspec
-    # /monorepo/node_modules/react-native/package.json
-    reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "node_modules", "react-native", "package.json")))
-    reactVersion = reactJson["version"]
-    reactTargetTvOS = reactJson["name"] == "react-native-tvos"
-  rescue
-    begin
-      # Example app in reanimated repo
-      # /react-native-reanimated/RNReanimated.podspec
-      # /react-native-reanimated/node_modules/react-native/package.json
-      reactJson = JSON.parse(File.read(File.join(__dir__, "node_modules", "react-native", "package.json")))
-      reactVersion = reactJson["version"]
-      reactTargetTvOS = ENV["ReanimatedTVOSExample"] == "1"
-    rescue
-      # should never happen
-      reactVersion = '0.68.0'
-      puts "[RNReanimated] Unable to recognize your `react-native` version! Default `react-native` version: " + reactVersion
-    end
-  end
-end
-
-if isUserApp
-  libInstances = %x[find ../../ -name "package.json" | grep "/react-native-reanimated/package.json"]
-  libInstancesArray = libInstances.split("\n")
-  if libInstancesArray.length() > 1
-    parsedLocation = ''
-    for location in libInstancesArray
-      location['../../'] = '- '
-      location['/package.json'] = ''
-      parsedLocation += location + "\n"
-    end
-    raise "[Reanimated] Multiple versions of Reanimated were detected. Only one instance of react-native-reanimated can be installed in a project. You need to resolve the conflict manually. Check out the documentation: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/troubleshooting#multiple-versions-of-reanimated-were-detected \n\nConflict between: \n" + parsedLocation
-  end
-end
-
-rnVersion = reactVersion.split('.')[1]
-
-folly_prefix = ""
-if rnVersion.to_i >= 64
-  folly_prefix = "RCT-"
-end
-
-
-folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DRNVERSION=' + rnVersion
+folly_prefix = config[:react_native_minor_version] >= 64 ? 'RCT-' : ''
+folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DREACT_NATIVE_MINOR_VERSION=' + config[:react_native_minor_version].to_s
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
+  
   s.name         = "RNReanimated"
-  s.version      = package["version"]
-  s.summary      = package["description"]
+  s.version      = reanimated_package_json["version"]
+  s.summary      = reanimated_package_json["description"]
   s.description  = <<-DESC
                   RNReanimated
                    DESC
@@ -80,23 +28,23 @@ Pod::Spec.new do |s|
 
   s.source_files = [
     "ios/**/*.{mm,h,m}",
-    "Common/cpp/**/*.cpp",
-    "Common/cpp/headers/**/*.h"
+    "Common/cpp/**/*.{cpp,h}"
   ]
 
   s.preserve_paths = [
     "Common/cpp/hidden_headers/**"
   ]
 
-  s.pod_target_xcconfig    = {
+  s.pod_target_xcconfig = {
     "USE_HEADERMAP" => "YES",
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" "
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" ",
+    "FRAMEWORK_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/React-hermes\"",
   }
   s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
   s.xcconfig               = {
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\"",
-                               "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags  }
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"$(PODS_ROOT)/#{config[:react_native_common_dir]}\"",
+    "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags 
+  }
 
   s.requires_arc = true
 
@@ -112,7 +60,7 @@ Pod::Spec.new do |s|
   s.dependency 'React-Core'
   s.dependency 'React-CoreModules'
   s.dependency 'React-Core/DevSupport'
-  if !reactTargetTvOS
+  if !config[:is_tvos_target]
     s.dependency 'React-RCTActionSheet'
   end
   s.dependency 'React-RCTNetwork'
@@ -132,13 +80,9 @@ Pod::Spec.new do |s|
   s.dependency 'DoubleConversion'
   s.dependency 'glog'
 
-  if reactVersion.match(/^0.62/)
+  if config[:react_native_minor_version] == 62
     s.dependency 'ReactCommon/callinvoker'
   else
     s.dependency 'React-callinvoker'
   end
-
-  s.dependency "#{folly_prefix}Folly"
-
 end
-

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Aug 19 13:09:51 UTC 2022
-gradle.version=7.2
+#Thu Oct 27 10:05:12 UTC 2022
+gradle.version=7.5.1