From 4b457919e651b8b1c9cb63a1d7371c6efac6b392 Mon Sep 17 00:00:00 2001 From: Noel Light-Hilary Date: Wed, 29 Dec 2021 10:23:19 +0000 Subject: [PATCH] Finish fixing build docs; prepare v2.1.1 --- android/app/build.gradle | 10 ++++++++-- android/app/release/output-metadata.json | 18 ++++++++++++++++++ config.xml | 2 +- doc/Development.md | 14 +++++++++----- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- 5 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 android/app/release/output-metadata.json diff --git a/android/app/build.gradle b/android/app/build.gradle index 2523cbf..4939966 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,13 +1,19 @@ apply plugin: 'com.android.application' android { + // See https://stackoverflow.com/a/24336042/2803757 – as of 29/12/21, without this workaround + // debug builds worked but release ones, even with a cleanly re-added Capacitor platform, hit a lint + // error and had no actual information in the lint results report. + lintOptions { + checkReleaseBuilds false + } compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "uk.webful.passwordmaker" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 21000 - versionName "2.1.0" + versionCode 21001 + versionName "2.1.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json new file mode 100644 index 0000000..93f4d6d --- /dev/null +++ b/android/app/release/output-metadata.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "uk.webful.passwordmaker", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "versionCode": 21001, + "versionName": "2.1.1", + "outputFile": "app-release.apk" + } + ] +} \ No newline at end of file diff --git a/config.xml b/config.xml index b4b2401..0807a83 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Webful PasswordMaker Generate secure per-site passwords on your phone Webful Ltd diff --git a/doc/Development.md b/doc/Development.md index 4621efb..04781a5 100644 --- a/doc/Development.md +++ b/doc/Development.md @@ -25,12 +25,16 @@ To run all tests as CI does: ### Android +These steps contain an assumption you should adjust for your local dev situation. The example is based on +using macOS and Android Studio having your most appropriate 'new' Java (new Gradle versions require +Java 11). If these things are not true, adjust or delete the `JAVA_HOME` var as appropriate. + * Set new `versionCode` and `versionName` in [android/app/build.gradle](../android/app/build.gradle) -* `ionic capacitor build android --prod` -* In Android Studio, go to Build > Generate Signed Bundle / APK... -* Choose to make an Android App Bundle and use your keystore – generated in Studio, as the - beloved ~2014 format seemingly doesn't play nice with 2020s .aab's -* Upload the signed `.aab` [in Google Play Console](https://play.google.com/console/u/0/developers) +* `JAVA_HOME="/Applications/Android Studio.app/Contents/jre/Contents/Home" ionic capacitor build android --prod` +* _If first build,_ in Android Studio choose _Build > Select Build Variant..._ and choose `release`. +* In Android Studio, go to _Build > Generate Signed Bundle / APK... +* Choose to make an Android App Bundle and use your keystore +* Upload the signed [`app-release.aab`](../android/app/release/app-release.aab) [in Google Play Console](https://play.google.com/console/u/0/developers) ### iOS diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index a3dbb26..ce6bf29 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -350,12 +350,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2.1.0; + CURRENT_PROJECT_VERSION = 2.1.1; DEVELOPMENT_TEAM = 92JR733B9T; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = uk.webful.passwordmaker; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -371,12 +371,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2.1.0; + CURRENT_PROJECT_VERSION = 2.1.1; DEVELOPMENT_TEAM = 92JR733B9T; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 2.1.0; + MARKETING_VERSION = 2.1.1; PRODUCT_BUNDLE_IDENTIFIER = uk.webful.passwordmaker; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";