File tree Expand file tree Collapse file tree 12 files changed +35
-10
lines changed
firebase-ml-modeldownloader Expand file tree Collapse file tree 12 files changed +35
-10
lines changed Original file line number Diff line number Diff 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,7 +81,7 @@ dependencies {
8181
8282 compileOnly libs. autovalue. annotations
8383
84- runtimeOnly(' com.google.firebase :firebase-installations:17.1.3 ' ) {
84+ runtimeOnly(project( ' :firebase-installations' ) ) {
8585 exclude group : ' com.google.firebase' , module : ' firebase-common'
8686 exclude group : ' com.google.firebase' , module : ' firebase-components'
8787 }
Original file line number Diff line number Diff line change @@ -71,9 +71,15 @@ dependencies {
7171 exclude(group = " com.google.firebase" , module = " firebase-common" )
7272 exclude(group = " com.google.firebase" , module = " firebase-components" )
7373 }
74+ <<<<<<< Updated upstream
7475 api(" com.google.firebase:firebase-common:21.0.0" )
7576 api(" com.google.firebase:firebase-components:18.0.0" )
7677 api(" com.google.firebase:firebase-installations:17.2.0" )
78+ ====== =
79+ api(" com.google.firebase:firebase-common:22.0.0" )
80+ api(" com.google.firebase:firebase-components:19.0.0" )
81+ api(project(" :firebase-installations" ))
82+ >>>>>>> Stashed changes
7783
7884 // Kotlin & Android
7985 implementation(libs.kotlin.stdlib)
Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ dependencies {
6565 implementation(" com.google.firebase:firebase-components:18.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(project( " :firebase-installations" ) )
6969
7070 implementation(" com.google.android.gms:play-services-basement:18.1.0" )
7171 implementation(" com.google.android.gms:play-services-tasks:18.0.1" )
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ 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(project( " :firebase-installations" ) )
8080 api(" com.google.firebase:firebase-installations-interop:17.2.0" )
8181 api(" com.google.firebase:firebase-measurement-connector:20.0.1" )
8282
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ dependencies {
5353 implementation(project(" :firebase-dataconnect:testutil" ))
5454
5555 implementation(" com.google.firebase:firebase-auth:22.3.1" )
56- implementation(" com.google.firebase: firebase-appcheck:18.0.0 " )
56+ implementation(project( " :appcheck: firebase-appcheck" ) )
5757
5858 implementation(libs.androidx.test.core)
5959 implementation(libs.androidx.test.junit)
Original file line number Diff line number Diff line change @@ -96,8 +96,15 @@ dependencies {
9696
9797 implementation(" com.google.firebase:firebase-annotations:16.2.0" )
9898 implementation(" com.google.firebase:firebase-appcheck-interop:17.1.0" )
99+ <<<<<<< Updated upstream
99100 implementation(" com.google.firebase:firebase-auth-interop:20.0.0" )
100101 implementation(" com.google.firebase:firebase-components:18.0.0" )
102+ ====== =
103+ implementation(" com.google.firebase:firebase-auth-interop:20.0.0" ) {
104+ exclude(group= " com.google.firebase" , module= " firebase-common-ktx" )
105+ }
106+ implementation(" com.google.firebase:firebase-components:19.0.0" )
107+ >>>>>>> Stashed changes
101108
102109 compileOnly(libs.javax.annotation.jsr250)
103110 compileOnly(libs.kotlinx.datetime)
@@ -127,7 +134,7 @@ dependencies {
127134 androidTestImplementation(project(" :firebase-dataconnect:androidTestutil" ))
128135 androidTestImplementation(project(" :firebase-dataconnect:connectors" ))
129136 androidTestImplementation(project(" :firebase-dataconnect:testutil" ))
130- androidTestImplementation(" com.google.firebase: firebase-appcheck:18.0.0 " )
137+ androidTestImplementation(project( " :appcheck: firebase-appcheck" ) )
131138 androidTestImplementation(" com.google.firebase:firebase-auth:22.3.1" )
132139 androidTestImplementation(libs.androidx.test.core)
133140 androidTestImplementation(libs.androidx.test.junit)
Original file line number Diff line number Diff line change @@ -123,7 +123,7 @@ 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(project( " :firebase-installations" ) )
127127 api ' com.google.firebase:firebase-installations-interop:17.1.0'
128128 api(' com.google.firebase:firebase-measurement-connector:18.0.2' ) {
129129 exclude group : ' com.google.firebase' , module : ' firebase-common'
Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ 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(project( " :firebase-installations" ) )
103103 api(' com.google.firebase:firebase-installations-interop:17.1.0' )
104104 api(' com.google.firebase:firebase-measurement-connector:19.0.0' )
105105
Original file line number Diff line number Diff line change @@ -96,7 +96,7 @@ 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(project( " :firebase-installations" ) )
100100 api ' com.google.firebase:firebase-installations-interop:17.1.0'
101101
102102 implementation ' androidx.annotation:annotation:1.1.0'
Original file line number Diff line number Diff line change @@ -113,10 +113,17 @@ dependencies {
113113 api ' com.google.firebase:firebase-installations-interop:17.1.0'
114114 api project(" :protolite-well-known-types" )
115115 implementation libs. okhttp
116+ <<<<<< < Updated upstream
116117 api(" com.google.firebase:firebase-common:21.0.0" )
117118 api(" com.google.firebase:firebase-components:18.0.0" )
118119 api(" com.google.firebase:firebase-config:21.5.0" )
119120 api(" com.google.firebase:firebase-installations:17.2.0" )
121+ ====== =
122+ api(" com.google.firebase:firebase-common:22.0.0" )
123+ api(" com.google.firebase:firebase-components:19.0.0" )
124+ api(project(" :firebase-config" ))
125+ api(project(" :firebase-installations" ))
126+ >>>>>>> Stashed changes
120127 api(" com.google.firebase:firebase-sessions:2.0.7" ) {
121128 exclude group : ' com.google.firebase' , module : ' firebase-common'
122129 exclude group : ' com.google.firebase' , module : ' firebase-common-ktx'
You can’t perform that action at this time.
0 commit comments