From 5fe38e62a1a970549a159d1f8e79905cbda39c0b Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Sat, 24 Apr 2021 08:10:11 +0300 Subject: [PATCH] [android]: New versioning scheme Android: - 21042415 - version code - 2021.04.24-15-gae0bcb54f9-Google - version name iOS: - 2021.04.24 This patch also fixes GitHub Actions. Signed-off-by: Roman Tsisyk --- .github/workflows/android-beta.yaml | 67 +++++------------------- .github/workflows/android-check.yaml | 2 +- android/build.gradle | 78 +++++++++++++++++----------- android/gradle.properties | 2 - xcode/common.xcconfig | 2 +- 5 files changed, 64 insertions(+), 87 deletions(-) diff --git a/.github/workflows/android-beta.yaml b/.github/workflows/android-beta.yaml index 9586cf580d..7a986fcc8b 100644 --- a/.github/workflows/android-beta.yaml +++ b/.github/workflows/android-beta.yaml @@ -1,25 +1,10 @@ name: Android Beta on: - push: - branches: - - master - paths-ignore: - - .github/workflows/linux* - - .github/workflows/ios* - - '**/*_tests/**' - - CONTRIBUTORS - - LICENSE - - NOTICE - - README.md - - docs/** - - generator/** - - iphone/** - - packaging/** - - pyhelpers/** - - qt*/** - - skin_generator/** - - track_generator/** - - xcode/** + workflow_dispatch: + inputs: + releasenotes: + description: 'The release notes' + required: true jobs: android-beta: @@ -47,14 +32,13 @@ jobs: - name: Checkout private keys uses: actions/checkout@v2 with: - repository: omapsapp/omapsapp-production-keys - token: ${{ secrets.PRIVATE_TOKEN }} + repository: ${{ secrets.PRIVATE_REPO }} + ssh-key: ${{ secrets.PRIVATE_SSH_KEY }} ref: master path: private.git - name: Configure repo with private keys shell: bash - repo-token: ${{ secrets.GITHUB_TOKEN }} run: | ./configure.sh ./private.git rm -rf ./private.git @@ -67,45 +51,20 @@ jobs: shell: bash working-directory: android run: | - #export PATH="$(dirname $ANDROID_SDK_ROOT/cmake/*/bin/.|tail -n1):$PATH" # Use CMake from SDK - #echo $PATH cmake --version ninja --version - ./gradlew -PsplitApk=true -x lint -x lintVitalWebBeta assembleWebBeta uploadCrashlyticsSymbolFileWebBeta + ./gradlew -x lint -x lintVitalWebBeta assembleWebBeta uploadCrashlyticsSymbolFileWebBeta - - name: Upload arm64-v8a beta apk + - name: Upload beta apk uses: actions/upload-artifact@v2 with: - name: android-web-arm64-v8a-beta - path: android/build/outputs/apk/android-web-arm64-v8a-beta-*.apk + name: android-web-beta + path: android/build/outputs/apk/web/beta/OrganicMaps-*-web-beta.apk if-no-files-found: error - - name: Upload armeabi-v7a beta apk - uses: actions/upload-artifact@v2 - with: - name: android-web-armeabi-v7a-beta - path: android/build/outputs/apk/android-web-armeabi-v7a-beta-*.apk - if-no-files-found: error - - - name: Upload x86_64 beta apk - uses: actions/upload-artifact@v2 - with: - name: android-web-x86_64-beta - path: android/build/outputs/apk/android-web-x86_64-beta-*.apk - if-no-files-found: error - - - name: Upload x86 beta apk - uses: actions/upload-artifact@v2 - with: - name: android-web-x86-beta - path: android/build/outputs/apk/android-web-x86-beta-*.apk - if-no-files-found: error - - - name: Upload arm64-v8a to App Distribution + - name: Upload beta apk to App Distribution shell: bash working-directory: android run: | - git --no-pager show -s --format='%s%n%n%b' HEAD > RELEASE - # Sic: Firebase App Distribution doesn't support splits - (cd ./build/outputs/apk; ln -s android-web-arm64-v8a-beta-*.apk android-web-arm64-v8a-beta.apk) + ${{ github.event.releasenotes.name }} > RELEASE ./gradlew appDistributionUploadWebBeta diff --git a/.github/workflows/android-check.yaml b/.github/workflows/android-check.yaml index 39a0df6564..dad169d810 100644 --- a/.github/workflows/android-check.yaml +++ b/.github/workflows/android-check.yaml @@ -64,5 +64,5 @@ jobs: uses: actions/upload-artifact@v2 with: name: android-web-arm64-v8a-debug - path: android/build/outputs/apk/android-web-debug-*.apk + path: android/build/outputs/apk/web/debug/OrganicMaps-*-web-debug.apk if-no-files-found: error diff --git a/android/build.gradle b/android/build.gradle index 06a1eca193..74d92052e8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -76,8 +76,6 @@ if (googleFirebaseServicesEnabled) { apply plugin: 'com.google.firebase.appdistribution' } -import java.text.SimpleDateFormat - dependencies { implementation 'androidx.multidex:multidex:' + propMultiDexVersion @@ -118,18 +116,47 @@ dependencies { implementation 'androidx.fragment:fragment:1.1.0' } -def getDate() { - def date = new Date() - def dateFormat = new SimpleDateFormat("yyMMdd") - def formattedDate = dateFormat.format(date) - return formattedDate +def run(cmd) { + def stdout = new ByteArrayOutputStream() + exec{ + commandLine = cmd + standardOutput = stdout; + } + return stdout.toString() +} + +def getVersion() { + def gitsha = run(['git', 'rev-parse', '--short', 'HEAD']).trim() + def time = Integer.parseInt(run(['git', 'log', '-1', '--format=%ct']).trim()) + def cal = Calendar.getInstance(Locale.ENGLISH); + cal.setTimeInMillis((long) time * 1000); + def year = cal.get(Calendar.YEAR); + def month = cal.get(Calendar.MONTH) + 1; + def day = cal.get(Calendar.DAY_OF_MONTH); + def hour = cal.get(Calendar.HOUR_OF_DAY); + + // Use the current date to generate the version code: + // RR_yy_MM_dd_HH + // - RR - reserved to identify special markets, max value is 21. + // - yy - year + // - MM - month + // - dd - day + // - hh - hour + // 21_00_00_00_00 is the the greatest value Google Play allows for versionCode. + // See https://developer.android.com/studio/publish/versioning for details. + def versionCode = (year - 2000) * 1_00_00_00 + month * 1_00_00 + day * 1_00 + hour; + + // Use the current date to generate the version name: + // 2021.04.11-12-gae0bcb54f9-Google (-Google added by flavor) + def versionName = String.format("%04d.%02d.%02d-%d-g%s", year, month, day, hour, gitsha) + + return new Tuple2(versionCode, versionName) } def osName = System.properties['os.name'].toLowerCase() -project.ext.versionCodes = ['armeabi-v7a': 30, 'x86': 40, 'arm64-v8a': 50, 'x86_64' : 60] project.ext.appId = 'app.omaps' -project.ext.appName = 'OMaps' +project.ext.appName = 'OrganicMaps' configurations.all { if (it.getName().contains("lint")) @@ -197,8 +224,11 @@ android { defaultConfig { vectorDrawables.useSupportLibrary = true // Default package name is taken from the manifest and should be app.omaps - versionCode propVersionCode.toInteger() - versionName propVersionName + def ver = getVersion(); + //println("Version:", versionName); + //println("VersionCode:", versionCode); + versionCode = ver.first + versionName = ver.second minSdkVersion propMinSdkVersion.toInteger() targetSdkVersion propTargetSdkVersion.toInteger() applicationId project.ext.appId @@ -224,6 +254,8 @@ android { } } + setProperty("archivesBaseName", appName + "-" + defaultConfig.versionCode) + ndk { abiFilters = new HashSet<>() if (project.hasProperty('arm32') || project.hasProperty('armeabi-v7a')) { @@ -273,8 +305,9 @@ android { flavorDimensions "default" productFlavors { - final int HUAWEI_VERSION_CODE_BASE = 20000 - final int TENCENT_VERSION_CODE_BASE = 10000 + // See getVersion() + final int HUAWEI_VERSION_CODE_BASE = 01_00_00_00_00 + final int TENCENT_VERSION_CODE_BASE = 02_00_00_00_00 google { dimension "default" @@ -439,19 +472,6 @@ android { } } - android.applicationVariants.all { variant -> - variant.outputs.all { output -> - if (output.outputFile != null && output.outputFile.name.endsWith('.apk')) { - def file = output.outputFile - // version at the end of each built apk - output.outputFileName = "../../" + file.name.replace(".apk", "-" + android.defaultConfig.versionName + "-" + getDate() + ".apk") - // set different versionCodes for different ABIs - int abiVersionCode = project.ext.versionCodes.get(output.getFilter(com.android.build.OutputFile.ABI)) ?: 0 - output.versionCodeOverride = (abiVersionCode * 1000) + variant.versionCode - } - } - } - signingConfigs { debug { storeFile file('debug.keystore') @@ -476,7 +496,7 @@ android { zipAlignEnabled true signingConfig signingConfigs.debug resValue 'string', 'app_id', android.defaultConfig.applicationId + applicationIdSuffix - resValue 'string', 'app_name', project.ext.appName + applicationIdSuffix + resValue 'string', 'app_name', project.ext.appName + ' ' + '(Debug)' ndk.debugSymbolLevel = 'SYMBOL_TABLE' } @@ -501,7 +521,7 @@ android { signingConfig signingConfigs.release matchingFallbacks = ['debug', 'release'] resValue 'string', 'app_id', android.defaultConfig.applicationId + applicationIdSuffix - resValue 'string', 'app_name', project.ext.appName + applicationIdSuffix + resValue 'string', 'app_name', project.ext.appName + ' ' + '(Beta)' ndk.debugSymbolLevel = 'SYMBOL_TABLE' if (googleFirebaseServicesEnabled) { firebaseCrashlytics { @@ -510,7 +530,7 @@ android { firebaseAppDistribution { releaseNotesFile = "RELEASE" groups = "android-qa" - apkPath = "./build/outputs/apk/android-web-arm64-v8a-beta.apk" + apkPath = "./build/outputs/apk/web/beta/" + appName + "-" + defaultConfig.versionCode + "-web-beta.apk" serviceCredentialsFile = "firebase-app-distribution.json" } } diff --git a/android/gradle.properties b/android/gradle.properties index 190f64beeb..299b7f79ad 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -2,8 +2,6 @@ propMinSdkVersion=21 propTargetSdkVersion=30 propCompileSdkVersion=30 propBuildToolsVersion=30.0.3 -propVersionCode=1070 -propVersionName=10.7.0 propMultiDexVersion=2.0.1 org.gradle.parallel=true diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index afb27102b3..ffa6a2e3b2 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -1,4 +1,4 @@ -CURRENT_PROJECT_VERSION = 10.6.0 +CURRENT_PROJECT_VERSION = 2021.04.24 // Paths OMIM_ROOT = $(PROJECT_DIR)/../..