update components (#1153)

VinayGuthal · web-flow · commit 419c8fdd888d · 2020-01-24T15:15:00.000-05:00
* update components

* add abt

* remove basement dep

* gJF

* fix tests
diff --git a/firebase-abt/firebase-abt.gradle b/firebase-abt/firebase-abt.gradle
@@ -81,6 +81,7 @@ android {
 
 dependencies {
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
diff --git a/firebase-common/data-collection-tests/data-collection-tests.gradle b/firebase-common/data-collection-tests/data-collection-tests.gradle
@@ -42,6 +42,7 @@ android {
 
 dependencies {
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation 'androidx.test.ext:junit:1.1.1'
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
diff --git a/firebase-common/firebase-common.gradle b/firebase-common/firebase-common.gradle
@@ -62,7 +62,7 @@ android {
 
 dependencies {
     // TODO(vkryachko): have sdks depend on components directly once components are released.
-    api project(':firebase-components')
+    implementation project(':firebase-components')
     implementation 'com.google.android.gms:play-services-basement:17.0.0'
     implementation "com.google.android.gms:play-services-tasks:17.0.0"
 
diff --git a/firebase-common/ktx/ktx.gradle b/firebase-common/ktx/ktx.gradle
@@ -39,6 +39,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation 'androidx.annotation:annotation:1.1.0'
 
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
diff --git a/firebase-config/firebase-config.gradle b/firebase-config/firebase-config.gradle
@@ -84,7 +84,7 @@ android {
 dependencies {
     implementation project(':firebase-common')
     implementation project (':firebase-abt')
-
+    implementation project(':firebase-components')
     implementation ('com.google.firebase:firebase-iid:20.0.1') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
diff --git a/firebase-config/ktx/ktx.gradle b/firebase-config/ktx/ktx.gradle
@@ -45,6 +45,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation project(':firebase-common:ktx')
     implementation project(':firebase-config')
     implementation project (':firebase-abt')
diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
@@ -57,6 +57,7 @@ android {
 
 dependencies {
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation project(':firebase-crashlytics')
     implementation 'com.google.android.gms:play-services-basement:17.0.0'
 
diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle
@@ -51,6 +51,7 @@ android {
 
 dependencies {
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation ('com.google.firebase:firebase-iid:19.0.0') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
diff --git a/firebase-database/firebase-database.gradle b/firebase-database/firebase-database.gradle
@@ -72,6 +72,7 @@ android {
 dependencies {
     implementation project(':firebase-common')
     implementation project(':firebase-database-collection')
+    implementation project(':firebase-components')
 
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.android.gms:play-services-basement:17.0.0'
diff --git a/firebase-database/ktx/ktx.gradle b/firebase-database/ktx/ktx.gradle
@@ -45,6 +45,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation project(':firebase-common:ktx')
     implementation project(':firebase-database')
     implementation 'androidx.annotation:annotation:1.1.0'
diff --git a/firebase-datatransport/firebase-datatransport.gradle b/firebase-datatransport/firebase-datatransport.gradle
@@ -46,6 +46,7 @@ android {
 
 dependencies {
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation project(':transport:transport-api')
     implementation project(':transport:transport-runtime')
     implementation project(':transport:transport-backend-cct')
diff --git a/firebase-dynamic-links/firebase-dynamic-links.gradle b/firebase-dynamic-links/firebase-dynamic-links.gradle
@@ -49,6 +49,7 @@ android {
 
 dependencies {
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
 
     implementation 'androidx.annotation:annotation:1.1.0'
 
diff --git a/firebase-dynamic-links/ktx/ktx.gradle b/firebase-dynamic-links/ktx/ktx.gradle
@@ -45,6 +45,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation project(':firebase-common:ktx')
     implementation project(':firebase-dynamic-links')
     implementation 'androidx.annotation:annotation:1.1.0'
diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
@@ -117,6 +117,7 @@ dependencies {
     implementation project(':firebase-common')
     implementation project(':protolite-well-known-types')
     implementation project(':firebase-database-collection')
+    implementation project(':firebase-components')
 
 
     //To provide @Generated annotations
diff --git a/firebase-firestore/ktx/ktx.gradle b/firebase-firestore/ktx/ktx.gradle
@@ -47,6 +47,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation project(':firebase-common:ktx')
     implementation project(':firebase-firestore')
     implementation 'androidx.annotation:annotation:1.1.0'
diff --git a/firebase-functions/firebase-functions.gradle b/firebase-functions/firebase-functions.gradle
@@ -50,6 +50,7 @@ android {
 
 dependencies {
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation 'com.google.android.gms:play-services-basement:17.0.0'
     implementation 'com.google.android.gms:play-services-base:17.0.0'
     implementation 'com.google.android.gms:play-services-tasks:17.0.0'
diff --git a/firebase-functions/ktx/ktx.gradle b/firebase-functions/ktx/ktx.gradle
@@ -47,6 +47,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation project(':firebase-common:ktx')
     implementation project(':firebase-functions')
     implementation 'androidx.annotation:annotation:1.1.0'
diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
@@ -62,6 +62,7 @@ android {
 dependencies {
     implementation project(':firebase-common')
     implementation project(':firebase-inappmessaging')
+    implementation project(':firebase-components')
 
     implementation ('com.google.firebase:firebase-iid:20.0.1') {
         exclude group: "com.google.firebase", module: "firebase-common"
diff --git a/firebase-inappmessaging-display/ktx/ktx.gradle b/firebase-inappmessaging-display/ktx/ktx.gradle
@@ -45,6 +45,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation project(':firebase-common:ktx')
     implementation project(':firebase-inappmessaging')
     implementation project(':firebase-inappmessaging-display')
diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle
@@ -112,6 +112,7 @@ configurations.all {
 dependencies {
     implementation project(':firebase-abt')
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation project(':protolite-well-known-types')
     implementation project(':transport:transport-api')
     implementation project(':firebase-datatransport')
diff --git a/firebase-inappmessaging/ktx/ktx.gradle b/firebase-inappmessaging/ktx/ktx.gradle
@@ -47,6 +47,7 @@ dependencies {
     implementation project(':firebase-common')
     implementation project(':firebase-common:ktx')
     implementation project(':firebase-inappmessaging')
+    implementation project(':firebase-components')
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.android.gms:play-services-tasks:17.0.0'
 
diff --git a/firebase-installations/firebase-installations.gradle b/firebase-installations/firebase-installations.gradle
@@ -40,6 +40,7 @@ android {
 dependencies {
     implementation project(':firebase-common')
     implementation project(':firebase-installations-interop')
+    implementation project(':firebase-components')
 
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.multidex:multidex:2.0.1'
diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle
@@ -76,6 +76,7 @@ android {
 
 dependencies {
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
 
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'com.google.android.gms:play-services-base:17.0.0'
diff --git a/firebase-storage/ktx/ktx.gradle b/firebase-storage/ktx/ktx.gradle
@@ -46,6 +46,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
     implementation project(':firebase-common')
+    implementation project(':firebase-components')
     implementation project(':firebase-common:ktx')
     implementation project(':firebase-storage')
     implementation 'androidx.annotation:annotation:1.1.0'

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ android {`
`81`	`81`
`82`	`82`	`dependencies {`
`83`	`83`	`implementation project(':firebase-common')`
	`84`	`+ implementation project(':firebase-components')`
`84`	`85`	`implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {`
`85`	`86`	`exclude group: "com.google.firebase", module: "firebase-common"`
`86`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ android {`
`84`	`84`	`dependencies {`
`85`	`85`	`implementation project(':firebase-common')`
`86`	`86`	`implementation project (':firebase-abt')`
`87`		`-`
	`87`	`+ implementation project(':firebase-components')`
`88`	`88`	`implementation ('com.google.firebase:firebase-iid:20.0.1') {`
`89`	`89`	`exclude group: "com.google.firebase", module: "firebase-common"`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ android {`
`51`	`51`
`52`	`52`	`dependencies {`
`53`	`53`	`implementation project(':firebase-common')`
	`54`	`+ implementation project(':firebase-components')`
`54`	`55`	`implementation ('com.google.firebase:firebase-iid:19.0.0') {`
`55`	`56`	`exclude group: "com.google.firebase", module: "firebase-common"`
`56`	`57`	`}`