diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 76ad6c75ba..f95653d523 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -314,9 +314,7 @@ dependencies { /** Chucker */ debugImplementation(deps.chucker) - debugPGImplementation(deps.chucker) mockedImplementation(deps.chuckerStub) - externalImplementation(deps.chuckerStub) internalImplementation(deps.chuckerStub) releaseImplementation(deps.chuckerStub) diff --git a/build.gradle.kts b/build.gradle.kts index 4cbeef6686..1b240b2cfd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,41 +59,9 @@ val assembleInternalQA by tasks.registering { } } -val assembleExternalQA by tasks.registering { - group = "build" - description = "Builds external APK to 'build/outputs' directory" - - val appOutputApkDir = "$projectDir/app/build/outputs/apk/external" - val rootOutputApkDir = "$buildDir/outputs" - val injected = objects.newInstance() - - dependsOn(":app:assembleExternal") - - doFirst { - injected.fs.delete { - delete(appOutputApkDir) - delete("$rootOutputApkDir/app-external.apk") - } - } - doLast { - injected.fs.copy { - from("$appOutputApkDir/app-external.apk") - into(rootOutputApkDir) - } - } -} - -val assembleQA by tasks.registering { - group = "build" - description = "Builds internal and external APKs to 'build/outputs' directory" - - dependsOn(assembleInternalQA) - dependsOn(assembleExternalQA) -} - val generateComposeMetrics by tasks.registering { group = "other" - description = "Build external APK and generates compose metrics to 'build/compose-metrics' directory" + description = "Build internal APK and generates compose metrics to 'build/compose-metrics' directory" subprojects { tasks.withType { @@ -118,5 +86,5 @@ val generateComposeMetrics by tasks.registering { } } - finalizedBy(assembleExternalQA) + finalizedBy(assembleInternalQA) } \ No newline at end of file diff --git a/core/datasource/build.gradle.kts b/core/datasource/build.gradle.kts index 380fdce973..3e2fdba3e3 100644 --- a/core/datasource/build.gradle.kts +++ b/core/datasource/build.gradle.kts @@ -70,9 +70,7 @@ dependencies { /** Chucker */ debugImplementation(deps.chucker) - debugPGImplementation(deps.chucker) mockedImplementation(deps.chuckerStub) - externalImplementation(deps.chuckerStub) internalImplementation(deps.chuckerStub) releaseImplementation(deps.chuckerStub) diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt index 28d4220428..952c80a5dc 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/ApiConfig.kt @@ -40,10 +40,8 @@ sealed class ApiConfig { companion object { internal const val DEBUG_BUILD_TYPE = "debug" - internal const val DEBUG_PG_BUILD_TYPE = "debugPG" internal const val INTERNAL_BUILD_TYPE = "internal" internal const val MOCKED_BUILD_TYPE = "mocked" - internal const val EXTERNAL_BUILD_TYPE = "external" internal const val RELEASE_BUILD_TYPE = "release" } } \ No newline at end of file diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt index 8a850c20ea..3ad70b9000 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/common/config/Express.kt @@ -69,12 +69,10 @@ internal class Express( fun getInitialEnvironment(): ApiEnvironment { return when (BuildConfig.BUILD_TYPE) { DEBUG_BUILD_TYPE, - DEBUG_PG_BUILD_TYPE, -> ApiEnvironment.DEV INTERNAL_BUILD_TYPE, MOCKED_BUILD_TYPE, -> ApiEnvironment.STAGE - EXTERNAL_BUILD_TYPE, RELEASE_BUILD_TYPE, -> ApiEnvironment.PROD else -> error("Unknown build type [${BuildConfig.BUILD_TYPE}]") diff --git a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt index 9097d47c30..005c4be7fc 100644 --- a/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt +++ b/core/datasource/src/test/kotlin/com/tangem/datasource/api/common/config/managers/ProdApiConfigsManagerTest.kt @@ -6,8 +6,6 @@ import com.tangem.datasource.BuildConfig import com.tangem.datasource.api.common.AuthProvider import com.tangem.datasource.api.common.config.* import com.tangem.datasource.api.common.config.ApiConfig.Companion.DEBUG_BUILD_TYPE -import com.tangem.datasource.api.common.config.ApiConfig.Companion.DEBUG_PG_BUILD_TYPE -import com.tangem.datasource.api.common.config.ApiConfig.Companion.EXTERNAL_BUILD_TYPE import com.tangem.datasource.api.common.config.ApiConfig.Companion.INTERNAL_BUILD_TYPE import com.tangem.datasource.api.common.config.ApiConfig.Companion.MOCKED_BUILD_TYPE import com.tangem.datasource.api.common.config.ApiConfig.Companion.RELEASE_BUILD_TYPE @@ -97,12 +95,10 @@ internal class ProdApiConfigsManagerTest(private val model: Model) { private fun createExpressModel(): Model { val environment = when (BuildConfig.BUILD_TYPE) { DEBUG_BUILD_TYPE, - DEBUG_PG_BUILD_TYPE, -> ApiEnvironment.DEV INTERNAL_BUILD_TYPE, MOCKED_BUILD_TYPE, -> ApiEnvironment.STAGE - EXTERNAL_BUILD_TYPE, RELEASE_BUILD_TYPE, -> ApiEnvironment.PROD else -> error("Unknown build type [${BuildConfig.BUILD_TYPE}]") @@ -114,12 +110,10 @@ internal class ProdApiConfigsManagerTest(private val model: Model) { environment = environment, baseUrl = when (BuildConfig.BUILD_TYPE) { DEBUG_BUILD_TYPE, - DEBUG_PG_BUILD_TYPE, -> "[REDACTED_ENV_URL]" INTERNAL_BUILD_TYPE, MOCKED_BUILD_TYPE, -> "[REDACTED_ENV_URL]" - EXTERNAL_BUILD_TYPE, RELEASE_BUILD_TYPE, -> "https://express.tangem.com/v1/" else -> error("Unknown build type [${BuildConfig.BUILD_TYPE}]") diff --git a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt index a4bc580673..89c5d2f72d 100644 --- a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt +++ b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/configurations/extension/AppExtensionConfigurations.kt @@ -69,25 +69,17 @@ private fun AppExtension.configureBuildTypes() { private fun AndroidBuildType.configureBuildVariant(appExtension: AppExtension, buildType: BuildType) { when (buildType) { - BuildType.Release -> { - isDebuggable = false - } BuildType.Debug -> { isDebuggable = true } - BuildType.DebugPG -> { - // build is not debuggable to let R8 make optimizations - // otherwise, only shrinking will be applied - matchingFallbacks.add(BuildType.Debug.id) - signingConfig = appExtension.signingConfigs.getByName(BuildType.Debug.id) - } - BuildType.Internal, - BuildType.External, - -> { + BuildType.Internal -> { initWith(appExtension.buildTypes.getByName(BuildType.Release.id)) matchingFallbacks.add(BuildType.Release.id) signingConfig = appExtension.signingConfigs.getByName(BuildType.Debug.id) } + BuildType.Release -> { + isDebuggable = false + } BuildType.Mocked -> { initWith(appExtension.buildTypes.getByName(BuildType.Release.id)) matchingFallbacks.add(BuildType.Release.id) diff --git a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt index 1ca95f8b20..485c960dcb 100644 --- a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt +++ b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/BuildType.kt @@ -32,19 +32,6 @@ internal enum class BuildType( ), ), - DebugPG( - id = "debugPG", - appIdSuffix = "debug", - obfuscating = true, - configFields = listOf( - BuildConfigField.Environment(value = "dev"), - BuildConfigField.TestActionEnabled(isEnabled = true), - BuildConfigField.LogEnabled(isEnabled = true), - BuildConfigField.TesterMenuAvailability(isEnabled = true), - BuildConfigField.MockDataSource(isEnabled = false), - ), - ), - /** * Build type for QA and business * @@ -91,27 +78,6 @@ internal enum class BuildType( ), ), - /** - * Build type for QA and business - * - * Features: - * - Env: prod - * - Signing config: debug - * - Proguard - * */ - External( - id = "external", - appIdSuffix = "external", - versionSuffix = "external", - configFields = listOf( - BuildConfigField.Environment(value = "prod"), - BuildConfigField.TestActionEnabled(isEnabled = false), - BuildConfigField.LogEnabled(isEnabled = false), - BuildConfigField.TesterMenuAvailability(isEnabled = false), - BuildConfigField.MockDataSource(isEnabled = false), - ), - ), - /** * Production ready build type for clients *