Merge pull request #85 from odaridavid/disable-crashlytics-debug

Disable crashlytics on debug
odaridavid · May 26, 2020 · 5505e7b · 5505e7b
2 parents 0e4a8e8 + 2d64b38
commit 5505e7b
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -41,8 +41,12 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            manifestPlaceholders = [crashlyticsEnabled: true]
         }
         debug {
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
+            manifestPlaceholders = [crashlyticsEnabled: false]
             testCoverageEnabled true
         }
     }

diff --git a/app/google-services.json b/app/google-services.json
@@ -13,6 +13,43 @@
           "package_name": "com.k0d4black.theforce"
         }
       },
+      "oauth_client": [
+        {
+          "client_id": "564324081859-pp0b62lk19reni5p538ckse2dr6dr3li.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.k0d4black.theforce",
+            "certificate_hash": "113cb837d7d15580c33a4d642ff301877a14b840"
+          }
+        },
+        {
+          "client_id": "564324081859-4udbte4ljtq9upkgevouj8rf32albjbr.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCkLJkxrsNwL0pbQvhrBsDe6H8_DCKDQww"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "564324081859-4udbte4ljtq9upkgevouj8rf32albjbr.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:564324081859:android:cc3edad1da49d75c2c0276",
+        "android_client_info": {
+          "package_name": "com.k0d4black.theforce.debug"
+        }
+      },
       "oauth_client": [
         {
           "client_id": "564324081859-4udbte4ljtq9upkgevouj8rf32albjbr.apps.googleusercontent.com",

diff --git a/app/src/androidTest/kotlin/com/k0d4black/theforce/SearchActivityIntegrationTest.kt b/app/src/androidTest/kotlin/com/k0d4black/theforce/SearchActivityIntegrationTest.kt
@@ -29,7 +29,6 @@ import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 internal class SearchActivityIntegrationTest : BaseTest() {
-    //TODO Use idling resource
 
     @get:Rule
     var activityRule: ActivityTestRule<SearchActivity> =

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -36,6 +36,9 @@
         <meta-data
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />
+        <meta-data
+            android:name="firebase_crashlytics_collection_enabled"
+            android:value="${crashlyticsEnabled}" />
     </application>
 
 </manifest>
diff --git a/.../main/kotlin/com/k0d4black/theforce/features/character_details/CharacterDetailActivity.kt b/.../main/kotlin/com/k0d4black/theforce/features/character_details/CharacterDetailActivity.kt
@@ -13,7 +13,6 @@ import com.k0d4black.theforce.models.CharacterPresentation
 import kotlinx.android.synthetic.main.activity_character_detail.*
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-//TODO Add Swipe to refresh for error scenarios
 //TODO Set Intent Data to be part of the view state
 class CharacterDetailActivity : AppCompatActivity() {
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -7,8 +7,8 @@ ext {
 
     //App Versioning
     versionCodeMajor = 1
-    versionCodeMinor = 0
-    versionCodePatch = 3
+    versionCodeMinor = 1
+    versionCodePatch = 0
     versionName = "$versionCodeMajor.$versionCodeMinor.$versionCodePatch"
 
     //Dependencies Version - Presentation