refactor: Split cmake and podspec for worklets (#6334)

## Summary This is another step towards extracting `react-native-worklets`. We split `CMakeLists.txt` for targets `reanimated` and `worklets`, and also split `.podspec` for two subspecs. The native code is still a bit tangled (Worklets require headers from Reanimated etc.), it will be tackled in future PRs. ## Test plan Example apps build and run: - on Paper: - [x] in development - [x] in production - on Fabric: - [x] in development - [x] in production
software-mansion · Jul 31, 2024 · 485a600 · 485a600
1 parent 158602b
commit 485a600
Show file tree

Hide file tree

Showing 73 changed files with 320 additions and 156 deletions.
diff --git a/apps/fabric-example/ios/Podfile.lock b/apps/fabric-example/ios/Podfile.lock
@@ -1380,6 +1380,50 @@ PODS:
     - ReactCommon/turbomodule/core
     - Yoga
   - RNReanimated (3.14.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - RNReanimated/reanimated (= 3.14.0)
+    - RNReanimated/worklets (= 3.14.0)
+    - Yoga
+  - RNReanimated/reanimated (3.14.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - RNReanimated/worklets (3.14.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1757,7 +1801,7 @@ SPEC CHECKSUMS:
   RNCPicker: e84f13a98cbc8977870692948ccae15a389461bb
   RNFlashList: c52e511c81ede0b8e44d4eb884b8a861976b111d
   RNGestureHandler: 156548e18203327173a764c6932a3f52e90cb9cd
-  RNReanimated: 3ab1513708434e176c54fb5de2518f047765c0cb
+  RNReanimated: 062288a39daae5d5dcd59174b530e886a423a957
   RNScreens: a68878603ae871d339f683bc683803545422986f
   RNSVG: 02051bffb0b2fb2166e85009a58211643434ff63
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d

diff --git a/apps/paper-example/ios/Podfile.lock b/apps/paper-example/ios/Podfile.lock
@@ -1256,6 +1256,50 @@ PODS:
     - ReactCommon/turbomodule/core
     - Yoga
   - RNReanimated (3.14.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - RNReanimated/reanimated (= 3.14.0)
+    - RNReanimated/worklets (= 3.14.0)
+    - Yoga
+  - RNReanimated/reanimated (3.14.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - RNReanimated/worklets (3.14.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1570,7 +1614,7 @@ SPEC CHECKSUMS:
   RNCPicker: 3e2c37a8328f368ce14da050cdc8231deb5fc9f9
   RNFlashList: e9b57a5553639f9b528cc50ab53f25831722ed62
   RNGestureHandler: 2282cfbcf86c360d29f44ace393203afd5c6cff7
-  RNReanimated: 03a170d6b020e03de41bbc6817c665f8679248f8
+  RNReanimated: 771c92dd6787dd6f18889dea61ff423694bff638
   RNScreens: 52f2565581af64b1b410d49784cf8342ed94ca28
   RNSVG: 43b64ed39c14ce830d840903774154ca0c1f27ec
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d

diff --git a/packages/react-native-reanimated/Common/cpp/Tools/ReanimatedHiddenHeaders.h b/packages/react-native-reanimated/Common/cpp/Tools/ReanimatedHiddenHeaders.h
diff --git a/...p/AnimatedSensor/AnimatedSensorModule.cpp → ...d/AnimatedSensor/AnimatedSensorModule.cpp b/...p/AnimatedSensor/AnimatedSensorModule.cpp → ...d/AnimatedSensor/AnimatedSensorModule.cpp
diff --git a/...cpp/AnimatedSensor/AnimatedSensorModule.h → ...ted/AnimatedSensor/AnimatedSensorModule.h b/...cpp/AnimatedSensor/AnimatedSensorModule.h → ...ted/AnimatedSensor/AnimatedSensorModule.h
diff --git a/...mated/Common/cpp/Fabric/PropsRegistry.cpp → ...n/cpp/reanimated/Fabric/PropsRegistry.cpp b/...mated/Common/cpp/Fabric/PropsRegistry.cpp → ...n/cpp/reanimated/Fabric/PropsRegistry.cpp
diff --git a/...nimated/Common/cpp/Fabric/PropsRegistry.h → ...mon/cpp/reanimated/Fabric/PropsRegistry.h b/...nimated/Common/cpp/Fabric/PropsRegistry.h → ...mon/cpp/reanimated/Fabric/PropsRegistry.h
diff --git a/...ommon/cpp/Fabric/ReanimatedCommitHook.cpp → ...eanimated/Fabric/ReanimatedCommitHook.cpp b/...ommon/cpp/Fabric/ReanimatedCommitHook.cpp → ...eanimated/Fabric/ReanimatedCommitHook.cpp
diff --git a/.../Common/cpp/Fabric/ReanimatedCommitHook.h → .../reanimated/Fabric/ReanimatedCommitHook.h b/.../Common/cpp/Fabric/ReanimatedCommitHook.h → .../reanimated/Fabric/ReanimatedCommitHook.h
diff --git a/...n/cpp/Fabric/ReanimatedCommitShadowNode.h → ...mated/Fabric/ReanimatedCommitShadowNode.h b/...n/cpp/Fabric/ReanimatedCommitShadowNode.h → ...mated/Fabric/ReanimatedCommitShadowNode.h
diff --git a/...ed/Common/cpp/Fabric/ShadowTreeCloner.cpp → ...pp/reanimated/Fabric/ShadowTreeCloner.cpp b/...ed/Common/cpp/Fabric/ShadowTreeCloner.cpp → ...pp/reanimated/Fabric/ShadowTreeCloner.cpp
diff --git a/...ated/Common/cpp/Fabric/ShadowTreeCloner.h → .../cpp/reanimated/Fabric/ShadowTreeCloner.h b/...ated/Common/cpp/Fabric/ShadowTreeCloner.h → .../cpp/reanimated/Fabric/ShadowTreeCloner.h
diff --git a/...pp/LayoutAnimations/LayoutAnimationType.h → ...ed/LayoutAnimations/LayoutAnimationType.h b/...pp/LayoutAnimations/LayoutAnimationType.h → ...ed/LayoutAnimations/LayoutAnimationType.h
diff --git a/...outAnimations/LayoutAnimationsManager.cpp → ...outAnimations/LayoutAnimationsManager.cpp b/...outAnimations/LayoutAnimationsManager.cpp → ...outAnimations/LayoutAnimationsManager.cpp
@@ -1,6 +1,5 @@
 #include "LayoutAnimationsManager.h"
 #include "CollectionUtils.h"
-#include "Shareables.h"
 
 #ifndef NDEBUG
 #include <utility>

diff --git a/...ayoutAnimations/LayoutAnimationsManager.h → ...ayoutAnimations/LayoutAnimationsManager.h b/...ayoutAnimations/LayoutAnimationsManager.h → ...ayoutAnimations/LayoutAnimationsManager.h
diff --git a/...ayoutAnimations/LayoutAnimationsProxy.cpp → ...ayoutAnimations/LayoutAnimationsProxy.cpp b/...ayoutAnimations/LayoutAnimationsProxy.cpp → ...ayoutAnimations/LayoutAnimationsProxy.cpp
diff --git a/.../LayoutAnimations/LayoutAnimationsProxy.h → .../LayoutAnimations/LayoutAnimationsProxy.h b/.../LayoutAnimations/LayoutAnimationsProxy.h → .../LayoutAnimations/LayoutAnimationsProxy.h
diff --git a/...ayoutAnimations/LayoutAnimationsUtils.cpp → ...ayoutAnimations/LayoutAnimationsUtils.cpp b/...ayoutAnimations/LayoutAnimationsUtils.cpp → ...ayoutAnimations/LayoutAnimationsUtils.cpp
diff --git a/.../LayoutAnimations/LayoutAnimationsUtils.h → .../LayoutAnimations/LayoutAnimationsUtils.h b/.../LayoutAnimations/LayoutAnimationsUtils.h → .../LayoutAnimations/LayoutAnimationsUtils.h
diff --git a/.../NativeModules/NativeReanimatedModule.cpp → .../NativeModules/NativeReanimatedModule.cpp b/.../NativeModules/NativeReanimatedModule.cpp → .../NativeModules/NativeReanimatedModule.cpp
@@ -10,9 +10,7 @@
 
 #include <functional>
 #include <iomanip>
-#include <memory>
 #include <sstream>
-#include <string>
 #include <thread>
 #include <unordered_map>
 
@@ -26,7 +24,6 @@
 #include "CollectionUtils.h"
 #include "EventHandlerRegistry.h"
 #include "FeaturesConfig.h"
-#include "JSScheduler.h"
 #include "ReanimatedHiddenHeaders.h"
 #include "Shareables.h"
 #include "UIRuntimeDecorator.h"

diff --git a/...pp/NativeModules/NativeReanimatedModule.h → ...ed/NativeModules/NativeReanimatedModule.h b/...pp/NativeModules/NativeReanimatedModule.h → ...ed/NativeModules/NativeReanimatedModule.h
diff --git a/...iveModules/NativeReanimatedModuleSpec.cpp → ...iveModules/NativeReanimatedModuleSpec.cpp b/...iveModules/NativeReanimatedModuleSpec.cpp → ...iveModules/NativeReanimatedModuleSpec.cpp
diff --git a/...ativeModules/NativeReanimatedModuleSpec.h → ...ativeModules/NativeReanimatedModuleSpec.h b/...ativeModules/NativeReanimatedModuleSpec.h → ...ativeModules/NativeReanimatedModuleSpec.h
diff --git a/...imated/Common/cpp/Tools/CollectionUtils.h → ...on/cpp/reanimated/Tools/CollectionUtils.h b/...imated/Common/cpp/Tools/CollectionUtils.h → ...on/cpp/reanimated/Tools/CollectionUtils.h
diff --git a/...mated/Common/cpp/Tools/FeaturesConfig.cpp → ...n/cpp/reanimated/Tools/FeaturesConfig.cpp b/...mated/Common/cpp/Tools/FeaturesConfig.cpp → ...n/cpp/reanimated/Tools/FeaturesConfig.cpp
diff --git a/...nimated/Common/cpp/Tools/FeaturesConfig.h → ...mon/cpp/reanimated/Tools/FeaturesConfig.h b/...nimated/Common/cpp/Tools/FeaturesConfig.h → ...mon/cpp/reanimated/Tools/FeaturesConfig.h
diff --git a/...mmon/cpp/Tools/PlatformDepMethodsHolder.h → ...animated/Tools/PlatformDepMethodsHolder.h b/...mmon/cpp/Tools/PlatformDepMethodsHolder.h → ...animated/Tools/PlatformDepMethodsHolder.h
diff --git a/.../Common/cpp/Tools/SingleInstanceChecker.h → .../reanimated/Tools/SingleInstanceChecker.h b/.../Common/cpp/Tools/SingleInstanceChecker.h → .../reanimated/Tools/SingleInstanceChecker.h
diff --git a/...d/Common/cpp/Tools/UIRuntimeDecorator.cpp → ...p/reanimated/Tools/UIRuntimeDecorator.cpp b/...d/Common/cpp/Tools/UIRuntimeDecorator.cpp → ...p/reanimated/Tools/UIRuntimeDecorator.cpp
diff --git a/...ted/Common/cpp/Tools/UIRuntimeDecorator.h → ...cpp/reanimated/Tools/UIRuntimeDecorator.h b/...ted/Common/cpp/Tools/UIRuntimeDecorator.h → ...cpp/reanimated/Tools/UIRuntimeDecorator.h
diff --git a/...klets/Registries/EventHandlerRegistry.cpp → ...klets/Registries/EventHandlerRegistry.cpp b/...klets/Registries/EventHandlerRegistry.cpp → ...klets/Registries/EventHandlerRegistry.cpp
diff --git a/...orklets/Registries/EventHandlerRegistry.h → ...orklets/Registries/EventHandlerRegistry.h b/...orklets/Registries/EventHandlerRegistry.h → ...orklets/Registries/EventHandlerRegistry.h
diff --git a/...ets/Registries/WorkletRuntimeRegistry.cpp → ...ets/Registries/WorkletRuntimeRegistry.cpp b/...ets/Registries/WorkletRuntimeRegistry.cpp → ...ets/Registries/WorkletRuntimeRegistry.cpp
diff --git a/...klets/Registries/WorkletRuntimeRegistry.h → ...klets/Registries/WorkletRuntimeRegistry.h b/...klets/Registries/WorkletRuntimeRegistry.h → ...klets/Registries/WorkletRuntimeRegistry.h
diff --git a/...n/cpp/Worklets/SharedItems/Shareables.cpp → ...n/cpp/worklets/SharedItems/Shareables.cpp b/...n/cpp/Worklets/SharedItems/Shareables.cpp → ...n/cpp/worklets/SharedItems/Shareables.cpp
diff --git a/...mon/cpp/Worklets/SharedItems/Shareables.h → ...mon/cpp/worklets/SharedItems/Shareables.h b/...mon/cpp/Worklets/SharedItems/Shareables.h → ...mon/cpp/worklets/SharedItems/Shareables.h
diff --git a/.../Common/cpp/Worklets/Tools/AsyncQueue.cpp → .../Common/cpp/worklets/Tools/AsyncQueue.cpp b/.../Common/cpp/Worklets/Tools/AsyncQueue.cpp → .../Common/cpp/worklets/Tools/AsyncQueue.cpp
diff --git a/...ed/Common/cpp/Worklets/Tools/AsyncQueue.h → ...ed/Common/cpp/worklets/Tools/AsyncQueue.h b/...ed/Common/cpp/Worklets/Tools/AsyncQueue.h → ...ed/Common/cpp/worklets/Tools/AsyncQueue.h
diff --git a/...mmon/cpp/Worklets/Tools/JSISerializer.cpp → ...mmon/cpp/worklets/Tools/JSISerializer.cpp b/...mmon/cpp/Worklets/Tools/JSISerializer.cpp → ...mmon/cpp/worklets/Tools/JSISerializer.cpp
diff --git a/...Common/cpp/Worklets/Tools/JSISerializer.h → ...Common/cpp/worklets/Tools/JSISerializer.h b/...Common/cpp/Worklets/Tools/JSISerializer.h → ...Common/cpp/worklets/Tools/JSISerializer.h
diff --git a/...ed/Common/cpp/Worklets/Tools/JSLogger.cpp → ...ed/Common/cpp/worklets/Tools/JSLogger.cpp b/...ed/Common/cpp/Worklets/Tools/JSLogger.cpp → ...ed/Common/cpp/worklets/Tools/JSLogger.cpp
diff --git a/...ated/Common/cpp/Worklets/Tools/JSLogger.h → ...ated/Common/cpp/worklets/Tools/JSLogger.h b/...ated/Common/cpp/Worklets/Tools/JSLogger.h → ...ated/Common/cpp/worklets/Tools/JSLogger.h
diff --git a/...Common/cpp/Worklets/Tools/JSScheduler.cpp → ...Common/cpp/worklets/Tools/JSScheduler.cpp b/...Common/cpp/Worklets/Tools/JSScheduler.cpp → ...Common/cpp/worklets/Tools/JSScheduler.cpp
diff --git a/...d/Common/cpp/Worklets/Tools/JSScheduler.h → ...d/Common/cpp/worklets/Tools/JSScheduler.h b/...d/Common/cpp/Worklets/Tools/JSScheduler.h → ...d/Common/cpp/worklets/Tools/JSScheduler.h
diff --git a/packages/react-native-reanimated/Common/cpp/worklets/Tools/ReanimatedHiddenHeaders.h b/packages/react-native-reanimated/Common/cpp/worklets/Tools/ReanimatedHiddenHeaders.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#ifdef ANDROID
+#include "Logger.h"
+#include "LoggerInterface.h"
+#include "SpeedChecker.h"
+#else
+#include "Common/cpp/Worklets/hidden_headers/Logger.h"
+#include "Common/cpp/Worklets/hidden_headers/LoggerInterface.h"
+#include "Common/cpp/Worklets/hidden_headers/SpeedChecker.h"
+#endif
diff --git a/...cpp/Worklets/Tools/ReanimatedJSIUtils.cpp → ...cpp/worklets/Tools/ReanimatedJSIUtils.cpp b/...cpp/Worklets/Tools/ReanimatedJSIUtils.cpp → ...cpp/worklets/Tools/ReanimatedJSIUtils.cpp
diff --git a/...n/cpp/Worklets/Tools/ReanimatedJSIUtils.h → ...n/cpp/worklets/Tools/ReanimatedJSIUtils.h b/...n/cpp/Worklets/Tools/ReanimatedJSIUtils.h → ...n/cpp/worklets/Tools/ReanimatedJSIUtils.h
diff --git a/.../cpp/Worklets/Tools/ReanimatedVersion.cpp → .../cpp/worklets/Tools/ReanimatedVersion.cpp b/.../cpp/Worklets/Tools/ReanimatedVersion.cpp → .../cpp/worklets/Tools/ReanimatedVersion.cpp
diff --git a/...on/cpp/Worklets/Tools/ReanimatedVersion.h → ...on/cpp/worklets/Tools/ReanimatedVersion.h b/...on/cpp/Worklets/Tools/ReanimatedVersion.h → ...on/cpp/worklets/Tools/ReanimatedVersion.h
diff --git a/...mmon/cpp/Worklets/Tools/ThreadSafeQueue.h → ...mmon/cpp/worklets/Tools/ThreadSafeQueue.h b/...mmon/cpp/Worklets/Tools/ThreadSafeQueue.h → ...mmon/cpp/worklets/Tools/ThreadSafeQueue.h
diff --git a/...Common/cpp/Worklets/Tools/UIScheduler.cpp → ...Common/cpp/worklets/Tools/UIScheduler.cpp b/...Common/cpp/Worklets/Tools/UIScheduler.cpp → ...Common/cpp/worklets/Tools/UIScheduler.cpp
diff --git a/...d/Common/cpp/Worklets/Tools/UIScheduler.h → ...d/Common/cpp/worklets/Tools/UIScheduler.h b/...d/Common/cpp/Worklets/Tools/UIScheduler.h → ...d/Common/cpp/worklets/Tools/UIScheduler.h
diff --git a/...pp/Worklets/Tools/WorkletEventHandler.cpp → ...pp/worklets/Tools/WorkletEventHandler.cpp b/...pp/Worklets/Tools/WorkletEventHandler.cpp → ...pp/worklets/Tools/WorkletEventHandler.cpp
diff --git a/.../cpp/Worklets/Tools/WorkletEventHandler.h → .../cpp/worklets/Tools/WorkletEventHandler.h b/.../cpp/Worklets/Tools/WorkletEventHandler.h → .../cpp/worklets/Tools/WorkletEventHandler.h
diff --git a/...ets/WorkletRuntime/RNRuntimeDecorator.cpp → ...ets/WorkletRuntime/RNRuntimeDecorator.cpp b/...ets/WorkletRuntime/RNRuntimeDecorator.cpp → ...ets/WorkletRuntime/RNRuntimeDecorator.cpp
diff --git a/...klets/WorkletRuntime/RNRuntimeDecorator.h → ...klets/WorkletRuntime/RNRuntimeDecorator.h b/...klets/WorkletRuntime/RNRuntimeDecorator.h → ...klets/WorkletRuntime/RNRuntimeDecorator.h
diff --git a/...orkletRuntime/ReanimatedHermesRuntime.cpp → ...orkletRuntime/ReanimatedHermesRuntime.cpp b/...orkletRuntime/ReanimatedHermesRuntime.cpp → ...orkletRuntime/ReanimatedHermesRuntime.cpp
diff --git a/.../WorkletRuntime/ReanimatedHermesRuntime.h → .../WorkletRuntime/ReanimatedHermesRuntime.h b/.../WorkletRuntime/ReanimatedHermesRuntime.h → .../WorkletRuntime/ReanimatedHermesRuntime.h
diff --git a/...lets/WorkletRuntime/ReanimatedRuntime.cpp → ...lets/WorkletRuntime/ReanimatedRuntime.cpp b/...lets/WorkletRuntime/ReanimatedRuntime.cpp → ...lets/WorkletRuntime/ReanimatedRuntime.cpp
diff --git a/...rklets/WorkletRuntime/ReanimatedRuntime.h → ...rklets/WorkletRuntime/ReanimatedRuntime.h b/...rklets/WorkletRuntime/ReanimatedRuntime.h → ...rklets/WorkletRuntime/ReanimatedRuntime.h
diff --git a/...s/WorkletRuntime/RuntimeInitialization.md → ...s/WorkletRuntime/RuntimeInitialization.md b/...s/WorkletRuntime/RuntimeInitialization.md → ...s/WorkletRuntime/RuntimeInitialization.md
diff --git a/...orklets/WorkletRuntime/WorkletRuntime.cpp → ...orklets/WorkletRuntime/WorkletRuntime.cpp b/...orklets/WorkletRuntime/WorkletRuntime.cpp → ...orklets/WorkletRuntime/WorkletRuntime.cpp
diff --git a/.../Worklets/WorkletRuntime/WorkletRuntime.h → .../worklets/WorkletRuntime/WorkletRuntime.h b/.../Worklets/WorkletRuntime/WorkletRuntime.h → .../worklets/WorkletRuntime/WorkletRuntime.h
diff --git a/.../WorkletRuntime/WorkletRuntimeCollector.h → .../WorkletRuntime/WorkletRuntimeCollector.h b/.../WorkletRuntime/WorkletRuntimeCollector.h → .../WorkletRuntime/WorkletRuntimeCollector.h
diff --git a/...orkletRuntime/WorkletRuntimeDecorator.cpp → ...orkletRuntime/WorkletRuntimeDecorator.cpp b/...orkletRuntime/WorkletRuntimeDecorator.cpp → ...orkletRuntime/WorkletRuntimeDecorator.cpp
@@ -9,7 +9,7 @@
 #ifdef ANDROID
 #include "Logger.h"
 #else
-#include "Common/cpp/hidden_headers/Logger.h"
+#include "Common/cpp/Worklets/hidden_headers/Logger.h"
 #endif
 
 namespace reanimated {

diff --git a/.../WorkletRuntime/WorkletRuntimeDecorator.h → .../WorkletRuntime/WorkletRuntimeDecorator.h b/.../WorkletRuntime/WorkletRuntimeDecorator.h → .../WorkletRuntime/WorkletRuntimeDecorator.h
diff --git a/...imated/Common/cpp/hidden_headers/Logger.h → ...mmon/cpp/worklets/hidden_headers/Logger.h b/...imated/Common/cpp/hidden_headers/Logger.h → ...mmon/cpp/worklets/hidden_headers/Logger.h
diff --git a/...mmon/cpp/hidden_headers/LoggerInterface.h → ...worklets/hidden_headers/LoggerInterface.h b/...mmon/cpp/hidden_headers/LoggerInterface.h → ...worklets/hidden_headers/LoggerInterface.h
diff --git a/.../Common/cpp/hidden_headers/SpeedChecker.h → ...pp/worklets/hidden_headers/SpeedChecker.h b/.../Common/cpp/hidden_headers/SpeedChecker.h → ...pp/worklets/hidden_headers/SpeedChecker.h
diff --git a/packages/react-native-reanimated/RNReanimated.podspec b/packages/react-native-reanimated/RNReanimated.podspec
@@ -77,14 +77,21 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => ios_min_version, :tvos => "9.0", :osx => "10.14", :visionos => "1.0" }
   s.source       = { :git => "https://github.com/software-mansion/react-native-reanimated.git", :tag => "#{s.version}" }
 
-  s.source_files = [
-    "apple/**/*.{mm,h,m}",
-    "Common/cpp/**/*.{cpp,h}"
-  ]
+  s.subspec "reanimated" do |ss|
+    ss.source_files = [
+      "apple/**/*.{mm,h,m}",
+      "Common/cpp/reanimated/**/*.{cpp,h}",
+    ]
+  end
 
-  s.preserve_paths = [
-    "Common/cpp/hidden_headers/**"
-  ]
+  s.subspec "worklets" do |ss|
+    ss.source_files = [
+      "Common/cpp/worklets/**/*.{cpp,h}",
+    ]
+    ss.preserve_paths = [
+      "Common/cpp/worklets/hidden_headers/**"
+    ]
+  end
 
   gcc_debug_definitions = "$(inherited)"
   if $config[:react_native_minor_version] >= 73 || !is_release

diff --git a/packages/react-native-reanimated/android/CMakeLists.txt b/packages/react-native-reanimated/android/CMakeLists.txt
@@ -1,15 +1,18 @@
 project(Reanimated)
 cmake_minimum_required(VERSION 3.8)
 
-set (CMAKE_VERBOSE_MAKEFILE ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
+
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
 if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 73)
-    set (CMAKE_CXX_STANDARD 20)
+    set(CMAKE_CXX_STANDARD 20)
 else()
-    set (CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD 17)
 endif()
 
 # 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"
-
 include("${REACT_NATIVE_DIR}/ReactAndroid/cmake-utils/folly-flags.cmake")
 add_compile_options(${folly_FLAGS})
 
@@ -29,139 +32,25 @@ if(NOT ${CMAKE_BUILD_TYPE} MATCHES "Debug")
     string(APPEND CMAKE_CXX_FLAGS " -DNDEBUG")
 endif()
 
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-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")
-
-file(GLOB_RECURSE SOURCES_COMMON CONFIGURE_DEPENDS "${COMMON_SRC_DIR}/cpp/**.cpp")
-file(GLOB_RECURSE SOURCES_ANDROID CONFIGURE_DEPENDS "${SRC_DIR}/main/cpp/**.cpp")
-
-# 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()
-
-add_library(
-        ${PACKAGE_NAME}
-        SHARED
-        ${SOURCES_COMMON}
-        ${SOURCES_ANDROID}
-        ${INCLUDE_JSI_CPP}
-        ${INCLUDE_JSIDYNAMIC_CPP}
-)
-
-# includes
-
-target_include_directories(
-        ${PACKAGE_NAME}
-        PRIVATE
-        "${COMMON_SRC_DIR}/cpp/AnimatedSensor"
-        "${COMMON_SRC_DIR}/cpp/Fabric"
-        "${COMMON_SRC_DIR}/cpp/hidden_headers"
-        "${COMMON_SRC_DIR}/cpp/LayoutAnimations"
-        "${COMMON_SRC_DIR}/cpp/NativeModules"
-        "${COMMON_SRC_DIR}/cpp/Tools"
-        "${COMMON_SRC_DIR}/cpp/Worklets/Registries"
-        "${COMMON_SRC_DIR}/cpp/Worklets/SharedItems"
-        "${COMMON_SRC_DIR}/cpp/Worklets/Tools"
-        "${COMMON_SRC_DIR}/cpp/Worklets/WorkletRuntime"
-        "${SRC_DIR}/main/cpp"
-)
-
-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"
-    "${REACT_NATIVE_DIR}/ReactCommon/react/renderer/componentregistry"
-    "${REACT_NATIVE_DIR}/ReactCommon/react/renderer/core"
-)
-
-# build shared lib
-
-set_target_properties(${PACKAGE_NAME} PROPERTIES LINKER_LANGUAGE CXX)
-
-target_link_libraries(
-    ${PACKAGE_NAME}
-    log
-    android
-)
-
-target_link_libraries(
-    ${PACKAGE_NAME}
-    ReactAndroid::folly_runtime
-    ReactAndroid::glog
-    ReactAndroid::jsi
-    ReactAndroid::reactnativejni
-    fbjni::fbjni
-)
-
 if(${JS_RUNTIME} STREQUAL "hermes")
     string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_HERMES=1")
-    # From prefab from module `com.facebook.react:hermes-android`
-    set(HERMES_LIB hermes-engine::libhermes)
-    target_link_libraries(
-        ${PACKAGE_NAME}
-        ${HERMES_LIB}
-    )
-    if (${HERMES_ENABLE_DEBUGGER})
-        set(HERMES_EXECUTOR_LIB ReactAndroid::hermes_executor)
-        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(
-            ${PACKAGE_NAME}
-            PRIVATE
-            "${JS_RUNTIME_DIR}/src"
-    )
-    file (GLOB V8_SO_DIR "${JS_RUNTIME_DIR}/android/build/intermediates/library_jni/*/jni/${ANDROID_ABI}")
-    find_library(
-            V8EXECUTOR_LIB
-            v8executor
-            PATHS ${V8_SO_DIR}
-            NO_DEFAULT_PATH
-            NO_CMAKE_FIND_ROOT_PATH
-    )
-    target_link_libraries(
-            ${PACKAGE_NAME}
-            ${V8EXECUTOR_LIB}
-    )
 elseif(${JS_RUNTIME} STREQUAL "jsc")
     string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_JSC=1")
-    set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
-    target_link_libraries(${PACKAGE_NAME} ${JSEXECUTOR_LIB})
+elseif(${JS_RUNTIME} STREQUAL "v8")
+    string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_V8=1")
 else()
     message(FATAL_ERROR "Unknown JS runtime ${JS_RUNTIME}.")
 endif()
 
-if(${IS_NEW_ARCHITECTURE_ENABLED})
-    target_link_libraries(
-        ${PACKAGE_NAME}
-        ReactAndroid::fabricjni
-        ReactAndroid::react_debug
-        ReactAndroid::react_render_core
-        ReactAndroid::react_render_mounting
-        ReactAndroid::react_render_componentregistry
-        ReactAndroid::react_render_scheduler
-        ReactAndroid::react_render_uimanager
-        ReactAndroid::rrc_view
-    )
-endif()
+# Resolves "CMake Warning: Manually-specified variables were not used by the
+# project" when any of the following variables is not used in some build
+# configuration.
+set(ignoreMe "${JS_RUNTIME_DIR}")
+
+set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build")
+set(ANDROID_SRC_DIR "${CMAKE_SOURCE_DIR}/src")
+set(WORKLETS_COMMON_DIR "${CMAKE_SOURCE_DIR}/../Common/cpp/worklets")
+set(REANIMATED_COMMON_DIR "${CMAKE_SOURCE_DIR}/../Common/cpp/reanimated")
 
-# Resolves "CMake Warning: Manually-specified variables were not used by the project"
-# when any of the following variables is not used in some build configuration.
-set (ignoreMe "${JS_RUNTIME_DIR}")
+add_subdirectory(${CMAKE_SOURCE_DIR}/src/main/worklets)
+add_subdirectory(${CMAKE_SOURCE_DIR}/src/main/reanimated)