@@ -36,7 +36,7 @@ android {
 }
 
 dependencies {
-    implementation "com.google.firebase:firebase-core:$firebaseVersion"
+    implementation "com.google.firebase:firebase-core:$coreVersion"
     implementation "com.android.support:design:$supportLibraryVersion"
     implementation 'com.android.support:multidex:1.0.3'
 
 
@@ -36,13 +36,13 @@ android {
 dependencies {
     implementation "com.android.support:design:$supportLibraryVersion"
     implementation "com.android.support:customtabs:$supportLibraryVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta6'
+    implementation "com.android.support.constraint:constraint-layout:$constraintVersion"
 
     implementation "android.arch.lifecycle:extensions:$architectureVersion"
     annotationProcessor "android.arch.lifecycle:compiler:$architectureVersion"
 
-    api "com.google.firebase:firebase-auth:$firebaseVersion"
-    api "com.google.android.gms:play-services-auth:$firebaseVersion"
+    api "com.google.firebase:firebase-auth:$authVersion"
+    api "com.google.android.gms:play-services-auth:$playAuthVersion"
 
     compileOnly 'com.facebook.android:facebook-login:4.32.0'
     // Needed to override Facebook
 
@@ -8,9 +8,16 @@ project.ext {
     targetSdk = 27
     minSdk = 14
 
-    firebaseVersion = '15.0.0'
+    coreVersion = '15.0.2'          // firebase-core
+    authVersion = '15.1.0'          // firebase-auth
+    playAuthVersion = '15.0.1'      // play-services-auth
+    rtdbVersion = '15.0.1'          // firebase-database
+    firestoreVersion = '15.0.0'     // firebase-firestore
+    storageVersion = '15.0.2'       // firebase-storage
+
     supportLibraryVersion = '27.1.1'
     architectureVersion = '1.1.1'
     kotlinVersion = '1.2.40'
     pagingVersion = '1.0.0-beta1'
+    constraintVersion = '1.1.0'
 }
@@ -16,7 +16,7 @@ android {
 
 dependencies {
     api project(path: ':common')
-    api "com.google.firebase:firebase-database:$firebaseVersion"
+    api "com.google.firebase:firebase-database:$rtdbVersion"
 
     api "com.android.support:support-v4:$supportLibraryVersion"
     api "com.android.support:recyclerview-v7:$supportLibraryVersion"
 
@@ -24,7 +24,7 @@ android {
 
 dependencies {
     api project(path: ':common')
-    api "com.google.firebase:firebase-firestore:$firebaseVersion"
+    api "com.google.firebase:firebase-firestore:$firestoreVersion"
 
     api "com.android.support:support-v4:$supportLibraryVersion"
     api "com.android.support:recyclerview-v7:$supportLibraryVersion"
 
@@ -28,7 +28,7 @@ android {
 }
 
 dependencies {
-    implementation "com.google.firebase:firebase-core:$firebaseVersion"
+    implementation "com.google.firebase:firebase-core:$firestoreVersion"
     implementation "android.arch.lifecycle:extensions:$architectureVersion"
 
     implementation project(path: ':auth')
 
@@ -15,7 +15,7 @@ android {
 dependencies {
     api 'com.github.bumptech.glide:glide:4.7.1'
 
-    api "com.google.firebase:firebase-storage:$firebaseVersion"
+    api "com.google.firebase:firebase-storage:$storageVersion"
     // Override Play Services
     implementation "com.android.support:support-v4:$supportLibraryVersion"
 }
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ android {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`dependencies {`
`39`		`- implementation "com.google.firebase:firebase-core:$firebaseVersion"`
	`39`	`+ implementation "com.google.firebase:firebase-core:$coreVersion"`
`40`	`40`	`implementation "com.android.support:design:$supportLibraryVersion"`
`41`	`41`	`implementation 'com.android.support:multidex:1.0.3'`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ android {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`dependencies {`
`31`		`- implementation "com.google.firebase:firebase-core:$firebaseVersion"`
	`31`	`+ implementation "com.google.firebase:firebase-core:$firestoreVersion"`
`32`	`32`	`implementation "android.arch.lifecycle:extensions:$architectureVersion"`
`33`	`33`
`34`	`34`	`implementation project(path: ':auth')`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ android {`
`15`	`15`	`dependencies {`
`16`	`16`	`api 'com.github.bumptech.glide:glide:4.7.1'`
`17`	`17`
`18`		`- api "com.google.firebase:firebase-storage:$firebaseVersion"`
	`18`	`+ api "com.google.firebase:firebase-storage:$storageVersion"`
`19`	`19`	`// Override Play Services`
`20`	`20`	`implementation "com.android.support:support-v4:$supportLibraryVersion"`
`21`	`21`	`}`