From adcabd2ac2567e90427672d3a61d9176bdaf6bd7 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 5 Aug 2019 13:12:52 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 8 ++++++++ app/src/debug/res/values/strings.xml | 1 + app/src/debug_beta/AndroidManifest.xml | 19 +++++++++++++++++++ app/src/debug_beta/res/values/strings.xml | 6 ++++++ app/src/main/java/com/tangem/App.kt | 2 +- card-android/build.gradle | 4 ++++ fastlane/Fastfile | 6 ++++-- server-android/build.gradle | 4 ++++ 8 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 app/src/debug_beta/AndroidManifest.xml create mode 100644 app/src/debug_beta/res/values/strings.xml diff --git a/app/build.gradle b/app/build.gradle index 142141a21b..34923e0ccb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,12 +30,20 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.debug + buildConfigField 'boolean', 'CRASHLYTICS', 'Boolean.parseBoolean("false")' } debug { debuggable true minifyEnabled false applicationIdSuffix ".debug" signingConfig signingConfigs.debug + buildConfigField 'boolean', 'CRASHLYTICS', 'Boolean.parseBoolean("false")' + } + debug_beta { + initWith debug + versionNameSuffix "-beta" + applicationIdSuffix ".debug_beta" + buildConfigField 'boolean', 'CRASHLYTICS', 'Boolean.parseBoolean("true")' } } flavorDimensions "" diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml index 9ef8838437..1c13a1dbc0 100644 --- a/app/src/debug/res/values/strings.xml +++ b/app/src/debug/res/values/strings.xml @@ -2,5 +2,6 @@ DEBUG + com.tangem.debug.data.LogFileProvider \ No newline at end of file diff --git a/app/src/debug_beta/AndroidManifest.xml b/app/src/debug_beta/AndroidManifest.xml new file mode 100644 index 0000000000..8cf74b318f --- /dev/null +++ b/app/src/debug_beta/AndroidManifest.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/debug_beta/res/values/strings.xml b/app/src/debug_beta/res/values/strings.xml new file mode 100644 index 0000000000..dd8d1b1737 --- /dev/null +++ b/app/src/debug_beta/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + TangemBeta + + \ No newline at end of file diff --git a/app/src/main/java/com/tangem/App.kt b/app/src/main/java/com/tangem/App.kt index ad15a42e6a..84e791d4ae 100644 --- a/app/src/main/java/com/tangem/App.kt +++ b/app/src/main/java/com/tangem/App.kt @@ -60,7 +60,6 @@ class App : Application() { pendingTransactionsStorage = PendingTransactionsStorage(applicationContext) if (BuildConfig.DEBUG) { - Fabric.with(this, Crashlytics()) com.tangem.card_common.util.Log.setLogger( object : com.tangem.card_common.util.LoggerInterface { override fun i(logTag: String, message: String) { @@ -76,6 +75,7 @@ class App : Application() { } } ) + if (BuildConfig.CRASHLYTICS) Fabric.with(this, Crashlytics()) } } diff --git a/card-android/build.gradle b/card-android/build.gradle index 956d0c88fe..1dc0028332 100644 --- a/card-android/build.gradle +++ b/card-android/build.gradle @@ -20,6 +20,10 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug_beta { + initWith debug + versionNameSuffix "-beta" + } } buildToolsVersion '28.0.3' diff --git a/fastlane/Fastfile b/fastlane/Fastfile index a523c2401f..1c50dd2892 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -40,10 +40,12 @@ platform :android do desc "Build debug and release APKs" lane :build do |options| + gradle( task: "clean assemble", flavor: "tangemAccess", - build_type: "Debug") + build_type: "Debug_beta") + gradle( task: "assemble", flavor: "tangemAccess", @@ -60,7 +62,7 @@ platform :android do lane :debug do gradle(task: "clean assemble", flavor: "tangemAccess", - build_type: "Debug") + build_type: "Debug_beta") end desc "Submit a new Beta Build to Crashlytics Beta" diff --git a/server-android/build.gradle b/server-android/build.gradle index 7aaa4af308..c6e7c5bfed 100644 --- a/server-android/build.gradle +++ b/server-android/build.gradle @@ -20,6 +20,10 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug_beta { + initWith debug + versionNameSuffix "-beta" + } } productFlavors { }