From bd349bbe6f636ffdf6180ca61222a2b7c118f486 Mon Sep 17 00:00:00 2001
From: Noel Light-Hilary <noel@noellh.com>
Date: Sat, 27 Mar 2021 00:33:18 +0000
Subject: [PATCH] Target Android API 30 (required soon)

And update build process to work accordingly
---
 .env.example             | 1 -
 build-helpers/android.sh | 3 +--
 config.xml               | 2 +-
 doc/Development.md       | 5 +----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.env.example b/.env.example
index 9660c42..0d5310a 100644
--- a/.env.example
+++ b/.env.example
@@ -1,2 +1 @@
 ANDROID_KEYSTORE_PATH=../path/to/your.keystore
-ANDROID_ZIPALIGN_PATH=../path/to/zipalign/binary
diff --git a/build-helpers/android.sh b/build-helpers/android.sh
index ef9a6b5..b401bfd 100755
--- a/build-helpers/android.sh
+++ b/build-helpers/android.sh
@@ -4,5 +4,4 @@
 . .env
 
 ionic cordova build android --prod --release
-jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $ANDROID_KEYSTORE_PATH platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk webful
-$ANDROID_ZIPALIGN_PATH -v 4 platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk PasswordMaker.apk
+apksigner sign --ks $ANDROID_KEYSTORE_PATH --v1-signer-name webful --out PasswordMaker.apk platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk
diff --git a/config.xml b/config.xml
index 1332aa3..a27fc41 100644
--- a/config.xml
+++ b/config.xml
@@ -16,7 +16,7 @@
     <preference name="SplashScreenSpinnerColor" value="#a11692" />
     <platform name="android">
         <preference name="android-minSdkVersion" value="22" />
-        <preference name="android-targetSdkVersion" value="29" />
+        <preference name="android-targetSdkVersion" value="30" />
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
         <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
         <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
diff --git a/doc/Development.md b/doc/Development.md
index e7a2279..3ae1d02 100644
--- a/doc/Development.md
+++ b/doc/Development.md
@@ -19,9 +19,6 @@ We should probably replace this with a better solution at some point. In the mea
 
 To run all tests as CI does:
 
-* On macOS only, `npm run update-webdriver` – this is to work around a
-  temporary issue due to a `webdriver-manager` bug whose fix is not yet in
-  a stable Protractor build (as of v7.0.0)
 * `npm run ci` 
 
 ## Build
@@ -30,7 +27,7 @@ To run all tests as CI does:
 
 * Configure your local `.env` - copy from `.env.example` if missing.
 * Run: `./build-helpers/android.sh`
-* Enter signing key's password if prompted.
+* Enter signing key's password when prompted.
 * Signed `PasswordMaker.apk` is created in the project root.
 
 ### iOS