Skip to content

Commit f9b1ef4

Browse files
committed
Update cmake to support RN 0.76
1 parent f731dc4 commit f9b1ef4

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

android/CMakeLists.txt

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,32 @@ set_target_properties(
5050
find_package(ReactAndroid REQUIRED CONFIG)
5151
find_package(fbjni REQUIRED CONFIG)
5252
find_package(powersync_sqlite_core REQUIRED CONFIG)
53-
find_library(LOG_LIB log)
54-
55-
if(${USE_HERMES})
56-
set(JSEXECUTOR_LIB ReactAndroid::hermes_executor)
57-
else()
58-
set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
59-
endif()
6053

54+
find_library(LOG_LIB log)
6155

6256
target_link_libraries(
6357
${PACKAGE_NAME}
6458
${LOG_LIB}
6559
fbjni::fbjni
6660
ReactAndroid::jsi
67-
ReactAndroid::turbomodulejsijni
68-
ReactAndroid::react_nativemodule_core
69-
${JSEXECUTOR_LIB}
7061
android
7162
powersync_sqlite_core::powersync
7263
)
64+
65+
if(REACTNATIVE_MERGED_SO OR ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
66+
target_link_libraries(
67+
ReactAndroid::reactnative
68+
)
69+
else()
70+
if(${USE_HERMES})
71+
set(JSEXECUTOR_LIB ReactAndroid::hermes_executor)
72+
else()
73+
set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
74+
endif()
75+
76+
target_link_libraries(
77+
ReactAndroid::turbomodulejsijni
78+
ReactAndroid::react_nativemodule_core
79+
${JSEXECUTOR_LIB}
80+
)
81+
endif()

android/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ android {
9191
"META-INF/**",
9292
"**/libjsi.so",
9393
"**/libreact_nativemodule_core.so",
94-
"**/libturbomodulejsijni.so"
94+
"**/libturbomodulejsijni.so",
95+
"**/libreactnative.so"
9596
]
9697
}
9798

0 commit comments

Comments
 (0)