Merge branch 'master' into develop

This commit is contained in:
Benoit Marty 2019-07-11 17:42:11 +02:00
commit 1f3731aae7
3 changed files with 53 additions and 5 deletions

View File

@ -45,7 +45,7 @@ steps:
branches: "master"
plugins:
- docker#v3.1.0:
image: "runmymind/docker-android-sdk"
image: "runmymind/docker-android-sdk"
# Code quality

44
tools/sign_apk.sh Executable file
View File

@ -0,0 +1,44 @@
#!/usr/bin/env bash
set -e
if [[ -z "${ANDROID_HOME}" ]]; then
echo "Env variable ANDROID_HOME is not set, should be set to something like ~/Library/Android/sdk"
exit 1
fi
if [[ "$#" -ne 2 ]]; then
echo "Usage: $0 KEYSTORE_PATH APK" >&2
exit 1
fi
# Get the command line parameters
PARAM_KEYSTORE_PATH=$1
PARAM_APK=$2
# Other params
BUILD_TOOLS_VERSION="28.0.3"
MIN_SDK_VERSION=19
echo "Signing APK with build-tools version ${BUILD_TOOLS_VERSION} for min SDK version ${MIN_SDK_VERSION}..."
APK_SIGNER_PATH=${ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION}
${APK_SIGNER_PATH}/apksigner sign \
-v \
--ks ${PARAM_KEYSTORE_PATH} \
--min-sdk-version ${MIN_SDK_VERSION} \
${PARAM_APK}
# Verify the signature
echo "Verifying the signature..."
# Note: we ignore warning on META-INF files
${APK_SIGNER_PATH}/apksigner verify \
-v \
--min-sdk-version ${MIN_SDK_VERSION} \
${PARAM_APK} \
| grep -v "WARNING: META-INF/"
echo
echo "Congratulations! The APK ${PARAM_APK} is now signed!"

View File

@ -12,9 +12,9 @@ androidExtensions {
experimental = true
}
def versionMajor = 0
def versionMinor = 1
def versionPatch = 0
ext.versionMajor = 0
ext.versionMinor = 1
ext.versionPatch = 0
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
@ -63,7 +63,11 @@ android {
minSdkVersion 19
targetSdkVersion 28
multiDexEnabled true
versionCode generateVersionCodeFromTimestamp()
// For release, use generateVersionCodeFromVersionName()
// versionCode generateVersionCodeFromTimestamp()
versionCode generateVersionCodeFromVersionName()
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""