UPDATE: Minor upgrade of library dependencies.

oasisfeng · Sep 18, 2018 · dc87855 · dc87855
1 parent b2ff201
commit dc87855
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -35,8 +35,8 @@ dependencies {
     implementation project(':shared')
     implementation project(':deagle')
 
-    implementation 'android.arch.lifecycle:extensions:1.1.1'
-    implementation 'android.arch.lifecycle:viewmodel:1.1.1'
+    implementation 'android.arch.lifecycle:extensions:1.1.0'
+    implementation 'android.arch.lifecycle:viewmodel:1.1.0'
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:design:27.1.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'

diff --git a/assembly/build.gradle b/assembly/build.gradle
@@ -70,6 +70,8 @@ android {
 }
 
 dependencies {
+    implementation 'com.google.firebase:firebase-core:16.0.3'       // Required by Firebase
+
     // Engine only
     engineImplementation project(':engine')
     // Mobile only
@@ -82,7 +84,6 @@ dependencies {
     fullImplementation project(':fileprovider')
 
     implementation 'com.android.support:support-v4:27.1.1'          // To workaround the dependency conflict caused by "com.android.databinding:library"
-    implementation 'com.google.firebase:firebase-analytics:15.0.2'  // To workaround the dependency conflict caused by "com.google.gms.google-services"
 }
 
 // Firebase plug-in

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.0-rc03'
-        classpath 'com.google.gms:google-services:4.0.2'
+        classpath 'com.google.gms:google-services:4.1.0'
         classpath 'io.fabric.tools:gradle:1.25.4'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/shared/build.gradle b/shared/build.gradle
@@ -42,14 +42,15 @@ dependencies {
     api 'net.sourceforge.streamsupport:android-retrofuture:1.6.3'
     api 'com.android.support:support-annotations:27.1.1'
     implementation 'org.jetbrains:annotations:15.0'
-    implementation 'com.google.android.gms:play-services-analytics:15.0.2'
-    implementation 'com.google.firebase:firebase-analytics:15.0.2'
-    implementation 'com.google.firebase:firebase-config:15.0.2'
-    api 'com.crashlytics.sdk.android:crashlytics:2.9.4'
+    implementation 'com.google.android.gms:play-services-analytics:16.0.3'
+    implementation 'com.google.firebase:firebase-core:16.0.3'
+    implementation 'com.google.firebase:firebase-analytics:16.0.3'
+    implementation 'com.google.firebase:firebase-config:16.0.0'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
     implementation 'com.oasisfeng.condom:library:2.2.0'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.8.9'
+    testImplementation 'org.mockito:mockito-core:2.18.3'
 
     androidTestImplementation 'junit:junit:4.12'
     androidTestImplementation('com.android.support.test:runner:1.0.2') { exclude group: 'com.android.support', module: 'support-annotations' }