Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt b/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
index 890e61c007d5b3e0a9a69d37ef10e8aa3ce5c6b6..91acd7b2930fedb4eca2461ba99287721ca1f38f 100644
--- a/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
+++ b/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
@@ -80,7 +80,9 @@ class ReactPlugin : Plugin<Project> {
configureRepositories(project)
}

- configureReactNativeNdk(project, extension)
+ if(!project.gradle.startParameter.taskNames.any { it.contains("clean") }) {
+ configureReactNativeNdk(project, extension)
+ }
configureBuildConfigFieldsForApp(project, extension)
configureDevServerLocation(project)
configureBackwardCompatibilityReactMap(project)
21 changes: 0 additions & 21 deletions apps/common-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,11 @@
"react-native": "*"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
"@fortawesome/react-native-fontawesome": "0.3.2",
"@gorhom/bottom-sheet": "patch:@gorhom/bottom-sheet@npm%3A5.2.6#~/.yarn/patches/@gorhom-bottom-sheet-npm-5.2.6-c24dba2629.patch",
"@gorhom/portal": "1.0.14",
"@react-native-async-storage/async-storage": "2.2.0",
"@react-native-clipboard/clipboard": "1.16.3",
"@react-native-masked-view/masked-view": "0.3.2",
"@react-navigation/bottom-tabs": "7.4.8",
"@react-navigation/drawer": "7.5.9",
"@react-navigation/native": "7.1.18",
"@react-navigation/native-stack": "7.3.27",
"@react-navigation/stack": "7.4.9",
"@shopify/flash-list": "2.1.0",
"d3-shape": "3.2.0",
"fuse.js": "patch:fuse.js@npm%3A7.1.0#~/.yarn/patches/fuse.js-npm-7.1.0-5dcae892a6.patch",
"react": "19.1.1",
"react-dom": "19.1.1",
"react-native-gesture-handler": "2.28.0",
"react-native-mmkv": "4.0.0",
"react-native-nitro-modules": "0.31.9",
"react-native-pager-view": "7.0.0",
"react-native-reanimated": "workspace:*",
"react-native-safe-area-context": "5.6.1",
"react-native-screens": "4.16.0",
"react-native-svg": "15.14.0",
"react-native-worklets": "workspace:*",
"react-strict-dom": "0.0.54"
},
Expand Down
22 changes: 22 additions & 0 deletions apps/fabric-example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,28 @@ android {
}
}

// interface FSService {
// @Inject FileSystemOperations getFs()
// }

// tasks.register('cleanCmakeCache', Delete) {
// def fsService = project.objects.newInstance(FSService)
// def projectDir = project.projectDir

// def buildDir = project.buildDir
// def cxxDir = new File(projectDir, ".cxx")
// doFirst {
// delete "$buildDir"
// delete "${projectDir}/.cxx"
// delete "${projectDir}/../build"
// }
// }

// tasks.named('clean') {
// dependsOn cleanCmakeCache
// }


dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
Expand Down
3 changes: 2 additions & 1 deletion apps/fabric-example/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ android.useAndroidX=true
# Use this property to specify which architecture you want to build.
# You can also override it from the CLI using
# ./gradlew <task> -PreactNativeArchitectures=x86_64
reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
# reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
reactNativeArchitectures=arm64-v8a

# Use this property to enable support to the new architecture.
# This will allow you to use TurboModules and the Fabric render in
Expand Down
62 changes: 61 additions & 1 deletion apps/fabric-example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2875,6 +2875,8 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNWorklets/worklets/apple (= 0.7.0-main)
- RNWorklets/worklets/common (= 0.7.0-main)
- RNWorklets/worklets/public (= 0.7.0-main)
- SocketRocket
- Yoga
- RNWorklets/worklets/apple (0.7.0-main):
Expand Down Expand Up @@ -2906,6 +2908,64 @@ PODS:
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- RNWorklets/worklets/common (0.7.0-main):
- boost
- DoubleConversion
- fast_float
- fmt
- glog
- hermes-engine
- RCT-Folly
- RCT-Folly/Fabric
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- RNWorklets/worklets/public (0.7.0-main):
- boost
- DoubleConversion
- fast_float
- fmt
- glog
- hermes-engine
- RCT-Folly
- RCT-Folly/Fabric
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- SocketRocket (0.7.1)
- Yoga (0.0.0)

Expand Down Expand Up @@ -3261,7 +3321,7 @@ SPEC CHECKSUMS:
RNReanimated: 97ebf4d3c76929b6b0f866cfbd41c49b3a0d2dbf
RNScreens: 0bbf16c074ae6bb1058a7bf2d1ae017f4306797c
RNSVG: 8c0bbfa480a24b24468f1c76bd852a4aac3178e6
RNWorklets: f54a415f73a3fc653bfe65e599872fdc6bca0477
RNWorklets: 7a90fa0d1722af806025402c038355faa20a41c3
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Yoga: edeb9900b9e5bb5b27b9a6a2d5914e4fe4033c1b

