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

Create gplay and fdroid variant

Browse source
This commit is contained in:
Benoit Marty 2024-01-11 20:45:22 +01:00 • committed by Benoit Marty
parent e859b58f09
commit e4ef00908b
4 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/build.gradle.kts
View file

@ -69,7 +69,7 @@ android {
} }
signingConfigs { signingConfigs {
named("debug") { getByName("debug") {
keyAlias = "androiddebugkey" keyAlias = "androiddebugkey"
keyPassword = "android" keyPassword = "android"
storeFile = file("./signature/debug.keystore") storeFile = file("./signature/debug.keystore")
@ -87,13 +87,13 @@ android {
} }
buildTypes { buildTypes {
named("debug") { getByName("debug") {
resValue("string", "app_name", "Element X dbg") resValue("string", "app_name", "Element X dbg")
applicationIdSuffix = ".debug" applicationIdSuffix = ".debug"
signingConfig = signingConfigs.getByName("debug") signingConfig = signingConfigs.getByName("debug")
} }
named("release") { getByName("release") {
resValue("string", "app_name", "Element X") resValue("string", "app_name", "Element X")
signingConfig = signingConfigs.getByName("debug") signingConfig = signingConfigs.getByName("debug")
@ -143,6 +143,21 @@ android {
buildFeatures { buildFeatures {
buildConfig = true buildConfig = true
} }
flavorDimensions += "store"
productFlavors {
create("gplay") {
dimension = "store"
isDefault = true
buildConfigField("String", "SHORT_FLAVOR_DESCRIPTION", "\"G\"")
buildConfigField("String", "FLAVOR_DESCRIPTION", "\"GooglePlay\"")
}
create("fdroid") {
dimension = "store"
buildConfigField("String", "SHORT_FLAVOR_DESCRIPTION", "\"F\"")
buildConfigField("String", "FLAVOR_DESCRIPTION", "\"FDroid\"")
}
}
} }
androidComponents { androidComponents {

6
app/src/main/kotlin/io/element/android/x/di/AppModule.kt
View file

@ -91,10 +91,8 @@ object AppModule {
gitRevisionDate = "TODO", gitRevisionDate = "TODO",
// BuildConfig.GIT_BRANCH_NAME, // BuildConfig.GIT_BRANCH_NAME,
gitBranchName = "TODO", gitBranchName = "TODO",
// BuildConfig.FLAVOR_DESCRIPTION, flavorDescription = BuildConfig.FLAVOR_DESCRIPTION,
flavorDescription = "TODO", flavorShortDescription = BuildConfig.SHORT_FLAVOR_DESCRIPTION,
// BuildConfig.SHORT_FLAVOR_DESCRIPTION,
flavorShortDescription = "TODO",
) )
@Provides @Provides

6
plugins/src/main/kotlin/extension/KoverExtension.kt
View file

@ -97,8 +97,8 @@ fun Project.setupKover() {
defaults { defaults {
// add reports of both 'debug' and 'release' Android build variants to default reports // add reports of both 'debug' and 'release' Android build variants to default reports
mergeWith("debug") mergeWith("gplayDebug")
mergeWith("release") mergeWith("gplayRelease")
verify { verify {
onCheck = true onCheck = true
@ -202,7 +202,7 @@ fun Project.setupKover() {
} }
} }
androidReports("release") {} androidReports("gplayRelease") {}
} }
} }

6
samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
View file

@ -43,10 +43,8 @@ object Singleton {
gitRevisionDate = "TODO", gitRevisionDate = "TODO",
// BuildConfig.GIT_BRANCH_NAME, // BuildConfig.GIT_BRANCH_NAME,
gitBranchName = "TODO", gitBranchName = "TODO",
// BuildConfig.FLAVOR_DESCRIPTION, flavorDescription = "NA",
flavorDescription = "TODO", flavorShortDescription = "NA",
// BuildConfig.SHORT_FLAVOR_DESCRIPTION,
flavorShortDescription = "TODO",
) )
init { init {