Merge pull request #314 from OP-Engineering/oscar/update-to-rn-81

Oscar/update to rn 81

Author: ospfranco

.watchmanconfig

@@ -1,3 +1 @@
-{
-  "prefer_split_fsevents_watcher": true
-}
+{}

android/.project

@@ -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()