Skip to content

Commit efd21cc

Browse files
VinayGuthalVinayGuthal
committed
fix
1 parent 7f663a5 commit efd21cc

File tree

12 files changed

+70
-75
lines changed

12 files changed

+70
-75
lines changed

‎appcheck/firebase-appcheck-debug/firebase-appcheck-debug.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ dependencies {
5252

5353
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
5454

55-
testImplementation project(':integ-testing')
55+
testImplementation(project(":integ-testing")){
56+
exclude group: 'com.google.firebase', module: 'firebase-common'
57+
exclude group: 'com.google.firebase', module: 'firebase-components'
58+
}
5659
testImplementation 'junit:junit:4.13-beta-2'
5760
testImplementation 'org.mockito:mockito-core:2.25.0'
5861
testImplementation "org.robolectric:robolectric:$robolectricVersion"

‎appcheck/firebase-appcheck-playintegrity/firebase-appcheck-playintegrity.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ dependencies {
5353

5454
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
5555

56-
testImplementation project(':integ-testing')
56+
testImplementation(project(":integ-testing")){
57+
exclude group: 'com.google.firebase', module: 'firebase-common'
58+
exclude group: 'com.google.firebase', module: 'firebase-components'
59+
}
5760
testImplementation 'junit:junit:4.13.2'
5861
testImplementation 'org.mockito:mockito-core:3.4.6'
5962
testImplementation "com.google.truth:truth:$googleTruthVersion"

‎appcheck/firebase-appcheck-safetynet/firebase-appcheck-safetynet.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ dependencies {
5252
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
5353
javadocClasspath 'org.checkerframework:checker-qual:2.5.2'
5454

55-
testImplementation project(':integ-testing')
55+
testImplementation(project(":integ-testing")){
56+
exclude group: 'com.google.firebase', module: 'firebase-common'
57+
exclude group: 'com.google.firebase', module: 'firebase-components'
58+
}
5659
testImplementation 'junit:junit:4.13-beta-2'
5760
testImplementation 'org.mockito:mockito-core:2.25.0'
5861
testImplementation "org.robolectric:robolectric:$robolectricVersion"

‎appcheck/firebase-appcheck/firebase-appcheck.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ dependencies {
5454
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
5555
androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
5656
androidTestImplementation project(':appcheck:firebase-appcheck')
57-
androidTestImplementation project(':integ-testing')
57+
androidTestImplementation(project(":integ-testing")){
58+
exclude group: 'com.google.firebase', module: 'firebase-common'
59+
exclude group: 'com.google.firebase', module: 'firebase-components'
60+
}
5861
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
5962
implementation 'androidx.annotation:annotation:1.1.0'
6063
implementation 'com.google.android.gms:play-services-base:18.0.1'
@@ -74,5 +77,8 @@ dependencies {
7477
testImplementation 'junit:junit:4.13-beta-2'
7578
testImplementation 'org.mockito:mockito-core:2.25.0'
7679
testImplementation 'org.mockito:mockito-inline:2.25.0'
77-
testImplementation project(':integ-testing')
80+
testImplementation(project(":integ-testing")){
81+
exclude group: 'com.google.firebase', module: 'firebase-common'
82+
exclude group: 'com.google.firebase', module: 'firebase-components'
83+
}
7884
}

‎firebase-appdistribution/firebase-appdistribution.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ dependencies {
6262
}
6363
implementation 'com.google.firebase:firebase-common:20.3.1'
6464
testImplementation project(path: ':firebase-appdistribution')
65-
testImplementation project(':integ-testing')
65+
testImplementation(project(":integ-testing")){
66+
exclude group: 'com.google.firebase', module: 'firebase-common'
67+
exclude group: 'com.google.firebase', module: 'firebase-components'
68+
}
6669
runtimeOnly('com.google.firebase:firebase-installations:17.1.3') {
6770
exclude group: 'com.google.firebase', module: 'firebase-common'
6871
exclude group: 'com.google.firebase', module: 'firebase-components'
@@ -88,7 +91,10 @@ dependencies {
8891
implementation "androidx.browser:browser:1.3.0"
8992
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
9093

91-
androidTestImplementation project(':integ-testing')
94+
androidTestImplementation(project(":integ-testing")){
95+
exclude group: 'com.google.firebase', module: 'firebase-common'
96+
exclude group: 'com.google.firebase', module: 'firebase-components'
97+
}
9298
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
9399
androidTestImplementation 'androidx.test:runner:1.2.0'
94100
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"

‎firebase-inappmessaging-display/firebase-inappmessaging-display.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ dependencies {
9292
exclude group: "com.google.firebase", module: "firebase-installations-interop"
9393
exclude group: "com.google.firebase", module: "firebase-installations"
9494
}
95-
androidTestImplementation project(':integ-testing')
95+
androidTestImplementation(project(":integ-testing")){
96+
exclude group: 'com.google.firebase', module: 'firebase-common'
97+
exclude group: 'com.google.firebase', module: 'firebase-components'
98+
}
9699
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
97100
annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
98101
annotationProcessor 'com.ryanharter.auto.value:auto-value-parcel:0.2.6'

‎firebase-inappmessaging/firebase-inappmessaging.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ dependencies {
112112
androidTestImplementation 'com.linkedin.dexmaker:dexmaker:2.28.1'
113113
androidTestImplementation 'junit:junit:4.12'
114114
androidTestImplementation 'org.awaitility:awaitility:3.1.0'
115-
androidTestImplementation project(':integ-testing')
115+
androidTestImplementation(project(":integ-testing")){
116+
exclude group: 'com.google.firebase', module: 'firebase-common'
117+
exclude group: 'com.google.firebase', module: 'firebase-components'
118+
}
116119

117120
annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
118121
annotationProcessor 'com.ryanharter.auto.value:auto-value-parcel:0.2.6'
@@ -159,7 +162,10 @@ dependencies {
159162
testImplementation ("org.robolectric:robolectric:$robolectricVersion") {
160163
exclude group: 'com.google.protobuf', module: 'protobuf-java'
161164
}
162-
testImplementation project(":integ-testing")
165+
testImplementation(project(":integ-testing")){
166+
exclude group: 'com.google.firebase', module: 'firebase-common'
167+
exclude group: 'com.google.firebase', module: 'firebase-components'
168+
}
163169
vendor (libs.dagger.dagger) {
164170
exclude group: "javax.inject", module: "javax.inject"
165171
}

‎firebase-installations/firebase-installations.gradle

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ dependencies {
5151
androidTestImplementation 'junit:junit:4.12'
5252
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
5353
androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
54-
androidTestImplementation project(':integ-testing')
54+
androidTestImplementation(project(":integ-testing")){
55+
exclude group: 'com.google.firebase', module: 'firebase-common'
56+
exclude group: 'com.google.firebase', module: 'firebase-components'
57+
}
5558
annotationProcessor "com.google.auto.value:auto-value:1.6.2"
5659
api(project(":firebase-installations-interop"))
5760
compileOnly "com.google.auto.value:auto-value-annotations:1.6.5"
@@ -70,5 +73,8 @@ dependencies {
7073
testImplementation 'junit:junit:4.13'
7174
testImplementation 'org.mockito:mockito-core:2.25.0'
7275
testImplementation 'org.mockito:mockito-inline:2.25.0'
73-
testImplementation project(':integ-testing')
76+
testImplementation(project(":integ-testing")){
77+
exclude group: 'com.google.firebase', module: 'firebase-common'
78+
exclude group: 'com.google.firebase', module: 'firebase-components'
79+
}
7480
}

‎firebase-installations/src/main/java/com/google/firebase/installations/ktx/Installations.kt

Lines changed: 11 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,16 @@ import com.google.firebase.ktx.Firebase
2323
/**
2424
* Returns the [FirebaseInstallations] instance of the default [FirebaseApp].
2525
* @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
26-
* respective main modules, and the Kotlin extension (KTX) APIs in Licensed under the Apache
27-
* License, Version 2.0 (the "License"); // you may not use this file except in compliance with the
28-
* License. // You may obtain a copy of the License at // //
29-
* http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to
30-
* in writing, software // distributed under the License is distributed on an "AS IS" BASIS, //
31-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for
32-
* the specific language governing permissions and // limitations under the License.
33-
*
34-
* package com.google.firebase.installations.ktx
35-
*
36-
* import com.google.firebase.FirebaseApp import com.google.firebase.components.Component import
37-
* com.google.firebase.components.ComponentRegistrar import
38-
* com.google.firebase.installations.FirebaseInstallations import com.google.firebase.ktx.Firebase
39-
*
40-
* /** Returns the [FirebaseInstallations] instance of the default [FirebaseApp]. */ @Deprecated(
41-
* "com.google.firebase.installationsktx.Firebase.installations has been deprecated. Use ` are now
42-
* deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
26+
* respective main modules, and the Kotlin extension (KTX) APIs in
27+
* `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
28+
* longer release KTX modules. For details, see the
4329
* [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
4430
*/
4531
@Deprecated(
46-
"com.google.firebase.insta",
32+
"Use `com.google.firebase.Firebase.installations` from the main module instead.",
4733
ReplaceWith(
4834
expression = "com.google.firebase.Firebase.installations",
49-
imports = ["com.google.firebase.Firebase", "com.google.firebase.installationsinstallations"]
35+
imports = ["com.google.firebase.Firebase", "com.google.firebase.installations.installations"]
5036
)
5137
)
5238
val Firebase.installations: FirebaseInstallations
@@ -55,27 +41,13 @@ val Firebase.installations: FirebaseInstallations
5541
/**
5642
* Returns the [FirebaseInstallations] instance of a given [FirebaseApp].
5743
* @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
58-
* respective main modules, and the Kotlin extension (KTX) APIs in Licensed under the Apache
59-
* License, Version 2.0 (the "License"); // you may not use this file except in compliance with the
60-
* License. // You may obtain a copy of the License at // //
61-
* http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to
62-
* in writing, software // distributed under the License is distributed on an "AS IS" BASIS, //
63-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for
64-
* the specific language governing permissions and // limitations under the License.
65-
*
66-
* package com.google.firebase.installations.ktx
67-
*
68-
* import com.google.firebase.FirebaseApp import com.google.firebase.components.Component import
69-
* com.google.firebase.components.ComponentRegistrar import
70-
* com.google.firebase.installations.FirebaseInstallations import com.google.firebase.ktx.Firebase
71-
*
72-
* /** Returns the [FirebaseInstallations] instance of the default [FirebaseApp]. */ @Deprecated(
73-
* "com.google.firebase.installationsktx.Firebase.installations has been deprecated. Use ` are now
74-
* deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
44+
* respective main modules, and the Kotlin extension (KTX) APIs in
45+
* `com.google.firebase.firebase-storage-ktx` are now deprecated. As early as April 2024, we'll no
46+
* longer release KTX modules. For details, see the
7547
* [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
7648
*/
7749
@Deprecated(
78-
"com.google.firebase.insta",
50+
"Use `com.google.firebase.Firebase.installations(app)` from the main module instead.",
7951
ReplaceWith(
8052
expression = "com.google.firebase.Firebase.installations(app)",
8153
imports = ["com.google.firebase.Firebase", "com.google.firebase.installations.installations"]
@@ -84,30 +56,9 @@ val Firebase.installations: FirebaseInstallations
8456
fun Firebase.installations(app: FirebaseApp): FirebaseInstallations =
8557
FirebaseInstallations.getInstance(app)
8658

87-
/**
88-
* @suppress
89-
* @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
90-
* respective main modules, and the Kotlin extension (KTX) APIs in Licensed under the Apache
91-
* License, Version 2.0 (the "License"); // you may not use this file except in compliance with the
92-
* License. // You may obtain a copy of the License at // //
93-
* http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to
94-
* in writing, software // distributed under the License is distributed on an "AS IS" BASIS, //
95-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for
96-
* the specific language governing permissions and // limitations under the License.
97-
*
98-
* package com.google.firebase.installations.ktx
99-
*
100-
* import com.google.firebase.FirebaseApp import com.google.firebase.components.Component import
101-
* com.google.firebase.components.ComponentRegistrar import
102-
* com.google.firebase.installations.FirebaseInstallations import com.google.firebase.ktx.Firebase
103-
*
104-
* /** Returns the [FirebaseInstallations] instance of the default [FirebaseApp]. */ @Deprecated(
105-
* "com.google.firebase.installationsktx.Firebase.installations has been deprecated. Use ` are now
106-
* deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
107-
* [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
108-
*/
59+
/** @suppress */
10960
@Deprecated(
110-
"com.google.firebase.insta",
61+
"com.google.firebase.installations.FirebaseInstallationsKtxRegistrar has been deprecated. Use `com.google.firebase.installationsFirebaseInstallationsKtxRegistrar` instead.",
11162
ReplaceWith(
11263
expression = "FirebaseInstallationsKtxRegistrar",
11364
imports =

‎firebase-messaging/firebase-messaging.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ dependencies {
8686
androidTestImplementation 'junit:junit:4.12'
8787
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
8888
androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
89-
androidTestImplementation project(':integ-testing')
89+
androidTestImplementation(project(":integ-testing")){
90+
exclude group: 'com.google.firebase', module: 'firebase-common'
91+
exclude group: 'com.google.firebase', module: 'firebase-components' }
9092
annotationProcessor project(":encoders:firebase-encoders-processor")
9193
implementation "com.google.android.gms:play-services-basement:18.1.0"
9294
implementation "com.google.android.gms:play-services-tasks:18.0.1"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ dependencies {
112112
testImplementation 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
113113
testImplementation 'org.mockito:mockito-core:3.3.3'
114114
testImplementation 'org.mockito:mockito-core:3.6.0'
115-
testImplementation(project(":integ-testing"))
115+
testImplementation(project(":integ-testing")) {
116+
exclude group: 'com.google.firebase', module: 'firebase-common'
117+
exclude group: 'com.google.firebase', module: 'firebase-components'
118+
}
116119
vendor (libs.dagger.dagger) {
117120
exclude group: "javax.inject", module: "javax.inject"
118121
}

‎firebase-sessions/firebase-sessions.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ dependencies {
7474

7575
kapt(project(":encoders:firebase-encoders-processor"))
7676

77-
testImplementation(project(":integ-testing"))
77+
testImplementation(project(":integ-testing")) {
78+
exclude(group = "com.google.firebase", module = "firebase-common")
79+
exclude(group = "com.google.firebase", module = "firebase-components")
80+
}
7881
testImplementation(libs.androidx.test.junit)
7982
testImplementation(libs.androidx.test.runner)
8083
testImplementation(libs.junit)

0 commit comments

Comments
 (0)