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
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
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