From 097a377af378b7b71f9a3bc799e43f6c9124083d Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 3 May 2022 16:37:13 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 24 +++++++++---------- .../tangem/tap/domain/configurable/Loader.kt | 6 ++--- dependencies.gradle | 6 +++++ domain/build.gradle | 10 ++++++++ 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8771cec1c3..550a83ec13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,11 +3,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' - -ext.configVar = [ - configEnvironment: "CONFIG_ENVIRONMENT", - testActionEnabled: "TEST_ACTION_ENABLED", -] +apply from: '../dependencies.gradle' android { compileSdkVersion 31 @@ -19,7 +15,8 @@ android { targetSdkVersion 31 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - buildConfigField 'Boolean', configVar.testActionEnabled, 'false' + buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false' + buildConfigField 'Boolean', environmentConfig.logEnabled, 'false' } buildFeatures { compose true @@ -31,8 +28,9 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.debug - buildConfigField 'String', configVar.configEnvironment, '\"prod\"' - buildConfigField 'Boolean', configVar.testActionEnabled, 'false' + buildConfigField 'String', environmentConfig.environment, '\"prod\"' + buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false' + buildConfigField 'Boolean', environmentConfig.logEnabled, 'false' } debug { debuggable true @@ -42,16 +40,18 @@ android { firebaseCrashlytics { mappingFileUploadEnabled false } - buildConfigField 'String', configVar.configEnvironment, '\"dev\"' - buildConfigField 'Boolean', configVar.testActionEnabled, 'true' + buildConfigField 'String', environmentConfig.environment, '\"dev\"' + buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'true' + buildConfigField 'Boolean', environmentConfig.logEnabled, 'true' } debug_beta { initWith release debuggable false versionNameSuffix "-beta" applicationIdSuffix ".debug" - buildConfigField 'String', configVar.configEnvironment, '\"prod\"' - buildConfigField 'Boolean', configVar.testActionEnabled, 'false' + buildConfigField 'String', environmentConfig.environment, '\"prod\"' + buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false' + buildConfigField 'Boolean', environmentConfig.logEnabled, 'false' } } diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/Loader.kt b/app/src/main/java/com/tangem/tap/domain/configurable/Loader.kt index 873b71c500..5354d0b219 100644 --- a/app/src/main/java/com/tangem/tap/domain/configurable/Loader.kt +++ b/app/src/main/java/com/tangem/tap/domain/configurable/Loader.kt @@ -9,8 +9,8 @@ interface Loader { fun load(onComplete: (T) -> Unit) companion object { - const val featuresName = "features_${BuildConfig.CONFIG_ENVIRONMENT}" - const val configValuesName = "tangem-app-config/config_${BuildConfig.CONFIG_ENVIRONMENT}" - const val warnings = "warnings_${BuildConfig.CONFIG_ENVIRONMENT}" + const val featuresName = "features_${BuildConfig.ENVIRONMENT}" + const val configValuesName = "tangem-app-config/config_${BuildConfig.ENVIRONMENT}" + const val warnings = "warnings_${BuildConfig.ENVIRONMENT}" } } \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index 5ceeadcc6e..d463106208 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,3 +2,9 @@ ext.versions = [ kotlin : '1.6.10', build_gradle: '7.1.3', ] + +ext.environmentConfig = [ + environment: "ENVIRONMENT", + testActionEnabled: "TEST_ACTION_ENABLED", + logEnabled : "LOG_ENABLED", +] \ No newline at end of file diff --git a/domain/build.gradle b/domain/build.gradle index 4b5b520869..b156723a15 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -3,6 +3,8 @@ plugins { id 'org.jetbrains.kotlin.android' } +apply from: '../dependencies.gradle' + android { compileSdk 31 @@ -12,6 +14,8 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" + buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false' + buildConfigField 'Boolean', environmentConfig.logEnabled, 'false' } buildTypes { @@ -19,13 +23,19 @@ android { debuggable false minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'false' + buildConfigField 'Boolean', environmentConfig.logEnabled, 'false' } debug { debuggable true minifyEnabled false + buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'true' + buildConfigField 'Boolean', environmentConfig.logEnabled, 'true' } debug_beta { initWith release + buildConfigField 'Boolean', environmentConfig.testActionEnabled, 'true' + buildConfigField 'Boolean', environmentConfig.logEnabled, 'true' } } kotlinOptions {