blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Issue #4873: Reuse Firefox application id for fennecProduction build type.

master
Sebastian Kaspari 2019-08-23 14:44:23 +02:00
parent c7216d1bd7
commit 4f51af07ae
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/build.gradle
View File

@ -19,7 +19,7 @@ import com.android.build.OutputFile
android { android {
compileSdkVersion 28 compileSdkVersion 28
defaultConfig { defaultConfig {
applicationId "org.mozilla.fenix" applicationId "org.mozilla"
minSdkVersion Config.minSdkVersion minSdkVersion Config.minSdkVersion
targetSdkVersion Config.targetSdkVersion targetSdkVersion Config.targetSdkVersion
versionCode 1 versionCode 1
@ -43,32 +43,35 @@ android {
debug { debug {
shrinkResources false shrinkResources false
minifyEnabled false minifyEnabled false
applicationIdSuffix ".debug" applicationIdSuffix ".fenix.debug"
manifestPlaceholders.isRaptorEnabled = "true" manifestPlaceholders.isRaptorEnabled = "true"
resValue "bool", "IS_DEBUG", "true" resValue "bool", "IS_DEBUG", "true"
pseudoLocalesEnabled true pseudoLocalesEnabled true
} }
forPerformanceTest releaseTemplate >> { // the ">>" concatenates the raptor-specific options with the template forPerformanceTest releaseTemplate >> { // the ">>" concatenates the raptor-specific options with the template
manifestPlaceholders.isRaptorEnabled = "true" manifestPlaceholders.isRaptorEnabled = "true"
applicationIdSuffix ".performancetest" applicationIdSuffix ".fenix.performancetest"
debuggable true debuggable true
} }
fenixNightlyLegacy releaseTemplate >> { fenixNightlyLegacy releaseTemplate >> {
applicationIdSuffix ".fenix"
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
} }
fenixNightly releaseTemplate >> { fenixNightly releaseTemplate >> {
applicationIdSuffix ".nightly" applicationIdSuffix ".fenix.nightly"
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
} }
fenixBeta releaseTemplate >> { fenixBeta releaseTemplate >> {
applicationIdSuffix ".beta" applicationIdSuffix ".fenix.beta"
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
} }
fenixProduction releaseTemplate >> { fenixProduction releaseTemplate >> {
applicationIdSuffix ".fenix"
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
} }
fennecProduction releaseTemplate >> { fennecProduction releaseTemplate >> {
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true" buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
applicationIdSuffix ".firefox"
} }
} }
@ -167,9 +170,15 @@ android.applicationVariants.all { variant ->
def isDebug = variant.buildType.resValues['IS_DEBUG']?.value ?: false def isDebug = variant.buildType.resValues['IS_DEBUG']?.value ?: false
def useReleaseVersioning = variant.buildType.buildConfigFields['USE_RELEASE_VERSIONING']?.value ?: false def useReleaseVersioning = variant.buildType.buildConfigFields['USE_RELEASE_VERSIONING']?.value ?: false
def versionName = Config.releaseVersionName(project) def versionName = Config.releaseVersionName(project)
println("----------------------------------------------")
println("Variant name: " + variant.name)
println("Application ID: " + [variant.mergedFlavor.applicationId, variant.buildType.applicationIdSuffix].findAll().join())
println("Build type: " + variant.buildType.name)
println("Flavor: " + variant.flavorName)
println("Telemetry enabled: " + !isDebug)
if (useReleaseVersioning) { if (useReleaseVersioning) {
// The Google Play Store does not allow multiple APKs for the same app that all have the // The Google Play Store does not allow multiple APKs for the same app that all have the
// same version code. Therefore we need to have different version codes for our ARM and x86 // same version code. Therefore we need to have different version codes for our ARM and x86
@ -225,13 +234,6 @@ android.applicationVariants.all { variant ->
} }
} }
println("----------------------------------------------")
println("Variant name: " + variant.name)
println("Build type: " + variant.buildType.name)
println("Flavor: " + variant.flavorName)
println("Version code: " + (versionCode ?: variant.mergedFlavor.versionCode))
println("Telemetry enabled: " + !isDebug)
// ------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------
// BuildConfig: Set variables for Sentry, Crash Reporting, and Telemetry // BuildConfig: Set variables for Sentry, Crash Reporting, and Telemetry
// ------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------