react-native-reanimated 2.12.0 → 2.14.0

package/Common/cpp/NativeModules/NativeReanimatedModule.cpp

@@ -3,6 +3,7 @@
 #include <memory>
 #include <thread>
 #include <unordered_map>
+#include <utility>
 
 #include "EventHandlerRegistry.h"
 #include "FeaturesConfig.h"

package/Common/cpp/Tools/ReanimatedVersion.cpp

@@ -0,0 +1,17 @@
+#include "ReanimatedVersion.h"
+
+#ifdef REANIMATED_VERSION
+#define STRINGIZE(x) #x
+#define STRINGIZE2(x) STRINGIZE(x)
+#define REANIMATED_VERSION_STRING STRINGIZE2(REANIMATED_VERSION)
+#endif // REANIMATED_VERSION
+
+using namespace facebook;
+
+namespace reanimated {
+
+jsi::String getReanimatedVersionString(jsi::Runtime &rt) {
+  return jsi::String::createFromUtf8(rt, REANIMATED_VERSION_STRING);
+}
+
+}; // namespace reanimated

package/Common/cpp/Tools/ReanimatedVersion.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include <jsi/jsi.h>
+
+using namespace facebook;
+
+namespace reanimated {
+
+jsi::String getReanimatedVersionString(jsi::Runtime &rt);
+
+};

package/RNReanimated.podspec

@@ -10,6 +10,7 @@ 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'
+version_flag = '-DREANIMATED_VERSION=' + reanimated_package_json["version"]
 
 Pod::Spec.new do |s|
   
@@ -43,7 +44,7 @@ Pod::Spec.new do |s|
   s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
   s.xcconfig               = {
     "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 
+    "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + version_flag
   }
 
   s.requires_arc = true

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

@@ -1,2 +1,2 @@
-#Thu Oct 27 10:05:12 UTC 2022
+#Wed Jan 11 16:23:50 UTC 2023
 gradle.version=7.5.1

package/android/CMakeLists.txt

@@ -3,20 +3,31 @@ cmake_minimum_required(VERSION 3.8)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 17)
-set (DEFAULT_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DFOLLY_HAVE_RECVMMSG=1 -DFOLLY_HAVE_PTHREAD=1 -DANDROID -DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION} -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -std=c++17 -Wall -Werror")
-if(${IS_NEW_ARCHITECTURE_ENABLED})
-    set (ALL_FLAGS "${DEFAULT_FLAGS} -DRCT_NEW_ARCH_ENABLED")
+
+# default CMAKE_CXX_FLAGS: "-g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-protector-all"
+
+if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
+    include("${REACT_NATIVE_DIR}/ReactAndroid/cmake-utils/folly-flags.cmake")
+    add_compile_options(${folly_FLAGS})
 else()
-    set (ALL_FLAGS ${DEFAULT_FLAGS})
+    set(folly_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DFOLLY_HAVE_RECVMMSG=1 -DFOLLY_HAVE_PTHREAD=1")
+    string(APPEND CMAKE_CXX_FLAGS " ${folly_FLAGS}")
 endif()
-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND NOT ${REANIMATED_PACKAGE_BUILD} STREQUAL "1")
-    set (ALL_FLAGS "${ALL_FLAGS} -DDEBUG")
+
+string(APPEND CMAKE_CXX_FLAGS " -DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION} -DREANIMATED_VERSION=${REANIMATED_VERSION} -DHERMES_ENABLE_DEBUGGER=${HERMES_ENABLE_DEBUGGER}")
+
+string(APPEND CMAKE_CXX_FLAGS " -fexceptions -fno-omit-frame-pointer -frtti -fstack-protector-all -std=c++17 -Wall -Werror")
+
+if(${IS_NEW_ARCHITECTURE_ENABLED})
+    string(APPEND CMAKE_CXX_FLAGS " -DRCT_NEW_ARCH_ENABLED")
 endif()
-set (CMAKE_CXX_FLAGS ${ALL_FLAGS})
 
 if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND NOT ${REANIMATED_PACKAGE_BUILD} STREQUAL "1")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
