Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Use handy buildConfigFieldStr. (#4501)

Browse source
This commit is contained in:
Benoit Marty 2025-03-28 16:54:16 +01:00 • committed by GitHub
parent b57ab40be8
commit 020ba00bcf
2 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/build.gradle.kts
View file

@ -20,6 +20,7 @@ import extension.allEnterpriseImpl
import extension.allFeaturesImpl import extension.allFeaturesImpl
import extension.allLibrariesImpl import extension.allLibrariesImpl
import extension.allServicesImpl import extension.allServicesImpl
import extension.buildConfigFieldStr
import extension.koverDependencies import extension.koverDependencies
import extension.locales import extension.locales
import extension.setupAnvil import extension.setupAnvil
@ -170,13 +171,13 @@ android {
create("gplay") { create("gplay") {
dimension = "store" dimension = "store"
isDefault = true isDefault = true
buildConfigField("String", "SHORT_FLAVOR_DESCRIPTION", "\"G\"") buildConfigFieldStr("SHORT_FLAVOR_DESCRIPTION", "G")
buildConfigField("String", "FLAVOR_DESCRIPTION", "\"GooglePlay\"") buildConfigFieldStr("FLAVOR_DESCRIPTION", "GooglePlay")
} }
create("fdroid") { create("fdroid") {
dimension = "store" dimension = "store"
buildConfigField("String", "SHORT_FLAVOR_DESCRIPTION", "\"F\"") buildConfigFieldStr("SHORT_FLAVOR_DESCRIPTION", "F")
buildConfigField("String", "FLAVOR_DESCRIPTION", "\"FDroid\"") buildConfigFieldStr("FLAVOR_DESCRIPTION", "FDroid")
} }
} }
} }
@ -291,8 +292,8 @@ tasks.withType<GenerateBuildConfig>().configureEach {
outputs.upToDateWhen { false } outputs.upToDateWhen { false }
val gitRevision = providers.of(GitRevisionValueSource::class.java) {}.get() val gitRevision = providers.of(GitRevisionValueSource::class.java) {}.get()
val gitBranchName = providers.of(GitBranchNameValueSource::class.java) {}.get() val gitBranchName = providers.of(GitBranchNameValueSource::class.java) {}.get()
android.defaultConfig.buildConfigField("String", "GIT_REVISION", "\"$gitRevision\"") android.defaultConfig.buildConfigFieldStr("GIT_REVISION", gitRevision)
android.defaultConfig.buildConfigField("String", "GIT_BRANCH_NAME", "\"$gitBranchName\"") android.defaultConfig.buildConfigFieldStr("GIT_BRANCH_NAME", gitBranchName)
} }
licensee { licensee {

31
features/call/impl/build.gradle.kts
View file

@ -1,3 +1,4 @@
import extension.buildConfigFieldStr
import extension.readLocalProperty import extension.readLocalProperty
import extension.setupAnvil import extension.setupAnvil
@ -26,45 +27,35 @@ android {
} }
defaultConfig { defaultConfig {
buildConfigField( buildConfigFieldStr(
type = "String",
name = "SENTRY_DSN", name = "SENTRY_DSN",
value = (System.getenv("ELEMENT_CALL_SENTRY_DSN") value = System.getenv("ELEMENT_CALL_SENTRY_DSN")
?: readLocalProperty("features.call.sentry.dsn") ?: readLocalProperty("features.call.sentry.dsn")
?: "" ?: ""
).let { "\"$it\"" }
) )
buildConfigField( buildConfigFieldStr(
type = "String",
name = "POSTHOG_USER_ID", 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") ?: readLocalProperty("features.call.posthog.userid")
?: "" ?: ""
).let { "\"$it\"" }
) )
buildConfigField( buildConfigFieldStr(
type = "String",
name = "POSTHOG_API_HOST", 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") ?: readLocalProperty("features.call.posthog.api.host")
?: "" ?: ""
).let { "\"$it\"" }
) )
buildConfigField( buildConfigFieldStr(
type = "String",
name = "POSTHOG_API_KEY", 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") ?: readLocalProperty("features.call.posthog.api.key")
?: "" ?: ""
).let { "\"$it\"" }
) )
buildConfigField( buildConfigFieldStr(
type = "String",
name = "RAGESHAKE_URL", name = "RAGESHAKE_URL",
value = (System.getenv("ELEMENT_CALL_RAGESHAKE_URL") value = System.getenv("ELEMENT_CALL_RAGESHAKE_URL")
?: readLocalProperty("features.call.regeshake.url") ?: readLocalProperty("features.call.regeshake.url")
?: "" ?: ""
).let { "\"$it\"" }
) )
} }
} }