Skip to content

Oscar/update to rn 81 #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ospfranco merged 14 commits into from
Aug 25, 2025
Merged

Oscar/update to rn 81 #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7fb0c4b
Update iOS
ospfranco Aug 24, 2025
89643d9
update android
ospfranco Aug 24, 2025
263efef
lint
ospfranco Aug 24, 2025
c34fe93
Merge branch 'main' into oscar/update-to-rn-81
ospfranco Aug 24, 2025
33657ae
lint
ospfranco Aug 24, 2025
7710eae
lint
ospfranco Aug 24, 2025
a1fa2d0
Remove restart
ospfranco Aug 24, 2025
9ebf1b3
Workaround old modules
ospfranco Aug 24, 2025
324a985
Try updating android to get rid of duplicated classes error
ospfranco Aug 24, 2025
51db6f6
Fix babel plugins
ospfranco Aug 24, 2025
6e072d8
new tests
ospfranco Aug 25, 2025
9dd8bff
Merge branch 'main' into oscar/update-to-rn-81
ospfranco Aug 25, 2025
833bf17
Adjust server polling
ospfranco Aug 25, 2025
807c112
Update polling
ospfranco Aug 25, 2025
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
4 changes: 1 addition & 3 deletions .watchmanconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
{
"prefer_split_fsevents_watcher": true
}
{}
17 changes: 0 additions & 17 deletions android/.project
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions android/.settings/org.eclipse.buildship.core.prefs
View file
Open in desktop

This file was deleted.

85 changes: 23 additions & 62 deletions android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,72 +72,33 @@ if (USER_DEFINED_SOURCE_FILES)
endif()

if (USE_SQLCIPHER)
if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
openssl::crypto
)
else()
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
fbjni::fbjni
ReactAndroid::jsi
ReactAndroid::turbomodulejsijni
ReactAndroid::react_nativemodule_core
android
openssl::crypto
)
endif()
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
openssl::crypto
)
elseif (USE_LIBSQL)
cmake_path(SET LIBSQL ${CMAKE_CURRENT_SOURCE_DIR}/jniLibs/${ANDROID_ABI}/libsql_experimental.a NORMALIZE)
add_library(libsql STATIC IMPORTED)
set_target_properties(libsql PROPERTIES IMPORTED_LOCATION ${LIBSQL})

if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
libsql
)
else()
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
fbjni::fbjni
ReactAndroid::jsi
ReactAndroid::turbomodulejsijni
ReactAndroid::react_nativemodule_core
android
libsql
)
endif()
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
libsql
)
else ()
# if (REACTNATIVE_MERGED_SO)
if (ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
)
else()
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
fbjni::fbjni
ReactAndroid::jsi
ReactAndroid::turbomodulejsijni
ReactAndroid::react_nativemodule_core
android
)
endif()
target_link_libraries(
${PACKAGE_NAME}
${LOG_LIB}
ReactAndroid::reactnative
ReactAndroid::jsi
fbjni::fbjni
)
endif()
Loading
Loading