+    string(APPEND CMAKE_CXX_FLAGS " -DDEBUG")
+endif()
+
+if(${REANIMATED_PACKAGE_BUILD} STREQUAL "1")
+    string(REPLACE "-g " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 endif()
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -25,37 +36,39 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
 set (PACKAGE_NAME "reanimated")
 set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set (SRC_DIR ${CMAKE_SOURCE_DIR}/src)
-
 set (COMMON_SRC_DIR "${CMAKE_SOURCE_DIR}/../Common")
-if(${IS_NEW_ARCHITECTURE_ENABLED})
-    if(${CLIENT_SIDE_BUILD})
-        set (RN_SO_DIR "${CMAKE_SOURCE_DIR}/../../../android/app/build/react-ndk/exported")
-        set (FBJNI_HEADERS_DIR "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/fbjni/headers")
-    else()
-        # Reanimated Playground app
-        set (RN_SO_DIR "${CMAKE_SOURCE_DIR}/../${PLAYGROUND_APP_NAME}/android/app/build/react-ndk/exported")
-        set (FBJNI_HEADERS_DIR "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/fbjni/headers")
 
+file(GLOB_RECURSE SOURCES_COMMON CONFIGURE_DEPENDS "${COMMON_SRC_DIR}/cpp/**.cpp")
+file(GLOB_RECURSE SOURCES_ANDROID CONFIGURE_DEPENDS "${SRC_DIR}/main/cpp/**.cpp")
+
+if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
+    # Consume shared libraries and headers from prefabs
+    find_package(fbjni REQUIRED CONFIG)
+    find_package(ReactAndroid REQUIRED CONFIG)
+    if(${JS_RUNTIME} STREQUAL "hermes")
+        find_package(hermes-engine REQUIRED CONFIG)
     endif()
 else()
-    set (RN_SO_DIR ${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/react/jni)
-    set (FBJNI_HEADERS_DIR "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+    # Consume shared libraries from found .so files
+    if(${IS_NEW_ARCHITECTURE_ENABLED})
+        if(${CLIENT_SIDE_BUILD})
+            set (RN_SO_DIR "${CMAKE_SOURCE_DIR}/../../../android/app/build/react-ndk/exported")
+            set (FBJNI_HEADERS_DIR "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+        else()
+            # Reanimated Playground app
+            set (RN_SO_DIR "${CMAKE_SOURCE_DIR}/../${PLAYGROUND_APP_NAME}/android/app/build/react-ndk/exported")
+            set (FBJNI_HEADERS_DIR "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+        endif()
+    else()
+        set (RN_SO_DIR ${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/react/jni)
+        set (FBJNI_HEADERS_DIR "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+    endif()
+    file (GLOB LIBRN_DIR "${RN_SO_DIR}/${ANDROID_ABI}")
 endif()
 
-file (GLOB LIBRN_DIR "${RN_SO_DIR}/${ANDROID_ABI}")
-
-file(GLOB_RECURSE SOURCES_COMMON CONFIGURE_DEPENDS "${COMMON_SRC_DIR}/cpp/**.cpp")
-file(GLOB_RECURSE SOURCES_ANDROID CONFIGURE_DEPENDS "${SRC_DIR}/main/cpp/**.cpp")
-
 if(${REACT_NATIVE_MINOR_VERSION} LESS 66)
-        set (
-                INCLUDE_JSI_CPP
-                "${REACT_NATIVE_DIR}/ReactCommon/jsi/jsi/jsi.cpp"
-        )
-        set (
-                INCLUDE_JSIDYNAMIC_CPP
-                "${REACT_NATIVE_DIR}/ReactCommon/jsi/jsi/JSIDynamic.cpp"
-        )
+    set(INCLUDE_JSI_CPP "${REACT_NATIVE_DIR}/ReactCommon/jsi/jsi/jsi.cpp")
+    set(INCLUDE_JSIDYNAMIC_CPP "${REACT_NATIVE_DIR}/ReactCommon/jsi/jsi/JSIDynamic.cpp")
 endif()
 
 add_library(
@@ -69,33 +82,14 @@ add_library(
 
 # includes
 
-file (GLOB LIBFBJNI_INCLUDE_DIR ${FBJNI_HEADERS_DIR})
-
 target_include_directories(
         ${PACKAGE_NAME}
         PRIVATE
-        "${LIBFBJNI_INCLUDE_DIR}"
-        "${BUILD_DIR}/third-party-ndk/boost/boost_${BOOST_VERSION}"
-        "${BUILD_DIR}/third-party-ndk/double-conversion"
-        "${BUILD_DIR}/third-party-ndk/folly"
-        "${BUILD_DIR}/third-party-ndk/glog/exported"
-        "${REACT_NATIVE_DIR}/React"
-        "${REACT_NATIVE_DIR}/React/Base"
-        "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni"
-        "${REACT_NATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
-        "${REACT_NATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/fabric/jni"
-        "${REACT_NATIVE_DIR}/ReactCommon"
-        "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
-        "${REACT_NATIVE_DIR}/ReactCommon/jsi"
-        "${REACT_NATIVE_DIR}/ReactCommon/react/renderer/graphics/platform/cxx"
-        "${REACT_NATIVE_DIR}/ReactCommon/runtimeexecutor"
-        "${REACT_NATIVE_DIR}/ReactCommon/turbomodule/core"
-        "${REACT_NATIVE_DIR}/ReactCommon/turbomodule"
-        "${REACT_NATIVE_DIR}/ReactCommon/yoga"
         "${COMMON_SRC_DIR}/cpp/Tools"
         "${COMMON_SRC_DIR}/cpp/SpecTools"
         "${COMMON_SRC_DIR}/cpp/NativeModules"
         "${COMMON_SRC_DIR}/cpp/SharedItems"
+        "${COMMON_SRC_DIR}/cpp/ReanimatedRuntime"
         "${COMMON_SRC_DIR}/cpp/Registries"
         "${COMMON_SRC_DIR}/cpp/LayoutAnimations"
         "${COMMON_SRC_DIR}/cpp/AnimatedSensor"
@@ -104,157 +98,165 @@ target_include_directories(
         "${SRC_DIR}/main/cpp"
 )
 
-find_library(
-        LOG_LIB
-        log
-)
-find_library(
-        REACT_NATIVE_JNI_LIB
-        reactnativejni
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-find_library(
-        GLOG_LIB
-        glog
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-find_library(
-        FBJNI_LIB
-        fbjni
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-
-if(${REACT_NATIVE_MINOR_VERSION} LESS 69)
-    find_library(
-            FOLLY_LIB
-            folly_json
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
+if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
+    target_include_directories(
+            ${PACKAGE_NAME}
+            PRIVATE
+            "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/turbomodule"
+            "${REACT_NATIVE_DIR}/ReactCommon"
+            "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
+            "${REACT_NATIVE_DIR}/ReactCommon/react/renderer/graphics/platform/cxx"
+            "${REACT_NATIVE_DIR}/ReactCommon/runtimeexecutor"
+            "${REACT_NATIVE_DIR}/ReactCommon/yoga"
     )
 else()
-    find_library(
-            FOLLY_LIB
-            folly_runtime
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
+    file(GLOB LIBFBJNI_INCLUDE_DIR ${FBJNI_HEADERS_DIR})
+    target_include_directories(
+            ${PACKAGE_NAME}
+            PRIVATE
+            "${LIBFBJNI_INCLUDE_DIR}"
+            "${BUILD_DIR}/third-party-ndk/boost/boost_${BOOST_VERSION}"
+            "${BUILD_DIR}/third-party-ndk/double-conversion"
+            "${BUILD_DIR}/third-party-ndk/folly"
+            "${BUILD_DIR}/third-party-ndk/glog/exported"
+            "${REACT_NATIVE_DIR}/React"
+            "${REACT_NATIVE_DIR}/React/Base"
+            "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni"
+            "${REACT_NATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
+            "${REACT_NATIVE_DIR}/ReactAndroid/src/main/java/com/facebook/react/fabric/jni"
+            "${REACT_NATIVE_DIR}/ReactCommon"
+            "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
+            "${REACT_NATIVE_DIR}/ReactCommon/jsi"
+            "${REACT_NATIVE_DIR}/ReactCommon/hermes"
+            "${REACT_NATIVE_DIR}/ReactCommon/react/renderer/graphics/platform/cxx"
+            "${REACT_NATIVE_DIR}/ReactCommon/runtimeexecutor"
+            "${REACT_NATIVE_DIR}/ReactCommon/turbomodule/core"
+            "${REACT_NATIVE_DIR}/ReactCommon/turbomodule"
+            "${REACT_NATIVE_DIR}/ReactCommon/yoga"
     )
 endif()
 
-if(${REACT_NATIVE_MINOR_VERSION} LESS 66)
-    set (JSI_LIB "")
-else()
-    find_library(
-            JSI_LIB
-            jsi
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-endif()
+# build shared lib
 
-if(${IS_NEW_ARCHITECTURE_ENABLED})
-    find_library(
-            REACT_RENDER_UIMANAGER
-            react_render_uimanager
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-    find_library(
-            REACT_RENDER_MOUNTING
-            react_render_mounting
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-    find_library(
-            REACT_RENDER_COMPONENTREGISTRY
-            react_render_componentregistry
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-    find_library(
-            REACT_RENDER_CORE
-            react_render_core
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-    find_library(
-            REACT_DEBUG
-            react_debug
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-    find_library(
-            REACT_RENDER_DEBUG
-            react_render_debug
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
+set_target_properties(${PACKAGE_NAME} PROPERTIES LINKER_LANGUAGE CXX)
+
+target_link_libraries(
+        ${PACKAGE_NAME}
+        log
+        android
+)
+
+if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
+    target_link_libraries(
+            ${PACKAGE_NAME}
+            ReactAndroid::folly_runtime
+            ReactAndroid::glog
+            ReactAndroid::jsi
+            ReactAndroid::reactnativejni
+            fbjni::fbjni
     )
+else()
+    if(${REACT_NATIVE_MINOR_VERSION} LESS 66)
+        set (JSI_LIB "")
+    else()
+        find_library(
+                JSI_LIB
+                jsi
+                PATHS ${LIBRN_DIR}
+                NO_CMAKE_FIND_ROOT_PATH
+        )
+    endif()
+
     find_library(
-            RRC_ROOT
-            rrc_root
+            GLOG_LIB
+            glog
             PATHS ${LIBRN_DIR}
             NO_CMAKE_FIND_ROOT_PATH
     )
+
     find_library(
-            RRC_VIEW
-            rrc_view
+            FBJNI_LIB
+            fbjni
             PATHS ${LIBRN_DIR}
             NO_CMAKE_FIND_ROOT_PATH
     )
+
+    if(${REACT_NATIVE_MINOR_VERSION} LESS 69)
+        find_library(
+                FOLLY_LIB
+                folly_json
+                PATHS ${LIBRN_DIR}
+                NO_CMAKE_FIND_ROOT_PATH
+        )
+    else()
+        find_library(
+                FOLLY_LIB
+                folly_runtime
+                PATHS ${LIBRN_DIR}
+                NO_CMAKE_FIND_ROOT_PATH
+        )
+    endif()
+
     find_library(
-            REACT_RENDER_SCHEDULER
-            react_render_scheduler
+            REACTNATIVEJNI_LIB
+            reactnativejni
             PATHS ${LIBRN_DIR}
             NO_CMAKE_FIND_ROOT_PATH
     )
-    find_library(
-            FABRICJNI
-            fabricjni
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
+
+    target_link_libraries(
+            ${PACKAGE_NAME}
+            ${JSI_LIB}
+            ${GLOG_LIB}
+            ${FBJNI_LIB}
+            ${FOLLY_LIB}
+            ${REACTNATIVEJNI_LIB}
     )
 endif()
 
-# build shared lib
-
-set_target_properties(${PACKAGE_NAME} PROPERTIES LINKER_LANGUAGE CXX)
-
-
-target_link_libraries(
-        ${PACKAGE_NAME}
-        ${LOG_LIB}
-        ${JSI_LIB}
-        ${GLOG_LIB}
-        ${FBJNI_LIB}
-        ${FOLLY_LIB}
-        ${REACT_NATIVE_JNI_LIB}
-        android
-)
-
 if(${JS_RUNTIME} STREQUAL "hermes")
     string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_HERMES=1")
-    if(${REACT_NATIVE_MINOR_VERSION} LESS 69)
-        # From `hermes-engine` npm package
+    if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
+        # From prefab from module `com.facebook.react:hermes-android`
+        set(HERMES_LIB hermes-engine::libhermes)
+    elseif(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 69)
+        # Bundled Hermes from module `com.facebook.react:hermes-engine` or project `:ReactAndroid:hermes-engine`
         target_include_directories(
                 ${PACKAGE_NAME}
                 PRIVATE
-                "${JS_RUNTIME_DIR}/android/include"
+                "${JS_RUNTIME_DIR}/API"
+                "${JS_RUNTIME_DIR}/public"
         )
+        set(HERMES_LIB "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}/libhermes.so")
     else()
-        # Bundled Hermes from module `com.facebook.react:hermes-engine` or project `:ReactAndroid:hermes-engine`
+        # From `hermes-engine` npm package
         target_include_directories(
                 ${PACKAGE_NAME}
                 PRIVATE
-                "${JS_RUNTIME_DIR}/API"
-                "${JS_RUNTIME_DIR}/public"
+                "${JS_RUNTIME_DIR}/android/include"
         )
+        set(HERMES_LIB "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}/libhermes.so")
     endif()
     target_link_libraries(
             ${PACKAGE_NAME}
-            "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}/libhermes.so"
+            ${HERMES_LIB}
     )
+    if (${HERMES_ENABLE_DEBUGGER})
+        if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
+            set(HERMES_EXECUTOR_LIB ReactAndroid::hermes_executor)
+        else()
+            find_library(
+                    HERMES_EXECUTOR_LIB
+                    hermes-executor-debug
+                    PATHS ${LIBRN_DIR}
+                    NO_CMAKE_FIND_ROOT_PATH
+            )
+        endif()
+        target_link_libraries(
+                ${PACKAGE_NAME}
+                ${HERMES_EXECUTOR_LIB}
+        )
+    endif()
 elseif(${JS_RUNTIME} STREQUAL "v8")
     string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_V8=1")
     target_include_directories(
@@ -273,33 +275,33 @@ elseif(${JS_RUNTIME} STREQUAL "v8")
             ${PACKAGE_NAME}
             ${V8EXECUTOR_LIB}
     )
-else()
+elseif(${JS_RUNTIME} STREQUAL "jsc")
     string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_JSC=1")
-    find_library(
-            JSEXECUTOR_LIB
-            jscexecutor
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-    target_link_libraries(
-            ${PACKAGE_NAME}
-            ${JSEXECUTOR_LIB}
-    )
+    if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
+        set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
+    else()
+        find_library(
+                JSEXECUTOR_LIB
+                jscexecutor
+                PATHS ${LIBRN_DIR}
+                NO_CMAKE_FIND_ROOT_PATH
+        )
+    endif()
+    target_link_libraries(${PACKAGE_NAME} ${JSEXECUTOR_LIB})
+else()
+    message(FATAL_ERROR "Unknown JS runtime ${JS_RUNTIME}.")
 endif()
 
 if(${IS_NEW_ARCHITECTURE_ENABLED})
     target_link_libraries(
             ${PACKAGE_NAME}
-            ${REACT_RENDER_UIMANAGER}
-            ${REACT_RENDER_MOUNTING}
-            ${REACT_RENDER_COMPONENTREGISTRY}
-            ${REACT_RENDER_CORE}
-            ${REACT_DEBUG}
-            ${REACT_RENDER_DEBUG}
-            ${RRC_ROOT}
-            ${RRC_VIEW}
-            ${FABRICJNI}
-            ${REACT_RENDER_SCHEDULER}
+            ReactAndroid::fabricjni
+            ReactAndroid::react_debug
+            ReactAndroid::react_render_core
+            ReactAndroid::react_render_mounting
+            ReactAndroid::react_render_scheduler
+            ReactAndroid::react_render_uimanager
+            ReactAndroid::rrc_view
     )
 endif()
 
@@ -318,4 +320,5 @@ endif()
 set (ignoreMe "${CLIENT_SIDE_BUILD}")
 set (ignoreMe "${JS_RUNTIME_DIR}")
 set (ignoreMe "${PLAYGROUND_APP_NAME}")
-set (ignoreMe "${HERMES_ENABLE_DEBUGGER}")
+set (ignoreMe "${REANIMATED_PACKAGE_BUILD}")
+set (ignoreMe "${BOOST_VERSION}")