remove common dependencies

winay39 · winay39 · commit 4a59ba27e027 · 2024-04-15T11:51:02.000-04:00
diff --git a/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle b/appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle
@@ -52,7 +52,6 @@ dependencies {
     api project(':appcheck:firebase-appcheck-debug')
     api 'com.google.firebase:firebase-appcheck-interop:17.0.0'
     api 'com.google.firebase:firebase-common:20.4.2'
-    api 'com.google.firebase:firebase-common-ktx:20.4.2'
     api 'com.google.firebase:firebase-components:17.1.5'
 
     implementation "androidx.test:core:$androidxTestCoreVersion"
diff --git a/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle b/appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle
@@ -48,7 +48,6 @@ dependencies {
     api project(':appcheck:firebase-appcheck')
     api 'com.google.firebase:firebase-annotations:16.2.0'
     api 'com.google.firebase:firebase-common:20.4.2'
-    api 'com.google.firebase:firebase-common-ktx:20.4.2'
     api 'com.google.firebase:firebase-components:17.1.5'
 
     implementation 'com.google.android.gms:play-services-base:18.0.1'
diff --git a/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle b/appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle
@@ -48,7 +48,6 @@ dependencies {
     api project(':appcheck:firebase-appcheck')
     api 'com.google.firebase:firebase-annotations:16.2.0'
     api 'com.google.firebase:firebase-common:20.4.2'
-    api 'com.google.firebase:firebase-common-ktx:20.4.2'
     api 'com.google.firebase:firebase-components:17.1.5'
 
     implementation 'com.google.android.gms:play-services-base:18.0.1'
diff --git a/appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle b/appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle
@@ -48,7 +48,6 @@ dependencies {
     api project(':appcheck:firebase-appcheck')
     api 'com.google.firebase:firebase-annotations:16.2.0'
     api 'com.google.firebase:firebase-common:20.4.2'
-    api 'com.google.firebase:firebase-common-ktx:20.4.2'
     api 'com.google.firebase:firebase-components:17.1.5'
 
     implementation 'com.google.android.gms:play-services-base:18.0.1'
diff --git a/appcheck/firebase-appcheck/firebase-appcheck.gradle b/appcheck/firebase-appcheck/firebase-appcheck.gradle
@@ -51,7 +51,6 @@ dependencies {
     api 'com.google.firebase:firebase-annotations:16.2.0'
     api "com.google.firebase:firebase-appcheck-interop:17.1.0"
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
 
     implementation 'androidx.annotation:annotation:1.1.0'
diff --git a/firebase-appdistribution-api/firebase-appdistribution-api.gradle b/firebase-appdistribution-api/firebase-appdistribution-api.gradle
@@ -46,7 +46,6 @@ android {
 dependencies {
     api 'com.google.android.gms:play-services-tasks:18.0.1'
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
 
     implementation 'androidx.annotation:annotation:1.1.0'
diff --git a/firebase-appdistribution/test-app/test-app.gradle b/firebase-appdistribution/test-app/test-app.gradle
@@ -85,7 +85,6 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:1.5.3"
     implementation "com.google.android.gms:play-services-tasks:18.0.2"
     implementation 'com.google.android.material:material:1.6.1'
-    implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
     // Shake detection
     implementation 'com.squareup:seismic:1.0.3'
     // Other dependencies
diff --git a/firebase-config/bandwagoner/bandwagoner.gradle b/firebase-config/bandwagoner/bandwagoner.gradle
@@ -71,10 +71,6 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'
     }
-    implementation(project(":firebase-config:ktx")) {
-        exclude group: 'com.google.firebase', module: 'firebase-common'
-        exclude group: 'com.google.firebase', module: 'firebase-components'
-    }
     implementation(project(":firebase-installations")) {
         exclude group: 'com.google.firebase', module: 'firebase-common'
         exclude group: 'com.google.firebase', module: 'firebase-components'
@@ -92,7 +88,6 @@ dependencies {
     // Released artifacts don't need these dependencies since they don't use `project` to refer
     // to Remote Config.
     implementation("com.google.firebase:firebase-common:20.4.2")
-    implementation("com.google.firebase:firebase-common-ktx:20.4.2")
     implementation("com.google.firebase:firebase-components:17.1.5")
     implementation("com.google.firebase:firebase-installations-interop:17.1.1") {
         exclude group: 'com.google.firebase', module: 'firebase-common'
diff --git a/firebase-config/firebase-config.gradle.kts b/firebase-config/firebase-config.gradle.kts
@@ -65,7 +65,6 @@ dependencies {
          exclude(group = "com.google.firebase", module = "firebase-components")
      }
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
     api("com.google.firebase:firebase-installations:17.2.0")
 
diff --git a/firebase-config/test-app/test-app.gradle.kts b/firebase-config/test-app/test-app.gradle.kts
@@ -52,14 +52,12 @@ dependencies {
   implementation(project(":firebase-config")) {
     exclude(group = "com.google.firebase", module = "firebase-config-interop")
   }
-  implementation(project(":firebase-config:ktx"))
 
   // This is required since a `project` dependency on frc does not expose the APIs of its
   // "implementation" dependencies. The alternative would be to make common an "api" dep of remote-config.
   // Released artifacts don't need these dependencies since they don't use `project` to refer
   // to Remote Config.
   implementation("com.google.firebase:firebase-common:20.3.3")
-  implementation("com.google.firebase:firebase-common-ktx:20.3.3")
   implementation("com.google.firebase:firebase-components:17.1.1")
 
   implementation("com.google.firebase:firebase-installations-interop:17.1.0")
@@ -74,7 +72,6 @@ dependencies {
   implementation("androidx.core:core-ktx:1.9.0")
   implementation("com.google.android.material:material:1.8.0")
 
-  androidTestImplementation("com.google.firebase:firebase-common-ktx:20.3.2")
   androidTestImplementation(libs.androidx.test.junit)
   androidTestImplementation(libs.androidx.test.runner)
   androidTestImplementation(libs.truth)
diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
@@ -107,7 +107,6 @@ thirdPartyLicenses {
 dependencies {
     api project(':firebase-crashlytics')
     api "com.google.firebase:firebase-common:20.4.2"
-    api "com.google.firebase:firebase-common-ktx:20.4.2"
     api "com.google.firebase:firebase-components:17.1.5"
 
     implementation 'com.google.android.gms:play-services-basement:18.1.0'
diff --git a/firebase-crashlytics/firebase-crashlytics.gradle b/firebase-crashlytics/firebase-crashlytics.gradle
@@ -65,7 +65,6 @@ dependencies {
     api "com.google.android.gms:play-services-tasks:18.0.1"
     api 'com.google.firebase:firebase-annotations:16.2.0'
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
     api 'com.google.firebase:firebase-config-interop:16.0.0'
     api 'com.google.firebase:firebase-encoders:17.0.0'
diff --git a/firebase-database/firebase-database.gradle.kts b/firebase-database/firebase-database.gradle.kts
@@ -57,7 +57,6 @@ android {
 dependencies {
     api("com.google.firebase:firebase-appcheck-interop:17.1.0")
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
     api("com.google.firebase:firebase-auth-interop:20.0.0") {
      exclude(group = "com.google.firebase", module = "firebase-common")
diff --git a/firebase-dynamic-links/firebase-dynamic-links.gradle b/firebase-dynamic-links/firebase-dynamic-links.gradle
@@ -60,7 +60,6 @@ dependencies {
          exclude group: "com.google.firebase", module: "firebase-common"
      }
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
     api('com.google.firebase:firebase-measurement-connector:19.0.0') {
          exclude group: 'com.google.firebase', module: 'firebase-common'
diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
@@ -128,7 +128,6 @@ dependencies {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
     api(project(":firebase-common"))
-    api("com.google.firebase:firebase-common-ktx:20.4.2") {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
     api("com.google.firebase:firebase-components:17.1.5") {
diff --git a/firebase-functions/firebase-functions.gradle.kts b/firebase-functions/firebase-functions.gradle.kts
@@ -52,7 +52,6 @@ dependencies {
 
     api("com.google.firebase:firebase-appcheck-interop:17.1.0")
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
     api("com.google.firebase:firebase-annotations:16.2.0")
     api("com.google.firebase:firebase-auth-interop:18.0.0") {
diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle
@@ -84,7 +84,6 @@ dependencies {
 
     api(project(":firebase-inappmessaging"))
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
 
     implementation 'androidx.annotation:annotation:1.1.0'
diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle
@@ -113,7 +113,6 @@ dependencies {
          exclude group: 'com.google.firebase', module: 'firebase-components'
      }
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
     api("com.google.firebase:firebase-datatransport:18.2.0"){
          exclude group: 'com.google.firebase', module: 'firebase-common'
diff --git a/firebase-installations/firebase-installations.gradle b/firebase-installations/firebase-installations.gradle
@@ -49,7 +49,6 @@ dependencies {
     api 'com.google.android.gms:play-services-tasks:18.0.1'
     api 'com.google.firebase:firebase-annotations:16.2.0'
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
     api 'com.google.firebase:firebase-installations-interop:17.1.0'
     api("com.google.firebase:firebase-installations-interop:17.1.1")
diff --git a/firebase-messaging/firebase-messaging.gradle b/firebase-messaging/firebase-messaging.gradle
@@ -82,7 +82,6 @@ dependencies {
         javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
 
         api("com.google.firebase:firebase-common:20.4.2")
-        api("com.google.firebase:firebase-common-ktx:20.4.2")
         api("com.google.firebase:firebase-components:17.1.5")
         api('com.google.firebase:firebase-datatransport:18.1.7') {
          exclude group: 'com.google.firebase', module: 'firebase-common'
diff --git a/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle b/firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle
@@ -79,7 +79,6 @@ dependencies {
     api 'com.google.android.gms:play-services-tasks:18.0.1'
     api 'com.google.firebase:firebase-annotations:16.2.0'
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
     api('com.google.firebase:firebase-datatransport:18.2.0'){
          exclude group: 'com.google.firebase', module: 'firebase-common'
diff --git a/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle b/firebase-ml-modeldownloader/ml-data-collection-tests/ml-data-collection-tests.gradle
@@ -45,7 +45,6 @@ dependencies {
     implementation project(':firebase-ml-modeldownloader')
     implementation 'androidx.core:core:1.2.0'
     implementation 'com.google.firebase:firebase-common:20.4.2'
-    implementation 'com.google.firebase:firebase-common-ktx:20.4.2'
 
     testImplementation 'androidx.test:runner:1.2.0'
     testImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
diff --git a/firebase-perf/dev-app/dev-app.gradle b/firebase-perf/dev-app/dev-app.gradle
@@ -85,7 +85,6 @@ dependencies {
         println("Building with HEAD version ':firebase-perf' of SDK")
         implementation project(":firebase-perf")
         implementation "com.google.firebase:firebase-common:20.4.2"
-        implementation "com.google.firebase:firebase-common-ktx:20.4.2"
         implementation project(":firebase-config")
 
     } else {
diff --git a/firebase-perf/firebase-perf.gradle b/firebase-perf/firebase-perf.gradle
@@ -110,7 +110,6 @@ dependencies {
     api 'com.google.firebase:protolite-well-known-types:18.0.0'
     implementation 'com.squareup.okhttp3:okhttp:3.12.1'
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
     api("com.google.firebase:firebase-config:21.5.0")
     api("com.google.firebase:firebase-installations:17.2.0")
diff --git a/firebase-sessions/firebase-sessions.gradle.kts b/firebase-sessions/firebase-sessions.gradle.kts
@@ -52,7 +52,6 @@ android {
 
 dependencies {
   api("com.google.firebase:firebase-common:20.4.2")
-  api("com.google.firebase:firebase-common-ktx:20.4.2")
 
   api("com.google.firebase:firebase-components:17.1.5")
   api("com.google.firebase:firebase-installations-interop:17.1.1") {
diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle
@@ -94,7 +94,6 @@ dependencies {
          exclude group: "com.google.firebase", module: "firebase-annotations"
      }
     api("com.google.firebase:firebase-common:20.4.2")
-    api("com.google.firebase:firebase-common-ktx:20.4.2")
     api("com.google.firebase:firebase-components:17.1.5")
 
     implementation 'androidx.annotation:annotation:1.1.0'
diff --git a/integ-testing/integ-testing.gradle.kts b/integ-testing/integ-testing.gradle.kts
@@ -36,7 +36,6 @@ android {
 }
 
 dependencies {
-  implementation("com.google.firebase:firebase-common-ktx:20.4.2")
   implementation("com.google.firebase:firebase-common:20.4.2")
   implementation("com.google.firebase:firebase-components:17.1.5")
   implementation(libs.androidx.test.runner)
diff --git a/sdkProperties.gradle b/sdkProperties.gradle
@@ -1,18 +0,0 @@
-// Copyright 2018 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-ext {
-    targetSdkVersion = 33
-    minSdkVersion = 14
-}

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ dependencies {`
`65`	`65`	`exclude(group = "com.google.firebase", module = "firebase-components")`
`66`	`66`	`}`
`67`	`67`	`api("com.google.firebase:firebase-common:20.4.2")`
`68`		`- api("com.google.firebase:firebase-common-ktx:20.4.2")`
`69`	`68`	`api("com.google.firebase:firebase-components:17.1.5")`
`70`	`69`	`api("com.google.firebase:firebase-installations:17.2.0")`
`71`	`70`