Skip to content

Commit 5505e7b

Browse files
authored
Merge pull request #85 from odaridavid/disable-crashlytics-debug
Disable crashlytics on debug
2 parents 0e4a8e8 + 2d64b38 commit 5505e7b

File tree

6 files changed

+46
-4
lines changed

6 files changed

+46
-4
lines changed

app/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ android {
4141
release {
4242
minifyEnabled false
4343
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
44+
manifestPlaceholders = [crashlyticsEnabled: true]
4445
}
4546
debug {
47+
applicationIdSuffix ".debug"
48+
versionNameSuffix "-debug"
49+
manifestPlaceholders = [crashlyticsEnabled: false]
4650
testCoverageEnabled true
4751
}
4852
}

app/google-services.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,43 @@
1313
"package_name": "com.k0d4black.theforce"
1414
}
1515
},
16+
"oauth_client": [
17+
{
18+
"client_id": "564324081859-pp0b62lk19reni5p538ckse2dr6dr3li.apps.googleusercontent.com",
19+
"client_type": 1,
20+
"android_info": {
21+
"package_name": "com.k0d4black.theforce",
22+
"certificate_hash": "113cb837d7d15580c33a4d642ff301877a14b840"
23+
}
24+
},
25+
{
26+
"client_id": "564324081859-4udbte4ljtq9upkgevouj8rf32albjbr.apps.googleusercontent.com",
27+
"client_type": 3
28+
}
29+
],
30+
"api_key": [
31+
{
32+
"current_key": "AIzaSyCkLJkxrsNwL0pbQvhrBsDe6H8_DCKDQww"
33+
}
34+
],
35+
"services": {
36+
"appinvite_service": {
37+
"other_platform_oauth_client": [
38+
{
39+
"client_id": "564324081859-4udbte4ljtq9upkgevouj8rf32albjbr.apps.googleusercontent.com",
40+
"client_type": 3
41+
}
42+
]
43+
}
44+
}
45+
},
46+
{
47+
"client_info": {
48+
"mobilesdk_app_id": "1:564324081859:android:cc3edad1da49d75c2c0276",
49+
"android_client_info": {
50+
"package_name": "com.k0d4black.theforce.debug"
51+
}
52+
},
1653
"oauth_client": [
1754
{
1855
"client_id": "564324081859-4udbte4ljtq9upkgevouj8rf32albjbr.apps.googleusercontent.com",

app/src/androidTest/kotlin/com/k0d4black/theforce/SearchActivityIntegrationTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import org.junit.runner.RunWith
2929

3030
@RunWith(AndroidJUnit4::class)
3131
internal class SearchActivityIntegrationTest : BaseTest() {
32-
//TODO Use idling resource
3332

3433
@get:Rule
3534
var activityRule: ActivityTestRule<SearchActivity> =

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
<meta-data
3737
android:name="preloaded_fonts"
3838
android:resource="@array/preloaded_fonts" />
39+
<meta-data
40+
android:name="firebase_crashlytics_collection_enabled"
41+
android:value="${crashlyticsEnabled}" />
3942
</application>
4043

4144
</manifest>

app/src/main/kotlin/com/k0d4black/theforce/features/character_details/CharacterDetailActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import com.k0d4black.theforce.models.CharacterPresentation
1313
import kotlinx.android.synthetic.main.activity_character_detail.*
1414
import org.koin.androidx.viewmodel.ext.android.viewModel
1515

16-
//TODO Add Swipe to refresh for error scenarios
1716
//TODO Set Intent Data to be part of the view state
1817
class CharacterDetailActivity : AppCompatActivity() {
1918

dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ ext {
77

88
//App Versioning
99
versionCodeMajor = 1
10-
versionCodeMinor = 0
11-
versionCodePatch = 3
10+
versionCodeMinor = 1
11+
versionCodePatch = 0
1212
versionName = "$versionCodeMajor.$versionCodeMinor.$versionCodePatch"
1313

1414
//Dependencies Version - Presentation

0 commit comments

Comments
 (0)