react-native-reanimated 2.2.2 → 2.2.3

package/RNReanimated.podspec

@@ -5,9 +5,10 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 reactVersion = '0.0.0'
 
 begin
-  reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "react-native", "package.json")))["version"]
+  reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")))["version"]
 rescue
-  reactVersion = '0.64.0'
+  # Example app
+  reactVersion = JSON.parse(File.read(File.join(__dir__, "node_modules", "react-native", "package.json")))["version"]
 end
 
 rnVersion = reactVersion.split('.')[1]
@@ -20,7 +21,7 @@ end
 
 folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DRNVERSION=' + rnVersion
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -49,12 +50,12 @@ Pod::Spec.new do |s|
 
   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-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\" "
   }
   s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
   s.xcconfig               = {
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-    "HEADER_SEARCH_PATHS" => "\"$(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\"",
+    "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  }
 
   s.requires_arc = true
@@ -95,4 +96,3 @@ Pod::Spec.new do |s|
   s.dependency "#{folly_prefix}Folly"
 
 end
-

package/android/build.gradle

@@ -31,19 +31,13 @@ abstract class replaceSoTask extends DefaultTask {
 def getCurrentFlavor() {
     Gradle gradle = getGradle()
     String taskRequestName = gradle.getStartParameter().getTaskRequests().toString()
-    Pattern pattern
-
-    if(taskRequestName.contains("assemble")) {
-        pattern = Pattern.compile("assemble(\\w+)(Release|Debug)")
-    }
-    else {
-        pattern = Pattern.compile("generate(\\w+)(Release|Debug)")
-    }
+    Pattern pattern = Pattern.compile("(assemble|install|generate)(\\w+)(Release|Debug)")
     Matcher matcher = pattern.matcher(taskRequestName)
 
     if(matcher.find()) {
-        return matcher.group(1).toLowerCase()
+        return matcher.group(2)
     }
+
     return ""
 }
 

package/ios/native/REAInitializer.mm

@@ -17,7 +17,16 @@ JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
 {
     [bridge moduleForClass:[RCTEventDispatcher class]];
     RCTEventDispatcher *eventDispatcher = [REAEventDispatcher new];
+    #if RNVERSION >= 66
+    RCTCallableJSModules *callableJSModules = [RCTCallableJSModules new];
+    [bridge setValue:callableJSModules forKey:@"_callableJSModules"];
+    [callableJSModules setBridge:bridge];
+    [eventDispatcher setValue:callableJSModules forKey:@"_callableJSModules"];
+    [eventDispatcher setValue:bridge forKey:@"_bridge"];
+    [eventDispatcher initialize];
+    #else
     [eventDispatcher setBridge:bridge];
+    #endif
     [bridge updateModuleWithInstance:eventDispatcher];
      _bridge_reanimated = bridge;
     const auto runtimeInstaller = [bridge, runtimeInstallerToWrap](facebook::jsi::Runtime &runtime) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
@@ -81,7 +81,7 @@
     "@types/babel__generator": "^7.6.2",
     "@types/babel__traverse": "^7.0.15",
     "@types/jest": "^26.0.15",
-    "@types/react-native": "^0.64.2",
+    "@types/react-native": "^0.65.5",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
     "@typescript-eslint/parser": "^4.15.1",
     "babel-eslint": "^10.0.3",
@@ -100,7 +100,7 @@
     "lint-staged": "^10.2.11",
     "prettier": "^2.2.1",
     "react": "17.0.1",
-    "react-native": "0.64.1",
+    "react-native": "0.66.0",
     "react-native-gesture-handler": "^1.6.1",
     "react-test-renderer": "17.0.1",
     "release-it": "^13.1.1",