diff --git a/app/build.gradle b/app/build.gradle index 644611c5..70c10507 100644 --- 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 index c39da8c4..6212ffdb 100644 --- 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 index e2c5ae5d..79b2f04e 100644 --- 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 = diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 51f7a007..d22cc6a7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,6 +36,9 @@ + \ No newline at end of file diff --git a/app/src/main/kotlin/com/k0d4black/theforce/features/character_details/CharacterDetailActivity.kt b/app/src/main/kotlin/com/k0d4black/theforce/features/character_details/CharacterDetailActivity.kt index 99179916..786bea56 100644 --- a/app/src/main/kotlin/com/k0d4black/theforce/features/character_details/CharacterDetailActivity.kt +++ b/app/src/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 index c3bed3e9..60a9eedf 100644 --- 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