forked from organicmaps/organicmaps
[android] Fixed google play services/firebase depedencies conflict
This commit is contained in:
parent
d9d00406e7
commit
8b96ec8846
2 changed files with 4 additions and 2 deletions
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue