Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/android-build-custom-dev-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17
java-version: 21

- name: actions/setup-node
uses: actions/setup-node@v3
Expand All @@ -29,8 +29,8 @@ jobs:
- name: npm install
run: npm ci

- name: Add NDK 26.1.10909125
run: echo "y" | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;26.1.10909125"
- name: Add NDK 27.3.13750724
run: echo "y" | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.3.13750724"

- name: Build with Gradle
run: ./gradlew assembleDevDebug
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ios-build-custom-dev-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: switch XCode to 15.4
- name: switch XCode to 16.4
run: |
sudo xcode-select -s /Applications/Xcode_15.4.app
sudo xcode-select -s /Applications/Xcode_16.4.app

- name: update bundle identifier in Dev config
shell: bash
Expand Down
27 changes: 26 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
androidXCore = "1.6.0"
androidXBrowser = "1.3.0"

ndkVersion = "26.1.10909125"
ndkVersion = "27.3.13750724"
}
repositories {
google()
Expand Down Expand Up @@ -66,6 +66,31 @@ allprojects {
}
maven { url "https://packages.rnd.mendix.com/jcenter" }
}

// Build all modules with Android 16KB pages enabled
plugins.withId('com.android.application') {
android {
defaultConfig {
externalNativeBuild {
cmake {
arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
}
}
}
}
}

plugins.withId('com.android.library') {
android {
defaultConfig {
externalNativeBuild {
cmake {
arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
}
}
}
}
}
}

apply plugin: "com.facebook.react.rootproject"
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"@gorhom/bottom-sheet": "^5.1.1",
"@mendix/native": "9.0.7",
"@mendix/native": "9.1.0",
"@op-engineering/op-sqlite": "9.2.7",
"@react-native-async-storage/async-storage": "2.0.0",
"@react-native-camera-roll/camera-roll": "7.4.0",
Expand Down
42 changes: 34 additions & 8 deletions patches/@op-engineering+op-sqlite+9.2.7.patch
Original file line number Diff line number Diff line change
@@ -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 4186aa3..242dd95 100644
index 427aa8e..8cc5fab 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 @@
Expand Down Expand Up @@ -39,7 +39,24 @@ index 4186aa3..242dd95 100644
if(useSQLCipher) {
println "[OP-SQLITE] using SQLCipher 🔒"
} else if(useLibsql) {
@@ -171,8 +156,8 @@ android {
@@ -167,13 +152,25 @@ android {
"**/libfbjni.so",
"**/libreactnative.so",
]
+
+ if (!useCRSQLite) {
+ excludes += [
+ "**/libcrsqlite.so"
+ ]
+ }
+
+ if (!useSqliteVec) {
+ excludes += [
+ "**/libsqlite_vec.so"
+ ]
+ }
}

}

compileOptions {
Expand All @@ -50,6 +67,15 @@ index 4186aa3..242dd95 100644
}

externalNativeBuild {
@@ -203,7 +200,7 @@ dependencies {
implementation 'com.facebook.react:react-native'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
if (useSQLCipher) {
- implementation('com.android.ndk.thirdparty:openssl:1.1.1q-beta-1')
+ implementation('io.github.ronickg:openssl:3.3.2-1')
}
}

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 ed599ea..4813667 100644
--- a/node_modules/@op-engineering/op-sqlite/android/cpp-adapter.cpp
Expand Down Expand Up @@ -83,7 +109,7 @@ index ed599ea..4813667 100644
}
\ No newline at end of file
diff --git a/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteBridge.kt b/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteBridge.kt
index 7445a4c..a9dcf14 100644
index 7445a4c..7e6db78 100644
--- a/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteBridge.kt
+++ b/node_modules/@op-engineering/op-sqlite/android/src/main/java/com/op/sqlite/OPSQLiteBridge.kt
@@ -13,6 +13,8 @@ class OPSQLiteBridge {
Expand Down Expand Up @@ -146,10 +172,10 @@ index 6179cfc..7663a49 100644
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 c3663dd..a81af62 100644
index c6bda2a..aefaefb 100644
--- a/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.cpp
+++ b/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.cpp
@@ -946,6 +946,16 @@ void DBHostObject::set(jsi::Runtime &rt, const jsi::PropNameID &name,
@@ -963,6 +963,16 @@ void DBHostObject::set(jsi::Runtime &rt, const jsi::PropNameID &name,

void DBHostObject::invalidate() { invalidated = true; }

Expand All @@ -167,10 +193,10 @@ index c3663dd..a81af62 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 dcb694c..8ec3f4b 100644
index d11c212..175b546 100644
--- a/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.h
+++ b/node_modules/@op-engineering/op-sqlite/cpp/DBHostObject.h
@@ -52,6 +52,7 @@ public:
@@ -58,6 +58,7 @@ public:
void set(jsi::Runtime &rt, const jsi::PropNameID &name,
const jsi::Value &value);
void invalidate();
Expand All @@ -179,7 +205,7 @@ index dcb694c..8ec3f4b 100644

private:
diff --git a/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp b/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp
index b471d3d..e06ec0c 100644
index a4cd737..e88831d 100644
--- a/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp
+++ b/node_modules/@op-engineering/op-sqlite/cpp/bindings.cpp
@@ -47,6 +47,13 @@ void clearState() {
Expand Down
Loading