ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 06:55:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address review

Browse Source
This commit is contained in:
bxdxnn
2026-09-15 14:45:26 +00:00
parent 903d31bbab
commit b772aebf49
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle.kts
+7 -20
View File
@@ -21,6 +21,7 @@ import extension.allFeaturesImpl
import extension.allLibrariesImpl import extension.allLibrariesImpl
import extension.allServicesImpl import extension.allServicesImpl
import extension.buildConfigFieldStr import extension.buildConfigFieldStr
import extension.environmentOrGradleValue
import extension.locales import extension.locales
import extension.setupDependencyInjection import extension.setupDependencyInjection
import extension.testCommonDependencies import extension.testCommonDependencies
@@ -38,12 +39,6 @@ plugins {
// alias(libs.plugins.gms.google.services) // alias(libs.plugins.gms.google.services)
} }
fun signingValue(envName: String, propertyName: String): String? =
providers.environmentVariable(envName)
.orElse(providers.gradleProperty(propertyName))
.orNull
?.takeIf { it.isNotBlank() }
android { android {
namespace = "io.element.android.x" namespace = "io.element.android.x"
@@ -94,22 +89,14 @@ android {
storePassword = "android" storePassword = "android"
} }
register("nightly") { register("nightly") {
keyAlias = signingValue("ELEMENT_ANDROID_NIGHTLY_KEYID", "signing.element.nightly.keyId") keyAlias = environmentOrGradleValue("ELEMENT_ANDROID_NIGHTLY_KEYID", "signing.element.nightly.keyId")
keyPassword = signingValue("ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD", "signing.element.nightly.keyPassword") keyPassword = environmentOrGradleValue("ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD", "signing.element.nightly.keyPassword")
storeFile = file( storeFile = file(
signingValue("ELEMENT_ANDROID_NIGHTLY_STOREFILE", "signing.element.nightly.storeFile") environmentOrGradleValue("ELEMENT_ANDROID_NIGHTLY_STOREFILE", "signing.element.nightly.storeFile")
?.ifBlank { null }
?: "./signature/nightly.keystore" ?: "./signature/nightly.keystore"
) )
storePassword = signingValue("ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD", "signing.element.nightly.storePassword") storePassword = environmentOrGradleValue("ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD", "signing.element.nightly.storePassword")
}
val releaseStoreFile = signingValue("ELEMENT_ANDROID_RELEASE_STOREFILE", "signing.element.release.storeFile")
if (releaseStoreFile != null) {
register("release") {
keyAlias = signingValue("ELEMENT_ANDROID_RELEASE_KEYID", "signing.element.release.keyId")
keyPassword = signingValue("ELEMENT_ANDROID_RELEASE_KEYPASSWORD", "signing.element.release.keyPassword")
storeFile = file(releaseStoreFile)
storePassword = signingValue("ELEMENT_ANDROID_RELEASE_STOREPASSWORD", "signing.element.release.storePassword")
}
} }
} }
@@ -137,7 +124,7 @@ android {
"login_redirect_scheme", "login_redirect_scheme",
oAuthRedirectSchemeBase, oAuthRedirectSchemeBase,
) )
signingConfig = signingConfigs.findByName("release") ?: signingConfigs.getByName("debug") signingConfig = signingConfigs.getByName("debug")
optimization { optimization {
enable = true enable = true
plugins/src/main/kotlin/extension/CommonExtension.kt
+9
View File
@@ -117,3 +117,12 @@ fun Project.defaultLintOptions(lint: Lint) = lint.apply {
ignoreTestFixturesSources = true ignoreTestFixturesSources = true
checkGeneratedSources = false checkGeneratedSources = false
} }
fun Project.environmentOrGradleValue(
environmentVariableName: String,
gradlePropertyName: String,
defaultValue: String? = null,
): String? = providers.environmentVariable(environmentVariableName)
.orElse(providers.gradleProperty(gradlePropertyName))
.orNull
?: defaultValue