diff options
| -rw-r--r-- | app/build.gradle | 8 | ||||
| -rw-r--r-- | build.gradle | 11 |
2 files changed, 5 insertions, 14 deletions
diff --git a/app/build.gradle b/app/build.gradle index 7749f8f..849d96a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion buildConfig.minSdk targetSdkVersion buildConfig.targetSdk versionCode buildConfig.version.code - versionName buildConfig.version.fullName + versionName buildConfig.version.name testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -75,10 +75,10 @@ android { * Sets the output name of the variant outputs and also it setup signingConfig based on the product flavor. */ applicationVariants.all { variant -> + variant.outputs.all { output -> + outputFileName = "Advanced_Privacy-${variant.versionName}-${variant.getFlavorName()}.apk" + } if (variant.buildType.name == "debug") { - variant.outputs.all { output -> - outputFileName = "PrivacyCentral-${output.name}-${variant.versionName}.apk" - } if (variant.getFlavorName() == "e29" || variant.getFlavorName() == "e30") { variant.mergedFlavor.signingConfig = signingConfigs.eDebug } else { diff --git a/build.gradle b/build.gradle index be0a6cf..27842f9 100644 --- a/build.gradle +++ b/build.gradle @@ -11,21 +11,12 @@ buildscript { 'major': 1, 'minor': 0, 'patch': 0, - 'build': "RC-1", ], ] ext.buildConfig.version['name'] = "${buildConfig.version.major}.${buildConfig.version.minor}.${buildConfig.version.patch}" ext.buildConfig.version['fullName'] = "${buildConfig.version.name}-${buildConfig.version.build}" - def buildNumber - if (buildConfig.version.build == 'alpha') { - buildNumber = -2 - } else if (buildConfig.version.build == 'beta') { - buildNumber = -1 - } else { - buildNumber = 0 - } - ext.buildConfig.version['code'] = buildConfig.version.major * 1000000 + buildConfig.version.minor * 10000 + buildConfig.version.patch * 100 + buildNumber + ext.buildConfig.version['code'] = buildConfig.version.major * 1000000 + buildConfig.version.minor * 1000 + buildConfig.version.patch // Load properties either from local.properties or system environment (on CI). apply from: rootProject.file('load-properties.gradle') |