Fix proprietary libraries usage.

app/build.gradle

@@ -110,9 +110,6 @@ dependencies {
     kapt libraries.daggerProcessor
     kapt libraries.daggerAndroidApt
 
-    implementation libraries.fcm
-    implementation libraries.firebaseAnalytics
-    implementation libraries.playServicesAuth
     implementation libraries.flexbox
     implementation libraries.material
 
@@ -148,16 +145,12 @@ dependencies {
 
     implementation "com.github.luciofm:livedata-ktx:b1e8bbc25a"
 
+    // Proprietary libraries
     playImplementation libraries.fcm
+    playImplementation libraries.firebaseAnalytics
     playImplementation libraries.playServicesAuth
-
-    playImplementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
-        transitive = true
-    }
-
-    playImplementation('com.crashlytics.sdk.android:answers:1.4.2@aar') {
-        transitive = true
-    }
+    playImplementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') { transitive = true }
+    playImplementation('com.crashlytics.sdk.android:answers:1.4.2@aar') { transitive = true }
 
     testImplementation libraries.junit
     testImplementation libraries.truth

dependencies.gradle

@@ -75,9 +75,6 @@ ext {
             daggerSupport         : "com.google.dagger:dagger-android-support:${versions.dagger}",
             daggerProcessor       : "com.google.dagger:dagger-compiler:${versions.dagger}",
             daggerAndroidApt      : "com.google.dagger:dagger-android-processor:${versions.dagger}",
-            fcm                   : "com.google.firebase:firebase-messaging:${versions.firebaseCloudMessage}",
-            firebaseAnalytics     : "com.google.firebase:firebase-core:${versions.firebaseAnalytics}",
-            playServicesAuth      : "com.google.android.gms:play-services-auth:${versions.playServices}",
             exoPlayer             : "com.google.android.exoplayer:exoplayer:${versions.exoPlayer}",
             flexbox               : "com.google.android:flexbox:${versions.flexbox}",
             material              : "com.google.android.material:material:${versions.material}",
@@ -114,6 +111,11 @@ ext {
 
             aVLoadingIndicatorView: "com.wang.avi:library:${versions.aVLoadingIndicatorView}",
 
+            // Proprietary libraries
+            fcm                   : "com.google.firebase:firebase-messaging:${versions.firebaseCloudMessage}",
+            firebaseAnalytics     : "com.google.firebase:firebase-core:${versions.firebaseAnalytics}",
+            playServicesAuth      : "com.google.android.gms:play-services-auth:${versions.playServices}",
+
             // For wearable
             wearable              : "com.google.android.support:wearable:${versions.wear}",
             playServicesWearable  : "com.google.android.gms:play-services-wearable:${versions.playServicesWearable}",

util/build.gradle

@@ -56,6 +56,7 @@ dependencies {
     implementation libraries.lifecycleExtensions
     kapt libraries.lifecycleCompiler
 
+    // Proprietary libraries
     playImplementation('com.crashlytics.sdk.android:answers:1.4.2@aar') {
         transitive = true
     }