From 2666e76a04086420134c744e97a0cef3279dc0c9 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 9 Mar 2023 20:00:53 +0300 Subject: [PATCH 1/2] Updated on 2026-08-14 --- app/src/debug/AndroidManifest.xml | 18 --- app/src/debug/res/values-ru/strings.xml | 2 +- .../debug/res/xml/network_security_config.xml | 9 ++ app/src/debug_beta/AndroidManifest.xml | 18 --- app/src/debug_beta/res/values-ru/strings.xml | 6 - app/src/debug_beta/res/values/strings.xml | 6 - app/src/external/res/values-ru/strings.xml | 6 + app/src/external/res/values/strings.xml | 6 + app/src/internal/res/values-ru/strings.xml | 6 + app/src/internal/res/values/strings.xml | 6 + .../res/xml/network_security_config.xml | 9 ++ .../main/res/xml/network_security_config.xml | 7 -- .../extension/AppExtensionConfigurations.kt | 4 +- .../plugin/configuration/model/BuildType.kt | 111 +++++++++++------- 14 files changed, 112 insertions(+), 102 deletions(-) delete mode 100644 app/src/debug/AndroidManifest.xml create mode 100644 app/src/debug/res/xml/network_security_config.xml delete mode 100644 app/src/debug_beta/AndroidManifest.xml delete mode 100644 app/src/debug_beta/res/values-ru/strings.xml delete mode 100644 app/src/debug_beta/res/values/strings.xml create mode 100644 app/src/external/res/values-ru/strings.xml create mode 100644 app/src/external/res/values/strings.xml create mode 100644 app/src/internal/res/values-ru/strings.xml create mode 100644 app/src/internal/res/values/strings.xml create mode 100644 app/src/internal/res/xml/network_security_config.xml diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml deleted file mode 100644 index 2784e858d0..0000000000 --- a/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/debug/res/values-ru/strings.xml b/app/src/debug/res/values-ru/strings.xml index 878fbcbef1..9c7f1adda2 100644 --- a/app/src/debug/res/values-ru/strings.xml +++ b/app/src/debug/res/values-ru/strings.xml @@ -1,6 +1,6 @@ - DebugTangem + DebugTangem diff --git a/app/src/debug/res/xml/network_security_config.xml b/app/src/debug/res/xml/network_security_config.xml new file mode 100644 index 0000000000..894912ac61 --- /dev/null +++ b/app/src/debug/res/xml/network_security_config.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/app/src/debug_beta/AndroidManifest.xml b/app/src/debug_beta/AndroidManifest.xml deleted file mode 100644 index 2784e858d0..0000000000 --- a/app/src/debug_beta/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/debug_beta/res/values-ru/strings.xml b/app/src/debug_beta/res/values-ru/strings.xml deleted file mode 100644 index 7fd995cb02..0000000000 --- a/app/src/debug_beta/res/values-ru/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - BetaTangem - - diff --git a/app/src/debug_beta/res/values/strings.xml b/app/src/debug_beta/res/values/strings.xml deleted file mode 100644 index 7fd995cb02..0000000000 --- a/app/src/debug_beta/res/values/strings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - BetaTangem - - diff --git a/app/src/external/res/values-ru/strings.xml b/app/src/external/res/values-ru/strings.xml new file mode 100644 index 0000000000..3a1e80c609 --- /dev/null +++ b/app/src/external/res/values-ru/strings.xml @@ -0,0 +1,6 @@ + + + + ExternalTangem + + diff --git a/app/src/external/res/values/strings.xml b/app/src/external/res/values/strings.xml new file mode 100644 index 0000000000..3a1e80c609 --- /dev/null +++ b/app/src/external/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + ExternalTangem + + diff --git a/app/src/internal/res/values-ru/strings.xml b/app/src/internal/res/values-ru/strings.xml new file mode 100644 index 0000000000..76df805cb3 --- /dev/null +++ b/app/src/internal/res/values-ru/strings.xml @@ -0,0 +1,6 @@ + + + + InternalTangem + + diff --git a/app/src/internal/res/values/strings.xml b/app/src/internal/res/values/strings.xml new file mode 100644 index 0000000000..76df805cb3 --- /dev/null +++ b/app/src/internal/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + InternalTangem + + diff --git a/app/src/internal/res/xml/network_security_config.xml b/app/src/internal/res/xml/network_security_config.xml new file mode 100644 index 0000000000..894912ac61 --- /dev/null +++ b/app/src/internal/res/xml/network_security_config.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml index c0b6c9cc13..454c57b5fd 100644 --- a/app/src/main/res/xml/network_security_config.xml +++ b/app/src/main/res/xml/network_security_config.xml @@ -1,12 +1,5 @@ - - - - - - - api.tangem.com 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 3817da1027..1ba8b81a2d 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 @@ -72,7 +72,9 @@ private fun AndroidBuildType.configureBuildVariant(extension: AppExtension, buil isDebuggable = true isMinifyEnabled = false } - BuildType.External -> { + BuildType.Internal, + BuildType.External, + -> { initWith(extension.buildTypes.getByName(BuildType.Release.id)) signingConfig = extension.signingConfigs.getByName(BuildType.Debug.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 16aa46325d..b872eb35ff 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 @@ -7,6 +7,72 @@ internal enum class BuildType( val configFields: List, ) { + /** + * Build type for developers + * + * Features: + * - Env: dev + * - Signing config: debug + * - Debuggable + * - Logs + * - Tester menu + * - Test action + * - Traffic sniffing + * */ + Debug( + id = "debug", + appIdSuffix = "debug", + configFields = listOf( + BuildConfigField.Environment(value = "dev"), + BuildConfigField.TestActionEnabled(isEnabled = true), + BuildConfigField.LogEnabled(isEnabled = true), + BuildConfigField.TesterMenuAvailability(isEnabled = true), + ), + ), + + /** + * Build type for QA + * + * Features: + * - Env: beta + * - Signing config: debug + * - Logs + * - Tester menu + * - Test action + * - Traffic sniffing + * */ + Internal( + id = "internal", + appIdSuffix = "internal", + versionSuffix = "internal", + configFields = listOf( + BuildConfigField.Environment(value = "beta"), + BuildConfigField.TestActionEnabled(isEnabled = true), + BuildConfigField.LogEnabled(isEnabled = true), + BuildConfigField.TesterMenuAvailability(isEnabled = true), + ), + ), + + /** + * 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), + ), + ), + /** * Production ready build type for clients * @@ -24,49 +90,4 @@ internal enum class BuildType( BuildConfigField.TesterMenuAvailability(isEnabled = false), ), ), - - /** - * Build type for developers - * - * Features: - * - Env: dev - * - Signing config: debug - * - Debuggable - * - Logs - * - Tester menu - * - Test action - * - Traffic sniffing - * */ - Debug( - id = "debug", - appIdSuffix = "dev", - configFields = listOf( - BuildConfigField.Environment(value = "dev"), - BuildConfigField.TestActionEnabled(isEnabled = true), - BuildConfigField.LogEnabled(isEnabled = true), - BuildConfigField.TesterMenuAvailability(isEnabled = true), - ), - ), - - /** - * Build type for QA and business - * - * Features: - * - Env: prod - * - Signing config: debug - * - Tester menu - * - Test action - * - Proguard - * */ - External( - id = "debug_beta", - appIdSuffix = "debug", - versionSuffix = "debug", - configFields = listOf( - BuildConfigField.Environment(value = "prod"), - BuildConfigField.TestActionEnabled(isEnabled = true), - BuildConfigField.LogEnabled(isEnabled = false), - BuildConfigField.TesterMenuAvailability(isEnabled = true), - ), - ), } \ No newline at end of file From 3106ca292ffdb889ce158bb67787e16c8a7f4a13 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 22 Mar 2023 14:25:42 +0300 Subject: [PATCH 2/2] Updated on 2026-08-14 --- app/src/main/assets/tangem-app-config | 2 +- fastlane/Fastfile | 6 +++--- fastlane/README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index f5f6ac9548..a5f541fa43 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit f5f6ac954894ef66331db8fe383b9773feb69ef4 +Subproject commit a5f541fa4380cf430144fab04e42b32b033ff548 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d93ec16fc3..d1867f7c33 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -20,7 +20,7 @@ platform :android do before_all do |lane, options| FileUtils.cp("../app/src/main/assets/tangem-app-config/android/google-services.json", "../app") end - + desc "Runs all the tests" lane :test do gradle( @@ -44,11 +44,11 @@ platform :android do }) end - desc "Build debug and release APKs" + desc "Build internal and release APKs" lane :build do |options| gradle( task: "clean assemble", - build_type: "Debug_beta", + build_type: "Internal", properties: { 'versionCode' => options[:versionCode], 'versionName' => options[:versionName], diff --git a/fastlane/README.md b/fastlane/README.md index 4d1e079727..9df376cd1d 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -37,7 +37,7 @@ Build a signed release APK [bundle exec] fastlane android build ``` -Build debug and release APKs +Build internal and release APKs ### android beta