feat: add Expo 56 support #360
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| 'brownfield': patch | ||
| --- | ||
|
|
||
| feat: support Expo SDK 56 in the Brownfield package and example apps | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| diff --git a/android/cmake/main.cmake b/android/cmake/main.cmake | ||
| index 2fa3ea0c3d7d9771729ad55de63185fdb90a3520..ff72a20c4fcb36e737e2fb2840cbf6a51a2e15d2 100644 | ||
| --- a/android/cmake/main.cmake | ||
| +++ b/android/cmake/main.cmake | ||
| @@ -71,22 +71,31 @@ if (REACT_NATIVE_WORKLETS_DIR) | ||
| if (REACT_NATIVE_WORKLETS_DIR) | ||
| - add_library(worklets SHARED IMPORTED) | ||
|
Member
There was a problem hiding this comment. For this and reanimated patch, I believe these were added as you might get errors for |
||
| - | ||
| - if (${CMAKE_BUILD_TYPE} MATCHES "Debug") | ||
| - set(BUILD_TYPE "debug") | ||
| - else () | ||
| - set(BUILD_TYPE "release") | ||
| - endif () | ||
| - | ||
| - set_target_properties( | ||
| - worklets | ||
| - PROPERTIES | ||
| - IMPORTED_LOCATION | ||
| - "${REACT_NATIVE_WORKLETS_DIR}/android/build/intermediates/cmake/${BUILD_TYPE}/obj/${ANDROID_ABI}/libworklets.so" | ||
| - ) | ||
| - | ||
| - target_link_libraries( | ||
| - expo-modules-core | ||
| - PRIVATE | ||
| - worklets | ||
| - ) | ||
| + find_package(react-native-worklets CONFIG QUIET) | ||
| + if (react-native-worklets_FOUND) | ||
| + target_link_libraries( | ||
| + expo-modules-core | ||
| + PRIVATE | ||
| + react-native-worklets::worklets | ||
| + ) | ||
| + else () | ||
| + add_library(worklets SHARED IMPORTED) | ||
| + | ||
| + if (${CMAKE_BUILD_TYPE} MATCHES "Debug") | ||
| + set(BUILD_TYPE "debug") | ||
| + else () | ||
| + set(BUILD_TYPE "release") | ||
| + endif () | ||
| + | ||
| + set_target_properties( | ||
| + worklets | ||
| + PROPERTIES | ||
| + IMPORTED_LOCATION | ||
| + "${REACT_NATIVE_WORKLETS_DIR}/android/build/intermediates/cmake/${BUILD_TYPE}/obj/${ANDROID_ABI}/libworklets.so" | ||
| + ) | ||
| + | ||
| + target_link_libraries( | ||
| + expo-modules-core | ||
| + PRIVATE | ||
| + worklets | ||
| + ) | ||
| + endif () | ||
| endif () | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/ios/EXUpdates.podspec b/ios/EXUpdates.podspec | ||
| index c3d463384cc660c413e6f29ae9990fa1421661d8..f347621cc9f51ca4efd4f8d696918c82767e6e14 100644 | ||
| --- a/ios/EXUpdates.podspec | ||
| +++ b/ios/EXUpdates.podspec | ||
| @@ -15,7 +15,7 @@ begin | ||
| # No dev client if we are using native debug | ||
| if ENV['EX_UPDATES_NATIVE_DEBUG'] != '1' | ||
| project_root = ENV['PROJECT_ROOT'] || Pod::Config.instance.installation_root.to_s | ||
| - use_dev_client = File.dirname(`node --print "require.resolve('expo-dev-client/package.json', { paths: ['#{__dir__}', '#{project_root}'] })"`).length > 0 | ||
| + use_dev_client = File.dirname(`node --print "try { require.resolve('expo-dev-client/package.json', { paths: ['#{__dir__}', '#{project_root}'] }) } catch { '' }"`).length > 0 | ||
|
Comment on lines
+9
to
+10
|
||
| end | ||
| rescue | ||
| use_dev_client = false | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt | ||
| index 0c2c3c92ba1d53c14a342ebcd21342ba8141a853..c2ee77d25009a220225f8f2345925f4cc99c72db 100644 | ||
| --- a/android/CMakeLists.txt | ||
| +++ b/android/CMakeLists.txt | ||
| @@ -46,2 +46,3 @@ find_package(fbjni REQUIRED CONFIG) | ||
| find_package(ReactAndroid REQUIRED CONFIG) | ||
| +find_package(react-native-worklets REQUIRED CONFIG) | ||
|
|
||
| @@ -77,14 +78,0 @@ set_target_properties(reanimated PROPERTIES LINKER_LANGUAGE CXX) | ||
| -if(${CMAKE_BUILD_TYPE} MATCHES "Debug") | ||
| - set(BUILD_TYPE "debug") | ||
| -else() | ||
| - set(BUILD_TYPE "release") | ||
| -endif() | ||
| - | ||
| -add_library(worklets SHARED IMPORTED) | ||
| - | ||
| -set_target_properties( | ||
| - worklets | ||
| - PROPERTIES | ||
| - IMPORTED_LOCATION | ||
| - "${REACT_NATIVE_WORKLETS_DIR}/android/build/intermediates/cmake/${BUILD_TYPE}/obj/${ANDROID_ABI}/libworklets.so" | ||
| -) | ||
| @@ -107,5 +94,5 @@ target_link_libraries( | ||
| ReactAndroid::reactnative | ||
| ReactAndroid::jsi | ||
| fbjni::fbjni | ||
| - android | ||
| - worklets) | ||
| + android | ||
| + react-native-worklets::worklets) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package com.callstack.brownfield.android.example | ||
|
|
||
| typealias BrownfieldStore = com.callstack.rnbrownfield.demo.expoapp56.BrownfieldStore | ||
| typealias User = com.callstack.rnbrownfield.demo.expoapp56.User |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package com.callstack.brownfield.android.example | ||
|
|
||
| object ReactNativeConstants { | ||
| const val MAIN_MODULE_NAME = "main" | ||
| const val APP_NAME = "Android (Expo 56)" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| package com.callstack.brownfield.android.example | ||
|
|
||
| typealias ReactNativeHostManager = com.callstack.rnbrownfield.demo.expoapp56.ReactNativeHostManager |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is missing
react-native-brownfield