Skip to content
Open
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
25 changes: 18 additions & 7 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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'
}
}
}
Expand All @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2974,10 +2974,10 @@ SPEC CHECKSUMS:
hermes-engine: 2771b98fb813fdc6f92edd7c9c0035ecabf9fee7
IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
MendixNative: 358ef00fc883a39da69680c6c2a09ecf85a0b887
MendixNative: eb0ce8790842c3cbb5e75b8b37fd78d7006be0f0
MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
nanopb: 438bc412db1928dac798aa6fd75726007be04262
op-sqlite: 12554de3e1a0cb86cbad3cf1f0c50450f57d3855
op-sqlite: 870c9b6b9ef342a12dc89b841c38ad451d1a885c
OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
Expand Down
12 changes: 6 additions & 6 deletions ios/developerapp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -839,7 +839,7 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
MARKETING_VERSION = 11.5.0;
MARKETING_VERSION = 11.6.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -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 = 614;
DEVELOPMENT_TEAM = BC32QNM6AD;
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = YES;
Expand Down Expand Up @@ -901,7 +901,7 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
MARKETING_VERSION = 11.5.0;
MARKETING_VERSION = 11.6.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1163,7 +1163,7 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
MARKETING_VERSION = 11.5.0;
MARKETING_VERSION = 11.6.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
13 changes: 11 additions & 2 deletions patches/@op-engineering+op-sqlite+15.0.7.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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<OPSQLiteBridge> {
Expand Down Expand Up @@ -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 @@
Expand Down Expand Up @@ -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