Merge branch '0.71'

# Conflicts:
#	README.md
#	example/ios/Podfile.lock
#	package.json
#	yarn.lock

.gitignore

@@ -38,6 +38,8 @@ local.properties
 *.hprof
 .cxx/
 example/.cxx/
+*.keystore
+!debug.keystore
 
 # Bundle
 #
@@ -48,6 +50,9 @@ vendor/
 example/ios/Pods
 example/vendor/bundle
 
+# Temporary files created by Metro to check the health of the file watcher
+63	.metro-health-check*
+
 # node.js
 #
 node_modules/

.tool-versions

@@ -0,0 +1,3 @@
+nodejs 16.19.0
+ruby 2.7.6
+yarn 1.22.19

Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '2.7.4'
-gem 'cocoapods', '~> 1.11', '>= 1.11.2'
+ruby '2.7.6'
+gem 'cocoapods', '~> 1.11', '>= 1.11.3'

README.md

@@ -14,19 +14,21 @@
 </div>
 <br />
 
-Quick SQLite embeds the latest version of SQLite and provides a low-level JSI-backed API to execute SQL queries. By using an embedded SQLite you get access to the latest security patches and features.
+Quick SQLite embeds the latest version of SQLite and provides a low-level JSI-backed API to execute SQL queries.
 
