From 8b96ec88464f61f368c930387b9c0cf1c4da2e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Fri, 22 Nov 2019 12:18:14 +0300 Subject: [PATCH] [android] Fixed google play services/firebase depedencies conflict --- android/build.gradle | 5 ++++- android/gradle.properties | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 1df54fdf41..54b6798a72 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -99,7 +99,7 @@ dependencies { implementation 'com.firebase:firebase-jobdispatcher:0.8.5' implementation 'com.google.android:flexbox:1.0.0' implementation 'com.trafi:anchor-bottom-sheet-behavior:0.13-alpha' - implementation 'com.google.firebase:firebase-messaging:11.8.0' + implementation 'com.google.firebase:firebase-messaging:17.0.0' } def getDate() { @@ -144,6 +144,8 @@ configurations.all { force 'com.google.android.gms:play-services-auth:17.0.0' force 'com.google.android.gms:play-services-basement:17.1.1' force 'com.google.android.gms:play-services-base:17.0.0' + force 'com.google.android.gms:play-services-tasks:17.0.0' + force 'com.google.android.gms:play-services-stats:17.0.0' force 'android.arch.core:runtime:1.1.1' force 'android.arch.core:common:1.1.1' @@ -156,6 +158,7 @@ configurations.all { force 'androidx.lifecycle:lifecycle-livedata-core:2.0.0-rc01' force "org.jetbrains.kotlin:kotlin-stdlib:1.3.31" force "com.google.code.gson:gson:2.8.5" + failOnVersionConflict(); } } diff --git a/android/gradle.properties b/android/gradle.properties index 15b4fad4f6..f9e6cadda3 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -7,7 +7,6 @@ propVersionName=9.5.0 propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1 propSupportLibraryVersion=27.1.1 -propPlayServicesVersion=11.8.0 propMultiDexVersion=1.0.3 # list of files for obb-s