@op-engineering/op-sqlite 11.2.3 → 11.2.5

package/android/build.gradle

@@ -207,8 +207,8 @@ android {
   }
   
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 
   externalNativeBuild {

package/cpp/DBHostObject.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "ThreadPool.h"
-#include "sqlite3.h"
 #include "types.h"
 #include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
+#include <set>
+#include <sqlite3.h>
 #include <unordered_map>
 #include <vector>
-#include <set>
 
 namespace opsqlite {
 
@@ -15,9 +15,9 @@ namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 
 struct PendingReactiveInvocation {
-    std::string db_name;
-    std::string table;
-    std::string rowid;
+  std::string db_name;
+  std::string table;
+  std::string rowid;
 };
 
 struct TableRowDiscriminator {
@@ -61,7 +61,7 @@ public:
   ~DBHostObject();
 
 private:
-    std::set<std::shared_ptr<ReactiveQuery>> pending_reactive_queries;
+  std::set<std::shared_ptr<ReactiveQuery>> pending_reactive_queries;
   void auto_register_update_hook();
   void create_jsi_functions();
   void flush_pending_reactive_queries(std::shared_ptr<jsi::Value> resolve);

package/cpp/PreparedStatementHostObject.cpp

@@ -102,7 +102,7 @@ PreparedStatementHostObject::~PreparedStatementHostObject() {
   }
 #else
   if (_stmt != nullptr) {
-    sqlite3_finalize(_stmt);
+//    sqlite3_finalize(_stmt);
     _stmt = nullptr;
   }
 #endif

package/cpp/bridge.cpp

@@ -93,8 +93,10 @@ BridgeResult opsqlite_open(std::string const &name,
   opsqlite_execute(name, "PRAGMA key = '" + encryptionKey + "'", nullptr);
 #endif
 
+#ifndef OP_SQLITE_USE_PHONE_VERSION
   sqlite3_enable_load_extension(db, 1);
-
+#endif
+  
   char *errMsg;
 
 #ifdef OP_SQLITE_USE_CRSQLITE

package/cpp/bridge.h

@@ -3,9 +3,9 @@
 
 #include "DumbHostObject.h"
 #include "SmartHostObject.h"
-#include "sqlite3.h"
 #include "types.h"
 #include "utils.h"
+#include <sqlite3.h>
 #include <vector>
 
 namespace opsqlite {
@@ -65,13 +65,13 @@ BridgeResult opsqlite_execute_raw(std::string const &dbName,
 void opsqlite_close_all();
 
 BridgeResult opsqlite_register_update_hook(std::string const &dbName,
-                                           const UpdateCallback& callback);
+                                           const UpdateCallback &callback);
 BridgeResult opsqlite_deregister_update_hook(std::string const &dbName);
 BridgeResult opsqlite_register_commit_hook(std::string const &dbName,
-                                           const CommitCallback& callback);
+                                           const CommitCallback &callback);
 BridgeResult opsqlite_deregister_commit_hook(std::string const &dbName);
 BridgeResult opsqlite_register_rollback_hook(std::string const &dbName,
-                                             const RollbackCallback& callback);
+                                             const RollbackCallback &callback);
 BridgeResult opsqlite_deregister_rollback_hook(std::string const &dbName);
 
 sqlite3_stmt *opsqlite_prepare_statement(std::string const &dbName,

package/generate_tokenizers_header_file.rb

@@ -12,7 +12,7 @@ def generate_tokenizers_header_file(names, file_path)
     file.puts
     file.puts "#define TOKENIZER_LIST #{tokenizer_list}"
     file.puts
-    file.puts "#include \"sqlite3.h\""
+    file.puts "#include <sqlite3.h>"
     file.puts
     file.puts "namespace opsqlite {"
     file.puts

package/op-sqlite.podspec

@@ -105,18 +105,20 @@ Pod::Spec.new do |s|
   }
 
   log_message.call("[OP-SQLITE] Configuration:")
+
+  exclude_files = []
   
   if use_sqlcipher then
     log_message.call("[OP-SQLITE] using SQLCipher 🔒")
-    s.exclude_files = "cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h"
+    exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h"]
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_SQLCIPHER=1 HAVE_FULLFSYNC=1 SQLITE_HAS_CODEC SQLITE_TEMP_STORE=2"
     s.dependency "OpenSSL-Universal"    
   elsif use_libsql then
     log_message.call("[OP-SQLITE] using libsql 📘")
-    s.exclude_files = "cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/bridge.h", "cpp/bridge.cpp"
+    exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h", "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/bridge.h", "cpp/bridge.cpp"]
   else
     log_message.call("[OP-SQLITE] using vanilla SQLite 📦")
-    s.exclude_files = "cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h"
+    exclude_files += ["cpp/sqlcipher/sqlite3.c", "cpp/sqlcipher/sqlite3.h", "cpp/libsql/bridge.c", "cpp/libsql/bridge.h", "cpp/libsql/bridge.cpp", "cpp/libsql/libsql.h"]
   end
   
   s.dependency "React-callinvoker"
@@ -144,7 +146,7 @@ Pod::Spec.new do |s|
   if phone_version then
     log_message.call("[OP-SQLITE] using iOS embedded SQLite 📱")
     xcconfig[:GCC_PREPROCESSOR_DEFINITIONS] += " OP_SQLITE_USE_PHONE_VERSION=1"
-    s.exclude_files = "cpp/sqlite3.c", "cpp/sqlite3.h"
+    exclude_files += ["cpp/sqlite3.c", "cpp/sqlite3.h"]
     s.library = "sqlite3"
   end
 
@@ -191,4 +193,5 @@ Pod::Spec.new do |s|
   xcconfig[:OTHER_CFLAGS] = other_cflags
   s.pod_target_xcconfig = xcconfig
   s.vendored_frameworks = frameworks
+  s.exclude_files = exclude_files
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@op-engineering/op-sqlite",
-  "version": "11.2.3",
+  "version": "11.2.5",
   "description": "Next generation SQLite for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -49,7 +49,7 @@
     "clang-format": "^1.8.0",
     "lefthook": "^1.5.5",
     "react": "18.3.1",
-    "react-native": "0.76.1",
+    "react-native": "0.76.5",
     "react-native-builder-bob": "^0.23.2",
     "turbo": "^1.12.4",
     "typescript": "5.0.4"