mirror of
https://github.com/keymanapp/keyman.git
synced 2026-08-25 09:47:42 +00:00
Merge pull request #13259 from keymanapp/fix/android/env-tier
fix(android): Use TIER.md to determine Play Store tier
This commit is contained in:
commit
549b11e844
2 changed files with 5 additions and 3 deletions
|
|
@ -67,6 +67,7 @@ android {
|
|||
productFlavors {
|
||||
}
|
||||
|
||||
String tier = new File('../../TIER.md').getText('UTF-8').trim();
|
||||
applicationVariants.all { variant ->
|
||||
// Append tag to app name to help differentiate versions for app testers:
|
||||
// - stable builds have no suffix
|
||||
|
|
@ -75,7 +76,7 @@ android {
|
|||
// - PR builds also have "-test-1234" suffix (where 1234 is PR#)
|
||||
// Gradle sync will nullify these values, so have a fallback
|
||||
String appSuffix = ''
|
||||
String tag = VERSION_TAG ? VERSION_TAG : '-' + new File('../../TIER.md').getText('UTF-8');
|
||||
String tag = VERSION_TAG ? VERSION_TAG : '-' + tier;
|
||||
if (tag.startsWithAny("-beta", "beta")) {
|
||||
appSuffix = ' Beta';
|
||||
} else if (tag.startsWithAny("-alpha", "alpha")) {
|
||||
|
|
@ -127,7 +128,7 @@ if (env_keys_json_file != null && file(env_keys_json_file).exists()) {
|
|||
|
||||
// Deactivate lower conflicting version APKs
|
||||
resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.IGNORE)
|
||||
switch (System.env.TIER) {
|
||||
switch (String.valueOf(tier)) {
|
||||
case 'beta':
|
||||
track.set("beta")
|
||||
println "TIER set to beta"
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ android {
|
|||
productFlavors {
|
||||
}
|
||||
|
||||
String tier = new File('../../../TIER.md').getText('UTF-8').trim();
|
||||
applicationVariants.all { variant ->
|
||||
// Adjust output name to "firstvoices-${VERSION_MD}.apk"
|
||||
variant.outputs.all {
|
||||
|
|
@ -95,7 +96,7 @@ if (env_keys_json_file != null && file(env_keys_json_file).exists()) {
|
|||
|
||||
// Deactivate lower conflicting version APKs
|
||||
resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.IGNORE)
|
||||
switch (System.env.TIER) {
|
||||
switch (String.valueOf(tier)) {
|
||||
case 'beta':
|
||||
track.set("beta")
|
||||
println "TIER set to beta"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue