From cd44c0907ff9a5c69750ac2c00a94e14b34cf0d6 Mon Sep 17 00:00:00 2001 From: Yogendra Shelke <25844542+YogendraShelke@users.noreply.github.com> Date: Wed, 21 Jan 2026 11:04:22 +0530 Subject: [PATCH] chore: downgrade @op-engineering/op-sqlite to version 15.0.7 and mendix-native to version 0.3.1 --- ios/Podfile.lock | 8 +- package-lock.json | 16 ++-- package.json | 4 +- ...=> @op-engineering+op-sqlite+15.0.7.patch} | 92 ++++++++----------- 4 files changed, 55 insertions(+), 65 deletions(-) rename patches/{@op-engineering+op-sqlite+15.1.5.patch => @op-engineering+op-sqlite+15.0.7.patch} (77%) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 750a4f13..8114236c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -52,10 +52,11 @@ PODS: - RNCAsyncStorage - SSZipArchive - Yoga - - op-sqlite (15.1.5): + - op-sqlite (15.0.7): - DoubleConversion - glog - hermes-engine + - OpenSSL-Universal - RCT-Folly (= 2024.11.18.00) - RCTRequired - RCTTypeSafety @@ -73,6 +74,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga + - OpenSSL-Universal (3.3.3001) - RCT-Folly (2024.11.18.00): - boost - DoubleConversion @@ -2348,6 +2350,7 @@ SPEC REPOS: - libavif - libdav1d - libwebp + - OpenSSL-Universal - SDWebImage - SDWebImageAVIFCoder - SDWebImageWebPCoder @@ -2546,7 +2549,8 @@ SPEC CHECKSUMS: libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 MendixNative: 358ef00fc883a39da69680c6c2a09ecf85a0b887 - op-sqlite: a8239b295e2fad068d587c16d6c41d1ffd98ede8 + op-sqlite: 12554de3e1a0cb86cbad3cf1f0c50450f57d3855 + OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2 RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82 RCTDeprecation: be794de7dc6ed8f9f7fbf525f86e7651b8b68746 RCTRequired: a83787b092ec554c2eb6019ff3f5b8d125472b3b diff --git a/package-lock.json b/package-lock.json index 096df180..7a201501 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@d11/react-native-fast-image": "8.11.1", "@gorhom/bottom-sheet": "5.1.1", "@notifee/react-native": "9.1.8", - "@op-engineering/op-sqlite": "15.1.5", + "@op-engineering/op-sqlite": "15.0.7", "@react-native-async-storage/async-storage": "2.0.0", "@react-native-camera-roll/camera-roll": "7.4.0", "@react-native-community/cli": "18.0.1", @@ -21,7 +21,7 @@ "@react-native-community/datetimepicker": "8.2.0", "@react-native-picker/picker": "2.11.0", "@react-navigation/native": "7.0.14", - "mendix-native": "https://github.com/mendix/mendix-native/releases/download/v0.3.2/mendix-native-v0.3.2.tgz", + "mendix-native": "https://github.com/mendix/mendix-native/releases/download/v0.3.1/mendix-native-v0.3.1.tgz", "react-native": "0.78.2", "react-native-blob-util": "0.21.3", "react-native-bootsplash": "6.3.10", @@ -2166,9 +2166,9 @@ } }, "node_modules/@op-engineering/op-sqlite": { - "version": "15.1.5", - "resolved": "https://registry.npmjs.org/@op-engineering/op-sqlite/-/op-sqlite-15.1.5.tgz", - "integrity": "sha512-xfbKbVerEF6e1mz4AT3bzwVErJ2J14QKi6OzRbbC/y26liPXYbhPCfGovEhh7gMZtN30crH1z4haFJFvAlserg==", + "version": "15.0.7", + "resolved": "https://registry.npmjs.org/@op-engineering/op-sqlite/-/op-sqlite-15.0.7.tgz", + "integrity": "sha512-EExQtz7QPxPWXQ00QjFiHvbohMOrpEzFbWbWZ1BXvZeDafbYJxS6DYRO08w5Q44WnaNbxBfmRc/1/seZuHMI/g==", "license": "MIT", "workspaces": [ "example" @@ -6465,9 +6465,9 @@ "license": "MIT" }, "node_modules/mendix-native": { - "version": "0.3.2", - "resolved": "https://github.com/mendix/mendix-native/releases/download/v0.3.2/mendix-native-v0.3.2.tgz", - "integrity": "sha512-ajVKxRHhKFZ/FYEgSbWvs0X0f0YvP8uAkKjbVONj0vUr2iQLdWpfA7MG9l9i3m/Dq+vDgN21ERy62O/8HIw3Cw==", + "version": "0.3.1", + "resolved": "https://github.com/mendix/mendix-native/releases/download/v0.3.1/mendix-native-v0.3.1.tgz", + "integrity": "sha512-32CKVOlWFyY4vb0EVmCvJfeMwnfwTkaTEr2dmuQWIkACOhXToHHeYlcY/bRHT62qhNkEMh7FnTD/fw30k3w2fQ==", "license": "MIT", "workspaces": [ "example" diff --git a/package.json b/package.json index 9a0c7be2..3d27e192 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "dependencies": { "@d11/react-native-fast-image": "8.11.1", "@gorhom/bottom-sheet": "5.1.1", - "mendix-native": "https://github.com/mendix/mendix-native/releases/download/v0.3.2/mendix-native-v0.3.2.tgz", - "@op-engineering/op-sqlite": "15.1.5", + "mendix-native": "https://github.com/mendix/mendix-native/releases/download/v0.3.1/mendix-native-v0.3.1.tgz", + "@op-engineering/op-sqlite": "15.0.7", "@react-native-async-storage/async-storage": "2.0.0", "@react-native-camera-roll/camera-roll": "7.4.0", "@react-native-community/cli": "18.0.1", diff --git a/patches/@op-engineering+op-sqlite+15.1.5.patch b/patches/@op-engineering+op-sqlite+15.0.7.patch similarity index 77% rename from patches/@op-engineering+op-sqlite+15.1.5.patch rename to patches/@op-engineering+op-sqlite+15.0.7.patch index 54df1906..586def4d 100644 --- a/patches/@op-engineering+op-sqlite+15.1.5.patch +++ b/patches/@op-engineering+op-sqlite+15.0.7.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/@op-engineering/op-sqlite/android/build.gradle b/node_modules/@op-engineering/op-sqlite/android/build.gradle -index 7df016d..dc94a38 100644 +index d36fd85..7513556 100644 --- a/node_modules/@op-engineering/op-sqlite/android/build.gradle +++ b/node_modules/@op-engineering/op-sqlite/android/build.gradle @@ -1,5 +1,4 @@ @@ -69,7 +69,7 @@ index 7df016d..dc94a38 100644 println "[OP-SQLITE] using sqlcipher." } else if(useLibsql) { diff --git a/node_modules/@op-engineering/op-sqlite/android/cpp-adapter.cpp b/node_modules/@op-engineering/op-sqlite/android/cpp-adapter.cpp -index 5912d7b..f2cb85b 100644 +index 8feaf77..261ec22 100644 --- a/node_modules/@op-engineering/op-sqlite/android/cpp-adapter.cpp +++ b/node_modules/@op-engineering/op-sqlite/android/cpp-adapter.cpp @@ -19,8 +19,8 @@ struct OPSQLiteBridge : jni::JavaClass { @@ -79,7 +79,7 @@ index 5912d7b..f2cb85b 100644 - makeNativeMethod("clearStateNativeJsi", - OPSQLiteBridge::clearStateNativeJsi)}); + makeNativeMethod("clearStateNativeJsi", OPSQLiteBridge::clearStateNativeJsi), -+ makeNativeMethod("deleteAllDBsJsi", OPSQLiteBridge::deleteAllDBsJsi)}); ++ makeNativeMethod("deleteAllDBsJsi", OPSQLiteBridge::deleteAllDBsJsi)}); } private: @@ -89,7 +89,7 @@ index 5912d7b..f2cb85b 100644 } + + static bool deleteAllDBsJsi(jni::alias_ref thiz) { -+ return opsqlite::deleteAllDbs(); ++ return opsqlite::deleteAllDbs(); + } }; @@ -118,20 +118,20 @@ index 44f86df..9d9f710 100644 val instance = OPSQLiteBridge() } diff --git a/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt b/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt -index 49a01b9..bdfa829 100644 +index 688832f..9ea814b 100644 --- a/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt +++ b/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteModule.kt -@@ -12,7 +12,7 @@ import java.io.InputStream - import java.io.OutputStream +@@ -13,7 +13,7 @@ import java.io.OutputStream import com.facebook.react.util.RNLog; + //@ReactModule(name = OPSQLiteModule.NAME) -internal class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextBaseJavaModule(context) { +class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextBaseJavaModule(context) { override fun getName(): String { return NAME } -@@ -54,6 +54,16 @@ internal class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextB - throw Exception("Do not call getDylibPath on Android") +@@ -56,6 +56,17 @@ internal class OPSQLiteModule(context: ReactApplicationContext?) : ReactContextB + return true } + @ReactMethod(isBlockingSynchronousMethod = true) @@ -143,15 +143,16 @@ index 49a01b9..bdfa829 100644 + fun deleteAllDBs() { + OPSQLiteBridge.instance.deleteAllDBs(); + } ++ + @ReactMethod fun moveAssetsDatabase(args: ReadableMap, promise: Promise) { val filename = args.getString("filename")!! diff --git a/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.cpp b/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.cpp -index eadea09..5701d15 100644 +index 85710ee..8cf10f2 100644 --- a/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.cpp +++ b/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.cpp -@@ -675,6 +675,10 @@ void DBHostObject::invalidate() { +@@ -889,6 +889,10 @@ void DBHostObject::invalidate() { #endif } @@ -163,23 +164,23 @@ index eadea09..5701d15 100644 } // namespace opsqlite diff --git a/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.h b/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.h -index 68a9bc4..142e9d9 100644 +index cc174b7..ff36f74 100644 --- a/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.h +++ b/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.h -@@ -68,6 +68,7 @@ public: - void on_commit(); - void on_rollback(); - void invalidate(); -+ void drop(); - ~DBHostObject() override; +@@ -73,6 +73,7 @@ class JSI_EXPORT DBHostObject : public jsi::HostObject { + void on_commit(); + void on_rollback(); + void invalidate(); ++ void drop(); + ~DBHostObject() override; - private: -diff --git a/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.cpp b/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.cpp -index e33579a..791fa70 100644 ---- a/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.cpp -+++ b/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.cpp -@@ -42,6 +42,13 @@ void invalidate() { - dbs.clear(); + private: +diff --git a/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp b/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp +index 5e1c1de..dc21c65 100644 +--- a/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp ++++ b/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp +@@ -36,6 +36,13 @@ void invalidate() { + dbs.clear(); } +bool deleteAllDbs() { @@ -190,12 +191,12 @@ index e33579a..791fa70 100644 +} + void install(jsi::Runtime &rt, - const std::shared_ptr &_invoker, + const std::shared_ptr &invoker, const char *base_path, const char *crsqlite_path, -diff --git a/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.hpp b/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.hpp +diff --git a/node_modules/@op-engineering/op-sqlite/cpp/bindings.h b/node_modules/@op-engineering/op-sqlite/cpp/bindings.h index 91511ab..cc73dfe 100644 ---- a/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.hpp -+++ b/node_modules/@op-engineering/op-sqlite/cpp/OPSqlite.hpp +--- a/node_modules/@op-engineering/op-sqlite/cpp/bindings.h ++++ b/node_modules/@op-engineering/op-sqlite/cpp/bindings.h @@ -14,6 +14,7 @@ void install(jsi::Runtime &rt, const char *base_path, const char *crsqlite_path, const char *sqlite_vec_path); @@ -205,33 +206,18 @@ index 91511ab..cc73dfe 100644 } // namespace opsqlite diff --git a/node_modules/@op-engineering/op-sqlite/op-sqlite.podspec b/node_modules/@op-engineering/op-sqlite/op-sqlite.podspec -index 32906a2..4a1e452 100644 +index 375cc3e..e6fce21 100644 --- a/node_modules/@op-engineering/op-sqlite/op-sqlite.podspec +++ b/node_modules/@op-engineering/op-sqlite/op-sqlite.podspec -@@ -1,12 +1,13 @@ +@@ -1,4 +1,3 @@ -require "json" require_relative "./generate_tokenizers_header_file" log_message = lambda do |message| - puts "\e[34m#{message}\e[0m" +@@ -39,11 +38,10 @@ else + app_package = JSON.parse(File.read(File.join(__dir__, "example", "package.json"))) end -+# NOTE: Disabled as redundant for now, re-enable if needed - # In the sample app the dir is not inside of node_modules --is_user_app = __dir__.include?("node_modules") -+# is_user_app = __dir__.include?("node_modules") -+is_user_app = false - package = JSON.parse(File.read(File.join(__dir__, "package.json"))) - app_package = nil - package_json_path = nil -@@ -32,13 +33,13 @@ else - package_json_path = File.join(__dir__, "example", "package.json") - end - --app_package = JSON.parse(File.read(package_json_path)) -+# NOTE: Disabled as redundant for now, re-enable if needed -+# app_package = JSON.parse(File.read(package_json_path)) - -op_sqlite_config = app_package["op-sqlite"] -use_sqlcipher = false +use_sqlcipher = true @@ -242,7 +228,7 @@ index 32906a2..4a1e452 100644 phone_version = false sqlite_flags = "" fts5 = false -@@ -46,37 +47,6 @@ rtree = false +@@ -51,37 +49,6 @@ rtree = false use_sqlite_vec = false tokenizers = [] @@ -261,19 +247,19 @@ index 32906a2..4a1e452 100644 - -if phone_version then - if use_sqlcipher then -- raise "SQLCipher is not supported with phone version. It cannot load extensions." +- raise "SQLCipher is not supported with phone version" - end - - if use_crsqlite then -- raise "CRSQLite is not supported with phone version. It cannot load extensions." +- raise "CRSQLite is not supported with phone version" - end - - if rtree then -- raise "RTree is not supported with phone version. It cannot load extensions." +- raise "RTree is not supported with phone version" - end - - if use_sqlite_vec then -- raise "SQLite Vec is not supported with phone version. It cannot load extensions." +- raise "SQLite Vec is not supported with phone version" - end -end -