Skip to content

Commit 1709cd0

Browse files
authored
[Infra] Temporarily move some dependencies to project level (#7144)
To ensure that the next release does not contain projects that depend on an older artifact that still pulls any of the ktx artifacts, some of the inter-sdk dependencies need to be moved to project level. This change should be reverted once all new artifacts are released.
1 parent 2c834ef commit 1709cd0

File tree

11 files changed

+31
-11
lines changed

11 files changed

+31
-11
lines changed

firebase-appdistribution/firebase-appdistribution.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dependencies {
6161
exclude group: "javax.inject", module: "javax.inject"
6262
}
6363

64-
api("com.google.firebase:firebase-appdistribution-api:16.0.0-beta11") {
64+
api(project(":firebase-appdistribution-api")) {
6565
exclude group: 'com.google.firebase', module: 'firebase-common'
6666
exclude group: 'com.google.firebase', module: 'firebase-components'
6767
}
@@ -81,8 +81,9 @@ dependencies {
8181

8282
compileOnly libs.autovalue.annotations
8383

84-
runtimeOnly('com.google.firebase:firebase-installations:17.1.3') {
84+
runtimeOnly('com.google.firebase:firebase-installations:18.0.0') {
8585
exclude group: 'com.google.firebase', module: 'firebase-common'
86+
exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
8687
exclude group: 'com.google.firebase', module: 'firebase-components'
8788
}
8889

firebase-config/bandwagoner/bandwagoner.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ dependencies {
7777
}
7878
implementation(project(":firebase-installations")) {
7979
exclude group: 'com.google.firebase', module: 'firebase-common'
80+
exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
8081
exclude group: 'com.google.firebase', module: 'firebase-components'
8182
}
8283
implementation libs.androidx.annotation

firebase-config/firebase-config.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ dependencies {
7373
}
7474
api("com.google.firebase:firebase-common:22.0.0")
7575
api("com.google.firebase:firebase-components:19.0.0")
76-
api("com.google.firebase:firebase-installations:17.2.0")
76+
api("com.google.firebase:firebase-installations:18.0.0") {
77+
exclude(group = "com.google.firebase", module = "firebase-common-ktx")
78+
}
7779

7880
// Kotlin & Android
7981
implementation(libs.kotlin.stdlib)

firebase-config/test-app/test-app.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ dependencies {
6565
implementation("com.google.firebase:firebase-components:19.0.0")
6666

6767
implementation("com.google.firebase:firebase-installations-interop:17.1.0")
68-
runtimeOnly("com.google.firebase:firebase-installations:17.1.4")
68+
runtimeOnly("com.google.firebase:firebase-installations:18.0.0") {
69+
exclude(group = "com.google.firebase", module = "firebase-common-ktx")
70+
}
6971

7072
implementation("com.google.android.gms:play-services-basement:18.1.0")
7173
implementation("com.google.android.gms:play-services-tasks:18.0.1")

firebase-crashlytics/firebase-crashlytics.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ dependencies {
7676
api("com.google.firebase:firebase-config-interop:16.0.1")
7777
api("com.google.firebase:firebase-encoders:17.0.0")
7878
api("com.google.firebase:firebase-encoders-json:18.0.1")
79-
api("com.google.firebase:firebase-installations:18.0.0")
79+
api("com.google.firebase:firebase-installations:18.0.0") {
80+
exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
81+
}
8082
api("com.google.firebase:firebase-installations-interop:17.2.0")
8183
api("com.google.firebase:firebase-measurement-connector:20.0.1")
8284

firebase-inappmessaging/firebase-inappmessaging.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ dependencies {
123123
exclude group: 'com.google.firebase', module: 'firebase-common'
124124
exclude group: 'com.google.firebase', module: 'firebase-components'
125125
}
126-
api("com.google.firebase:firebase-installations:17.2.0")
126+
api("com.google.firebase:firebase-installations:18.0.0") {
127+
exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
128+
}
127129
api 'com.google.firebase:firebase-installations-interop:17.1.0'
128130
api('com.google.firebase:firebase-measurement-connector:18.0.2') {
129131
exclude group: 'com.google.firebase', module: 'firebase-common'

firebase-messaging/firebase-messaging.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ dependencies {
9999
api 'com.google.firebase:firebase-encoders-json:18.0.0'
100100
api "com.google.firebase:firebase-encoders-proto:16.0.0"
101101
api "com.google.firebase:firebase-iid-interop:17.1.0"
102-
api("com.google.firebase:firebase-installations:17.2.0")
102+
api("com.google.firebase:firebase-installations:18.0.0") {
103+
exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
104+
}
103105
api('com.google.firebase:firebase-installations-interop:17.1.0')
104106
api('com.google.firebase:firebase-measurement-connector:19.0.0')
105107

firebase-ml-modeldownloader/firebase-ml-modeldownloader.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ dependencies {
9696
}
9797
api 'com.google.firebase:firebase-encoders:17.0.0'
9898
api 'com.google.firebase:firebase-encoders-json:18.0.0'
99-
api("com.google.firebase:firebase-installations:17.2.0")
99+
api("com.google.firebase:firebase-installations:18.0.0") {
100+
exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
101+
}
100102
api 'com.google.firebase:firebase-installations-interop:17.1.0'
101103

102104
implementation 'androidx.annotation:annotation:1.1.0'

firebase-perf/firebase-perf.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,12 @@ dependencies {
115115
implementation libs.okhttp
116116
api("com.google.firebase:firebase-common:22.0.0")
117117
api("com.google.firebase:firebase-components:19.0.0")
118-
api("com.google.firebase:firebase-config:21.5.0")
119-
api("com.google.firebase:firebase-installations:17.2.0")
118+
api("com.google.firebase:firebase-config:21.5.0") {
119+
exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
120+
}
121+
api("com.google.firebase:firebase-installations:18.0.0") {
122+
exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
123+
}
120124
api("com.google.firebase:firebase-sessions:2.0.7") {
121125
exclude group: 'com.google.firebase', module: 'firebase-common'
122126
exclude group: 'com.google.firebase', module: 'firebase-common-ktx'

firebase-sessions/firebase-sessions.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ dependencies {
8989

9090
runtimeOnly("com.google.firebase:firebase-installations:18.0.0") {
9191
exclude(group = "com.google.firebase", module = "firebase-common")
92+
exclude(group = "com.google.firebase", module = "firebase-common-ktx")
9293
exclude(group = "com.google.firebase", module = "firebase-components")
9394
}
9495
runtimeOnly("com.google.firebase:firebase-datatransport:19.0.0") {

0 commit comments

Comments
 (0)