From 87c7791dea7df828b55a79065d634493263aa8ae Mon Sep 17 00:00:00 2001 From: vadymv-mendix Date: Wed, 28 Jan 2026 17:52:49 +0100 Subject: [PATCH 1/7] fix: opsqlite pod should skip bundled xcframework slices --- patches/@op-engineering+op-sqlite+15.0.7.patch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/patches/@op-engineering+op-sqlite+15.0.7.patch b/patches/@op-engineering+op-sqlite+15.0.7.patch index 586def4..2e9a9ce 100644 --- a/patches/@op-engineering+op-sqlite+15.0.7.patch +++ b/patches/@op-engineering+op-sqlite+15.0.7.patch @@ -69,7 +69,7 @@ index d36fd85..7513556 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 8feaf77..261ec22 100644 +index 8feaf77..2393963 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 { @@ -206,7 +206,7 @@ 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 375cc3e..e6fce21 100644 +index 375cc3e..e259537 100644 --- a/node_modules/@op-engineering/op-sqlite/op-sqlite.podspec +++ b/node_modules/@op-engineering/op-sqlite/op-sqlite.podspec @@ -1,4 +1,3 @@ @@ -266,3 +266,12 @@ index 375cc3e..e6fce21 100644 Pod::Spec.new do |s| s.name = "op-sqlite" s.version = package["version"] +@@ -97,6 +64,8 @@ Pod::Spec.new do |s| + + # Base source files + source_files = Dir.glob("ios/**/*.{h,m,mm}") + Dir.glob("cpp/**/*.{h,cpp,c}") ++ # Avoid pulling headers from vendored xcframeworks into the pod target ++ source_files = source_files.reject { |path| path.include?(".xcframework/") } + + # Set the path to the `c_sources` directory based on environment + if is_user_app From 555dfbcca807c07a4ff079f2f14632b26c2e2c87 Mon Sep 17 00:00:00 2001 From: vadymv-mendix Date: Wed, 28 Jan 2026 18:21:45 +0100 Subject: [PATCH 2/7] chore: update pod lockfile --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0ae35ef..4480f8b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2977,7 +2977,7 @@ SPEC CHECKSUMS: MendixNative: 358ef00fc883a39da69680c6c2a09ecf85a0b887 MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d nanopb: 438bc412db1928dac798aa6fd75726007be04262 - op-sqlite: 12554de3e1a0cb86cbad3cf1f0c50450f57d3855 + op-sqlite: 870c9b6b9ef342a12dc89b841c38ad451d1a885c OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 From 4dd297840bf4316345e196bded2370ec0a527c34 Mon Sep 17 00:00:00 2001 From: vadymv-mendix Date: Thu, 29 Jan 2026 15:56:58 +0100 Subject: [PATCH 3/7] fix: patch mendix-native to allow building without use_frameworks --- ios/Podfile.lock | 2 +- patches/mendix-native+0.3.1.patch | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 patches/mendix-native+0.3.1.patch diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4480f8b..2ad073e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2974,7 +2974,7 @@ SPEC CHECKSUMS: hermes-engine: 2771b98fb813fdc6f92edd7c9c0035ecabf9fee7 IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485 libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 - MendixNative: 358ef00fc883a39da69680c6c2a09ecf85a0b887 + MendixNative: eb0ce8790842c3cbb5e75b8b37fd78d7006be0f0 MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d nanopb: 438bc412db1928dac798aa6fd75726007be04262 op-sqlite: 870c9b6b9ef342a12dc89b841c38ad451d1a885c diff --git a/patches/mendix-native+0.3.1.patch b/patches/mendix-native+0.3.1.patch new file mode 100644 index 0000000..7dbdfae --- /dev/null +++ b/patches/mendix-native+0.3.1.patch @@ -0,0 +1,16 @@ +diff --git a/node_modules/mendix-native/MendixNative.podspec b/node_modules/mendix-native/MendixNative.podspec +index 178c100..177a883 100644 +--- a/node_modules/mendix-native/MendixNative.podspec ++++ b/node_modules/mendix-native/MendixNative.podspec +@@ -17,6 +17,11 @@ Pod::Spec.new do |s| + s.public_header_files = "ios/**/*.h" + s.private_header_files = "ios/**/*.h" + ++ s.swift_version = "5.9" ++ s.pod_target_xcconfig = { ++ "DEFINES_MODULE" => "YES" ++ } ++ + s.dependency "SSZipArchive" + s.dependency "RNCAsyncStorage" + s.dependency "ReactCommon" From 48fbcbd1d0dbd34123d029d83854a6831af605c8 Mon Sep 17 00:00:00 2001 From: vadymv-mendix Date: Fri, 30 Jan 2026 11:39:19 +0100 Subject: [PATCH 4/7] chore: remove a patch file we no longer need --- patches/mendix-native+0.3.1.patch | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 patches/mendix-native+0.3.1.patch diff --git a/patches/mendix-native+0.3.1.patch b/patches/mendix-native+0.3.1.patch deleted file mode 100644 index 7dbdfae..0000000 --- a/patches/mendix-native+0.3.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/node_modules/mendix-native/MendixNative.podspec b/node_modules/mendix-native/MendixNative.podspec -index 178c100..177a883 100644 ---- a/node_modules/mendix-native/MendixNative.podspec -+++ b/node_modules/mendix-native/MendixNative.podspec -@@ -17,6 +17,11 @@ Pod::Spec.new do |s| - s.public_header_files = "ios/**/*.h" - s.private_header_files = "ios/**/*.h" - -+ s.swift_version = "5.9" -+ s.pod_target_xcconfig = { -+ "DEFINES_MODULE" => "YES" -+ } -+ - s.dependency "SSZipArchive" - s.dependency "RNCAsyncStorage" - s.dependency "ReactCommon" From 52d804c462cbac0fce59d8e42a17e9ef2b576765 Mon Sep 17 00:00:00 2001 From: vadymv-mendix Date: Fri, 30 Jan 2026 14:02:42 +0100 Subject: [PATCH 5/7] chore: bump ios app version --- ios/developerapp.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/developerapp.xcodeproj/project.pbxproj b/ios/developerapp.xcodeproj/project.pbxproj index 52e79da..01a67c5 100644 --- a/ios/developerapp.xcodeproj/project.pbxproj +++ b/ios/developerapp.xcodeproj/project.pbxproj @@ -839,7 +839,7 @@ "$(inherited)", "$(PROJECT_DIR)", ); - MARKETING_VERSION = 11.5.0; + MARKETING_VERSION = 11.6.4; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -868,7 +868,7 @@ CODE_SIGN_ENTITLEMENTS = DeveloperApp/DeveloperApp.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 606; + CURRENT_PROJECT_VERSION = 613; DEVELOPMENT_TEAM = BC32QNM6AD; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = YES; From f7595f5d2819a660712edbc3a7c3d276af9986ab Mon Sep 17 00:00:00 2001 From: vadymv-mendix Date: Fri, 30 Jan 2026 14:24:57 +0100 Subject: [PATCH 6/7] chore: update project and marketing version to 614 and 11.6.4 respectively --- ios/developerapp.xcodeproj/project.pbxproj | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/developerapp.xcodeproj/project.pbxproj b/ios/developerapp.xcodeproj/project.pbxproj index 01a67c5..ed134f7 100644 --- a/ios/developerapp.xcodeproj/project.pbxproj +++ b/ios/developerapp.xcodeproj/project.pbxproj @@ -805,7 +805,7 @@ CODE_SIGN_ENTITLEMENTS = DeveloperApp/DeveloperApp.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 606; + CURRENT_PROJECT_VERSION = 614; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = BC32QNM6AD; ENABLE_BITCODE = NO; @@ -868,7 +868,7 @@ CODE_SIGN_ENTITLEMENTS = DeveloperApp/DeveloperApp.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 613; + CURRENT_PROJECT_VERSION = 614; DEVELOPMENT_TEAM = BC32QNM6AD; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = YES; @@ -901,7 +901,7 @@ "$(inherited)", "$(PROJECT_DIR)", ); - MARKETING_VERSION = 11.5.0; + MARKETING_VERSION = 11.6.4; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1125,7 +1125,7 @@ CODE_SIGN_ENTITLEMENTS = DeveloperApp/DeveloperApp.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 606; + CURRENT_PROJECT_VERSION = 614; DEVELOPMENT_TEAM = BC32QNM6AD; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = YES; @@ -1163,7 +1163,7 @@ "$(inherited)", "$(PROJECT_DIR)", ); - MARKETING_VERSION = 11.5.0; + MARKETING_VERSION = 11.6.4; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/package.json b/package.json index 363abc1..8ce9dc1 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "Apache-2.0", "store-versions": { "google-play": "11.5.0", - "apple-store": "11.5.0" + "apple-store": "11.6.4" }, "private": true, "scripts": { From 50bfb0a4662a1b645252e1681690b40a286cd437 Mon Sep 17 00:00:00 2001 From: vadymv-mendix Date: Fri, 30 Jan 2026 14:48:19 +0100 Subject: [PATCH 7/7] fix: improve release signing configuration handling in build.gradle --- android/app/build.gradle | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f99f5e1..9f17806 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -28,6 +28,19 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion compileSdkVersion rootProject.compileSdkVersion + def releaseProps = new Properties() + def releasePropsFile = new File('./local.properties') + def hasReleaseSigning = false + if (releasePropsFile.canRead()) { + releaseProps.load(new FileInputStream(releasePropsFile)) + hasReleaseSigning = [ + "key.store", + "key.store.password", + "key.alias", + "key.alias.password" + ].every { releaseProps.containsKey(it) } + } + namespace "com.mendix.developerapp" defaultConfig { applicationId "com.mendix.developerapp.mx10" @@ -59,17 +72,13 @@ android { } } release { - Properties releaseProps = new Properties() - def propFile = new File('./local.properties') - if (propFile.canRead()) { - releaseProps.load(new FileInputStream(propFile)) - + if (hasReleaseSigning) { storeFile file(releaseProps["key.store"]) storePassword releaseProps["key.store.password"] keyAlias releaseProps["key.alias"] keyPassword releaseProps["key.alias.password"] } else { - print 'local.properties not found' + print 'Release signing config missing; skipping signingConfig.release' } } } @@ -78,7 +87,9 @@ android { signingConfig signingConfigs.debug } release { - signingConfig signingConfigs.release + if (hasReleaseSigning) { + signingConfig signingConfigs.release + } minifyEnabled enableProguardInReleaseBuilds proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" }