Use handy buildConfigFieldStr. (#4501)
This commit is contained in:
@@ -20,6 +20,7 @@ import extension.allEnterpriseImpl
|
||||
import extension.allFeaturesImpl
|
||||
import extension.allLibrariesImpl
|
||||
import extension.allServicesImpl
|
||||
import extension.buildConfigFieldStr
|
||||
import extension.koverDependencies
|
||||
import extension.locales
|
||||
import extension.setupAnvil
|
||||
@@ -170,13 +171,13 @@ android {
|
||||
create("gplay") {
|
||||
dimension = "store"
|
||||
isDefault = true
|
||||
buildConfigField("String", "SHORT_FLAVOR_DESCRIPTION", "\"G\"")
|
||||
buildConfigField("String", "FLAVOR_DESCRIPTION", "\"GooglePlay\"")
|
||||
buildConfigFieldStr("SHORT_FLAVOR_DESCRIPTION", "G")
|
||||
buildConfigFieldStr("FLAVOR_DESCRIPTION", "GooglePlay")
|
||||
}
|
||||
create("fdroid") {
|
||||
dimension = "store"
|
||||
buildConfigField("String", "SHORT_FLAVOR_DESCRIPTION", "\"F\"")
|
||||
buildConfigField("String", "FLAVOR_DESCRIPTION", "\"FDroid\"")
|
||||
buildConfigFieldStr("SHORT_FLAVOR_DESCRIPTION", "F")
|
||||
buildConfigFieldStr("FLAVOR_DESCRIPTION", "FDroid")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -291,8 +292,8 @@ tasks.withType<GenerateBuildConfig>().configureEach {
|
||||
outputs.upToDateWhen { false }
|
||||
val gitRevision = providers.of(GitRevisionValueSource::class.java) {}.get()
|
||||
val gitBranchName = providers.of(GitBranchNameValueSource::class.java) {}.get()
|
||||
android.defaultConfig.buildConfigField("String", "GIT_REVISION", "\"$gitRevision\"")
|
||||
android.defaultConfig.buildConfigField("String", "GIT_BRANCH_NAME", "\"$gitBranchName\"")
|
||||
android.defaultConfig.buildConfigFieldStr("GIT_REVISION", gitRevision)
|
||||
android.defaultConfig.buildConfigFieldStr("GIT_BRANCH_NAME", gitBranchName)
|
||||
}
|
||||
|
||||
licensee {
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import extension.buildConfigFieldStr
|
||||
import extension.readLocalProperty
|
||||
import extension.setupAnvil
|
||||
|
||||
@@ -26,45 +27,35 @@ android {
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
buildConfigField(
|
||||
type = "String",
|
||||
buildConfigFieldStr(
|
||||
name = "SENTRY_DSN",
|
||||
value = (System.getenv("ELEMENT_CALL_SENTRY_DSN")
|
||||
value = System.getenv("ELEMENT_CALL_SENTRY_DSN")
|
||||
?: readLocalProperty("features.call.sentry.dsn")
|
||||
?: ""
|
||||
).let { "\"$it\"" }
|
||||
)
|
||||
buildConfigField(
|
||||
type = "String",
|
||||
buildConfigFieldStr(
|
||||
name = "POSTHOG_USER_ID",
|
||||
value = (System.getenv("ELEMENT_CALL_POSTHOG_USER_ID")
|
||||
value = System.getenv("ELEMENT_CALL_POSTHOG_USER_ID")
|
||||
?: readLocalProperty("features.call.posthog.userid")
|
||||
?: ""
|
||||
).let { "\"$it\"" }
|
||||
)
|
||||
buildConfigField(
|
||||
type = "String",
|
||||
buildConfigFieldStr(
|
||||
name = "POSTHOG_API_HOST",
|
||||
value = (System.getenv("ELEMENT_CALL_POSTHOG_API_HOST")
|
||||
value = System.getenv("ELEMENT_CALL_POSTHOG_API_HOST")
|
||||
?: readLocalProperty("features.call.posthog.api.host")
|
||||
?: ""
|
||||
).let { "\"$it\"" }
|
||||
)
|
||||
buildConfigField(
|
||||
type = "String",
|
||||
buildConfigFieldStr(
|
||||
name = "POSTHOG_API_KEY",
|
||||
value = (System.getenv("ELEMENT_CALL_POSTHOG_API_KEY")
|
||||
value = System.getenv("ELEMENT_CALL_POSTHOG_API_KEY")
|
||||
?: readLocalProperty("features.call.posthog.api.key")
|
||||
?: ""
|
||||
).let { "\"$it\"" }
|
||||
)
|
||||
buildConfigField(
|
||||
type = "String",
|
||||
buildConfigFieldStr(
|
||||
name = "RAGESHAKE_URL",
|
||||
value = (System.getenv("ELEMENT_CALL_RAGESHAKE_URL")
|
||||
value = System.getenv("ELEMENT_CALL_RAGESHAKE_URL")
|
||||
?: readLocalProperty("features.call.regeshake.url")
|
||||
?: ""
|
||||
).let { "\"$it\"" }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user