Expand Down
52 changes: 51 additions & 1 deletion apps/macos-example/macos/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1977,6 +1977,8 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNWorklets/worklets/apple (= 0.7.0-main)
- RNWorklets/worklets/common (= 0.7.0-main)
- RNWorklets/worklets/public (= 0.7.0-main)
- Yoga
- RNWorklets/worklets/apple (0.7.0-main):
- DoubleConversion
Expand All @@ -2002,6 +2004,54 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNWorklets/worklets/common (0.7.0-main):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.11.18.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNWorklets/worklets/public (0.7.0-main):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.11.18.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- SocketRocket (0.7.1)
- Yoga (0.0.0)

Expand Down Expand Up @@ -2322,7 +2372,7 @@ SPEC CHECKSUMS:
RNGestureHandler: 0397fea67f39d5a2d17fcf4a028e206f7ba098ba
RNReanimated: 152207cf096f2badeef2c552a8f2886accd187e6
RNSVG: 681f8ef5ca50e13cb3c6c88a907ea89b68fee74f
RNWorklets: ee84c4d458ce35f4ed94462a2add070ff4e69edb
RNWorklets: 7cdcdb8dd199bc5d1cd99e42940c47e4442a2670
SocketRocket: 03f7111df1a343b162bf5b06ead333be808e1e0a
Yoga: 45ce05cb11db042ba2e5e51a2dfaf0ff63d269f9

Expand Down
60 changes: 59 additions & 1 deletion apps/tvos-example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2397,6 +2397,8 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNWorklets/worklets/apple (= 0.7.0-main)
- RNWorklets/worklets/common (= 0.7.0-main)
- RNWorklets/worklets/public (= 0.7.0-main)
- SocketRocket
- Yoga
- RNWorklets/worklets/apple (0.7.0-main):
Expand Down Expand Up @@ -2427,6 +2429,62 @@ PODS:
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- RNWorklets/worklets/common (0.7.0-main):
- boost
- DoubleConversion
- fast_float
- fmt
- glog
- hermes-engine
- RCT-Folly
- RCT-Folly/Fabric
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- RNWorklets/worklets/public (0.7.0-main):
- boost
- DoubleConversion
- fast_float
- fmt
- glog
- hermes-engine
- RCT-Folly
- RCT-Folly/Fabric
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-renderercss
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- SocketRocket
- Yoga
- SocketRocket (0.7.1)
- Yoga (0.0.0)

Expand Down Expand Up @@ -2732,7 +2790,7 @@ SPEC CHECKSUMS:
ReactCodegen: f4d6e6fd5140eade461ffb5579795197956868c8
ReactCommon: c178596d3ef05508bb6c0f88bfbbc281b5c4222b
RNReanimated: cccf8b45cb675080e7c5f3a4f5d0498eff6c62a0
RNWorklets: 339aa12272b2ff6490d91526e8ced6599f7ef6a3
RNWorklets: 6aa271764dc8121f468b10c866239ca4c644208b
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Yoga: 0e792f39294e864568930600eeb71135364f777d

Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,8 @@
"react-native-builder-bob": "0.40.13",
"shelljs": "0.10.0",
"typescript": "5.8.3"
},
"resolutions": {
"@react-native/gradle-plugin@npm:0.82.0": "patch:@react-native/gradle-plugin@npm%3A0.82.0#~/.yarn/patches/@react-native-gradle-plugin-npm-0.82.0-10aedc0588.patch"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

#include <reanimated/Tools/PlatformDepMethodsHolder.h>

#include <worklets/SharedItems/Serializable.h>
#include <worklets/WorkletRuntime/WorkletRuntime.h>
// #include <worklets/SharedItems/Serializable.h>
// #include <worklets/WorkletRuntime/WorkletRuntime.h>
#include <RNWorklets/Serializable.h>
#include <RNWorklets/WorkletRuntime.h>

#include <jsi/jsi.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

#include <reanimated/LayoutAnimations/LayoutAnimationType.h>

#include <worklets/SharedItems/Serializable.h>
#include <RNWorklets/Serializable.h>
// #include <worklets/SharedItems/Serializable.h>
#include <worklets/Tools/JSLogger.h>

#include <jsi/jsi.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
#include <reanimated/Tools/FeatureFlags.h>
#include <reanimated/Tools/ReanimatedSystraceSection.h>

#include <RNWorklets/Serializable.h>
#include <worklets/Registries/EventHandlerRegistry.h>
#include <worklets/SharedItems/Serializable.h>
// #include <worklets/SharedItems/Serializable.h>
#include <worklets/Tools/WorkletEventHandler.h>

#ifdef __ANDROID__
Expand Down
Loading
Loading