-Performance metrics are intentionally not presented, [anecdotic testimonies](https://dev.to/craftzdog/a-performant-way-to-use-pouchdb7-on-react-native-in-2022-24ej) suggest anywhere between 2x and 5x speed improvement.
+Performance metrics are intentionally not presented, [anecdotic testimonies](https://dev.to/craftzdog/a-performant-way-to-use-pouchdb7-on-react-native-in-2022-24ej) suggest anywhere between 2x and 5x speed improvement. On small queries you might not notice a difference with the old bridge but as you send large data to JS the speed increase is considerable.
 
-If you need RN 0.71 support there is currently a beta version `8.0.0-beta.2`, please report any issue on the [PR](https://github.com/ospfranco/react-native-quick-sqlite/pull/108).
+Starting on version `8.0.0` only React-Native `0.71` onwards is supported. This is due to internal changes to React-Native artifacts. If you are on < `0.71` use the latest `7.x.x` version.
+
+TypeORM is officially supported, however, there is currently a parsing issue with React-Native 0.71 and its babel configuration and therefore it will not work, nothing wrong with this package, this is purely an issue on TypeORM.
 
 ## Sponsors
 
 This library is sponsored by:
 
 [<img src="https://raw.githubusercontent.com/ospfranco/react-native-quick-sqlite/main/sponsors/stream.png">](https://getstream.io/try-for-free/?utm_source=ospfranco&utm_medium=Github_Repo_Content_Ad&utm_content=Developer&utm_campaign=ospfranco_December2022_Trial_klmh22)
 
-_Build cross-platform messaging experiences with Stream Chat API. Sign up for _Stream's _30-day_ trial for_ free!_
+_Build cross-platform messaging experiences with Stream Chat API. Sign up for Stream's 30-day trial for free!_
 
 [_Try the React Native Chat Tutorial 💬_](https://getstream.io/chat/sdk/react-native/?utm_source=ospfranco&utm_medium=Github_Repo_Content_Ad&utm_content=Developer&utm_campaign=ospfranco_December2022_Trial_klmh22)
 
@@ -173,9 +175,8 @@ SQLite supports attaching or detaching other database files into your main datab
 You can do any operation you like on this attached database like JOIN results across tables in different schemas, or update data or objects.
 These databases can have different configurations, like journal modes, and cache settings.
 
-You can, at any moment, detach a database that you don't need anymore.
-Note: You don't need to detach an attached database before closing your connection. Closing the main connection
-will detach any attached databases.
+You can, at any moment, detach a database that you don't need anymore. You don't need to detach an attached database before closing your connection. Closing the main connection will detach any attached databases.
+
 SQLite has a limit for attached databases: A default of 10, and a global max of 125
 
 References: [Attach](https://www.sqlite.org/lang_attach.html) - [Detach](https://www.sqlite.org/lang_detach.html)
@@ -274,7 +275,7 @@ You will need to install the babel `module-resolver` plugin:
 yarn add babel-plugin-module-resolver
 ```
 
-Finally, you will now be able to start the app without any metro/babel errors (you will also need to follow the instructions on how to setup typeorm), now we can feed the driver into TypeORM:
+Finally, you will now be able to start the app without any metro/babel errors (you will also need to follow the instructions on how to setup TypeORM), now we can feed the driver into TypeORM:
 
 ```ts
 import { typeORMDriver } from 'react-native-quick-sqlite'

android/CMakeLists.txt

@@ -1,39 +1,17 @@
-cmake_minimum_required(VERSION 3.10.2)
-
-set (CMAKE_VERBOSE_MAKEFILE ON)
-set (CMAKE_CXX_STANDARD 14)
-#set (CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DON_ANDROID -DONANDROID -DFOR_HERMES=${FOR_HERMES}")
+project(ReactNativeQuickSQLite)
+cmake_minimum_required(VERSION 3.9.0)
 
 set (PACKAGE_NAME "react-native-quick-sqlite")
+set (CMAKE_VERBOSE_MAKEFILE ON)
+set (CMAKE_CXX_STANDARD 17)
 set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
-set (RN_SO_DIR ${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/first-party/react/jni)
-
-if(${REACT_NATIVE_VERSION} LESS 66)
-        set (
-                INCLUDE_JSI_CPP
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
-        )
-        set (
-                INCLUDE_JSIDYNAMIC_CPP
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/JSIDynamic.cpp"
-        )
-endif()
-
-file (GLOB LIBFBJNI_INCLUDE_DIR "${BUILD_DIR}/fbjni-*-headers.jar/")
 
 include_directories(
   ../cpp
-  "${NODE_MODULES_DIR}/react-native/React"
-  "${NODE_MODULES_DIR}/react-native/React/Base"
-  "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
-  "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
-  "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
-  "${NODE_MODULES_DIR}/react-native/ReactCommon"
-  "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
-  "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
-  "${NODE_MODULES_DIR}/hermes-engine/android/include/"
-  ${INCLUDE_JSI_CPP} # only on older RN versions
-  ${INCLUDE_JSIDYNAMIC_CPP} # only on older RN versions
+)
+
+add_definitions(
+  ${SQLITE_FLAGS}
 )
 
 add_library(
@@ -57,70 +35,31 @@ add_library(
   cpp-adapter.cpp
 )
 
-add_definitions(
-  ${SQLITE_FLAGS}
-)
-
-# find fbjni package
-file (GLOB LIBFBJNI_INCLUDE_DIR "${BUILD_DIR}/fbjni-*-headers.jar/")
-
-target_include_directories(
-        ${PACKAGE_NAME}
-        PRIVATE
-        # --- fbjni ---
-        "${LIBFBJNI_INCLUDE_DIR}"
-        # --- React Native ---
-        "${NODE_MODULES_DIR}/react-native/React"
-        "${NODE_MODULES_DIR}/react-native/React/Base"
-        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni"
-        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
-        "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
-        "${NODE_MODULES_DIR}/hermes-engine/android/include/"
-        ${INCLUDE_JSI_CPP} # only on older RN versions
-        ${INCLUDE_JSIDYNAMIC_CPP} # only on older RN versions
+set_target_properties(
+  ${PACKAGE_NAME} PROPERTIES
+  CXX_STANDARD 17
+  CXX_EXTENSIONS OFF
+  POSITION_INDEPENDENT_CODE ON
 )
 
-file (GLOB LIBRN_DIR "${BUILD_DIR}/react-native-0*/jni/${ANDROID_ABI}")
+find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
+find_library(LOG_LIB log)
 
-find_library(
-        FBJNI_LIB
-        fbjni
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-
-find_library(
-        REACT_NATIVE_JNI_LIB
-        reactnativejni
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-if(${REACT_NATIVE_VERSION} LESS 66)
-        # JSI lib didn't exist on RN 0.65 and before. Simply omit it.
-        set (JSI_LIB "")
+if(${USE_HERMES})
+  set(JSEXECUTOR_LIB ReactAndroid::hermes_executor)
 else()
-        # RN 0.66 distributes libjsi.so, can be used instead of compiling jsi.cpp manually.
-        find_library(
-                JSI_LIB
-                jsi
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
-        )
+  set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
 endif()
 
-find_library(
-        LOG_LIB
-        log
-)
 
-# target_link_libraries(sequel fbjni::fbjni android log)
 target_link_libraries(
-        ${PACKAGE_NAME}
-        ${LOG_LIB}
-        ${JSI_LIB}
-        ${REACT_NATIVE_JNI_LIB}
-        ${FBJNI_LIB}
-        android
+  ${PACKAGE_NAME}
+  ${LOG_LIB}
+  fbjni::fbjni
+  ReactAndroid::jsi
+  ReactAndroid::turbomodulejsijni
+  ReactAndroid::react_nativemodule_core
+  ${JSEXECUTOR_LIB}
+  android
 )