Merge pull request #368 from android/wk/agp8-changes

Fix app package name clash with benchmark module
pull/439/head
Milosz Moczkowski 2 years ago committed by GitHub
commit 28ffbb0b7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -21,7 +21,7 @@ plugins {
}
android {
namespace = "com.google.samples.apps.nowinandroid.benchmark"
namespace = "com.google.samples.apps.nowinandroid.benchmarks"
defaultConfig {
minSdk = 23

@ -16,10 +16,16 @@
package com.google.samples.apps.nowinandroid
import com.google.samples.apps.nowinandroid.benchmark.BuildConfig
import com.google.samples.apps.nowinandroid.benchmarks.BuildConfig
/**
* Convenience parameter to use proper package name with regards to build type and build flavor.
*/
const val PACKAGE_NAME =
"com.google.samples.apps.nowinandroid.${BuildConfig.FLAVOR}.${BuildConfig.BUILD_TYPE}"
val PACKAGE_NAME = StringBuilder("com.google.samples.apps.nowinandroid").apply {
if (BuildConfig.FLAVOR != "prod") {
append(".${BuildConfig.FLAVOR}")
}
if (BuildConfig.BUILD_TYPE != "release") {
append(".${BuildConfig.BUILD_TYPE}")
}
}.toString()

@ -33,7 +33,7 @@ dependencyResolutionManagement {
rootProject.name = "nowinandroid"
include(":app")
include(":app-nia-catalog")
include(":benchmark")
include(":benchmarks")
include(":core:common")
include(":core:data")
include(":core:data-test")

Loading…
Cancel
Save