Skip to content

Commit 3d406f2

Browse files
dconeybedconeybe
committed
Merge remote-tracking branch 'origin/master' into HEAD
2 parents 70326ee + 436b03f commit 3d406f2

File tree

57 files changed

+188
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+188
-192
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ android {
4444
}
4545

4646
dependencies {
47-
implementation project(':firebase-common')
48-
implementation project(':firebase-components')
47+
implementation 'com.google.firebase:firebase-common:20.3.1'
48+
implementation 'com.google.firebase:firebase-components:17.1.0'
4949
implementation project(':appcheck:firebase-appcheck')
5050
implementation project(':appcheck:firebase-appcheck-debug')
5151
implementation project(':appcheck:firebase-appcheck-interop')

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ android {
4141
}
4242

4343
dependencies {
44-
implementation project(':firebase-annotations')
45-
implementation project(':firebase-common')
46-
implementation project(':firebase-components')
44+
implementation 'com.google.firebase:firebase-annotations:16.2.0'
45+
implementation 'com.google.firebase:firebase-common:20.3.1'
46+
implementation 'com.google.firebase:firebase-components:17.1.0'
4747
implementation project(':appcheck:firebase-appcheck')
4848
implementation 'com.google.android.gms:play-services-base:18.0.1'
4949
implementation 'com.google.android.gms:play-services-tasks:18.0.1'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ android {
4242
}
4343

4444
dependencies {
45-
implementation project(':firebase-common')
46-
implementation project(':firebase-components')
45+
implementation 'com.google.firebase:firebase-common:20.3.1'
46+
implementation 'com.google.firebase:firebase-components:17.1.0'
4747
implementation 'com.google.android.gms:play-services-base:18.0.1'
4848
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
4949

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ android {
4141
}
4242

4343
dependencies {
44-
implementation project(':firebase-annotations')
45-
implementation project(':firebase-common')
46-
implementation project(':firebase-components')
44+
implementation 'com.google.firebase:firebase-annotations:16.2.0'
45+
implementation 'com.google.firebase:firebase-common:20.3.1'
46+
implementation 'com.google.firebase:firebase-components:17.1.0'
4747
implementation project(':appcheck:firebase-appcheck')
4848
implementation 'com.google.android.gms:play-services-base:18.0.1'
4949
implementation 'com.google.android.gms:play-services-tasks:18.0.1'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ android {
4141
}
4242

4343
dependencies {
44-
implementation project(':firebase-annotations')
45-
implementation project(':firebase-common')
46-
implementation project(':firebase-components')
44+
implementation 'com.google.firebase:firebase-annotations:16.2.0'
45+
implementation 'com.google.firebase:firebase-common:20.3.1'
46+
implementation 'com.google.firebase:firebase-components:17.1.0'
4747
implementation project(':appcheck:firebase-appcheck')
4848
implementation 'com.google.android.gms:play-services-base:18.0.1'
4949
implementation 'com.google.android.gms:play-services-tasks:18.0.1'

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ android {
4242
}
4343

4444
dependencies {
45-
implementation project(':firebase-annotations')
46-
implementation project(':firebase-common')
47-
implementation project(':firebase-components')
48-
implementation project(":appcheck:firebase-appcheck-interop")
45+
implementation 'com.google.firebase:firebase-annotations:16.2.0'
46+
implementation 'com.google.firebase:firebase-common:20.3.1'
47+
implementation 'com.google.firebase:firebase-components:17.1.0'
48+
implementation project(':appcheck:firebase-appcheck-interop')
4949
implementation 'com.google.android.gms:play-services-base:18.0.1'
5050
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
5151

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ android {
5353
dependencies {
5454
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
5555

56-
implementation project(':firebase-common')
57-
implementation project(':firebase-components')
58-
implementation project(':firebase-common:ktx')
56+
implementation 'com.google.firebase:firebase-common:20.3.1'
57+
implementation 'com.google.firebase:firebase-components:17.1.0'
58+
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
5959
implementation 'androidx.annotation:annotation:1.1.0'
6060
implementation project(path: ':appcheck:firebase-appcheck')
6161
implementation project(path: ':appcheck:firebase-appcheck-interop')

‎encoders/firebase-encoders-json/firebase-encoders-json.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android {
4343

4444
dependencies {
4545
implementation 'androidx.annotation:annotation:1.1.0'
46-
implementation project(':encoders:firebase-encoders')
46+
implementation 'com.google.firebase:firebase-encoders:17.0.0'
4747

4848
testImplementation 'androidx.test:runner:1.3.0'
4949
testImplementation 'androidx.test.ext:junit:1.1.2'

‎encoders/firebase-encoders-processor/firebase-encoders-processor.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def jvm = org.gradle.internal.jvm.Jvm.current()
2020

2121

2222
dependencies {
23-
implementation project(':encoders:firebase-encoders')
23+
implementation 'com.google.firebase:firebase-encoders:17.0.0'
2424
implementation 'com.google.auto.service:auto-service-annotations:1.0-rc6'
2525
implementation 'com.squareup:javapoet:1.13.0'
2626
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'

‎encoders/firebase-encoders-proto/firebase-encoders-proto.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protobuf {
3636

3737
dependencies {
3838
implementation 'androidx.annotation:annotation:1.1.0'
39-
implementation project(':encoders:firebase-encoders')
39+
implementation 'com.google.firebase:firebase-encoders:17.0.0'
4040

4141
annotationProcessor project(':encoders:firebase-encoders-processor')
4242

‎encoders/firebase-encoders-reflective/firebase-encoders-reflective.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ android {
4343

4444
dependencies {
4545
implementation 'androidx.annotation:annotation:1.1.0'
46-
implementation project(':encoders:firebase-encoders')
47-
implementation project(':encoders:firebase-encoders-json')
46+
implementation 'com.google.firebase:firebase-encoders:17.0.0'
47+
implementation 'com.google.firebase:firebase-encoders-json:18.0.0'
4848

4949
testImplementation 'androidx.test:runner:1.3.0'
5050
testImplementation 'androidx.test.ext:junit:1.1.2'

‎firebase-abt/firebase-abt.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ android {
4747
}
4848

4949
dependencies {
50-
implementation project(':firebase-common')
51-
implementation project(':firebase-components')
50+
implementation 'com.google.firebase:firebase-common:20.3.1'
51+
implementation 'com.google.firebase:firebase-components:17.1.0'
5252
implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
5353
exclude group: "com.google.firebase", module: "firebase-common"
5454
}

‎firebase-appdistribution-api/firebase-appdistribution-api.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ android {
3838
}
3939

4040
dependencies {
41-
implementation project(':firebase-components')
42-
implementation project(':firebase-common')
41+
implementation 'com.google.firebase:firebase-components:17.1.0'
42+
implementation 'com.google.firebase:firebase-common:20.3.1'
4343
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
4444
testImplementation 'junit:junit:4.13.2'
4545
testImplementation "org.robolectric:robolectric:$robolectricVersion"

‎firebase-appdistribution-api/ktx/ktx.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ android {
5353
dependencies {
5454
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
5555

56-
implementation project(':firebase-common')
57-
implementation project(':firebase-components')
58-
implementation project(':firebase-common:ktx')
56+
implementation 'com.google.firebase:firebase-common:20.3.1'
57+
implementation 'com.google.firebase:firebase-components:17.1.0'
58+
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
5959
implementation 'androidx.annotation:annotation:1.1.0'
6060
implementation project(path: ':firebase-appdistribution-api')
6161

‎firebase-appdistribution/firebase-appdistribution.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,9 @@ android {
4747

4848
dependencies {
4949
implementation project(':firebase-appdistribution-api')
50-
implementation project(':firebase-annotations')
51-
implementation project(':firebase-components')
52-
implementation project(':firebase-installations-interop')
53-
implementation project(':firebase-common')
50+
implementation 'com.google.firebase:firebase-components:17.1.0'
51+
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
52+
implementation 'com.google.firebase:firebase-common:20.3.1'
5453
testImplementation project(path: ':firebase-appdistribution')
5554
testImplementation project(':integ-testing')
5655
runtimeOnly project(':firebase-installations')

‎firebase-common/data-collection-tests/data-collection-tests.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ android {
3434
}
3535

3636
dependencies {
37-
implementation(project(":firebase-common"))
38-
implementation(project(":firebase-components"))
37+
implementation("com.google.firebase:firebase-common:20.3.1")
38+
implementation("com.google.firebase:firebase-components:17.1.0")
3939
testImplementation(libs.androidx.test.runner)
4040
testImplementation(libs.androidx.test.junit)
4141
testImplementation(libs.robolectric)

‎firebase-common/firebase-common.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation(project(":firebase-annotations"))
53-
implementation(project(":firebase-components"))
52+
implementation("com.google.firebase:firebase-annotations:16.2.0")
53+
implementation("com.google.firebase:firebase-components:17.1.0")
5454
implementation(libs.androidx.futures)
5555
implementation(libs.playservices.basement)
5656
implementation(libs.playservices.tasks)
@@ -62,9 +62,6 @@ dependencies {
6262
// needed for Kotlin detection to compile, but not necessarily present at runtime.
6363
compileOnly(libs.kotlin.stdlib)
6464

65-
// FirebaseApp references storage, so storage needs to be on classpath when dokka runs.
66-
javadocClasspath(project(":firebase-storage"))
67-
6865
testImplementation(libs.androidx.test.junit)
6966
testImplementation(libs.androidx.test.junit)
7067
testImplementation(libs.androidx.test.runner)

‎firebase-common/ktx/ktx.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ android {
4343
dependencies {
4444
implementation(libs.kotlin.stdlib)
4545

46-
implementation(project(":firebase-annotations"))
46+
implementation("com.google.firebase:firebase-annotations:16.2.0")
4747
implementation(project(":firebase-common"))
48-
implementation(project(":firebase-components"))
48+
implementation("com.google.firebase:firebase-components:17.1.0")
4949
implementation(libs.androidx.annotation)
5050

5151
// We"re exposing this library as a transitive dependency so developers can

‎firebase-components/firebase-components.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040
}
4141

4242
dependencies {
43-
implementation(project(":firebase-annotations"))
43+
implementation("com.google.firebase:firebase-annotations:16.2.0")
4444
implementation(libs.androidx.annotation)
4545
implementation(libs.errorprone.annotations)
4646

‎firebase-components/firebase-dynamic-module-support/firebase-dynamic-module-support.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ android {
4242
}
4343

4444
dependencies {
45-
implementation(project(":firebase-common"))
46-
implementation(project(":firebase-components"))
45+
implementation("com.google.firebase:firebase-common:20.3.1")
46+
implementation("com.google.firebase:firebase-components:17.1.0")
4747
implementation("com.google.android.play:feature-delivery:2.0.0")
4848
}

‎firebase-config/bandwagoner/bandwagoner.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ dependencies {
6363
// This is required since a project dependency on frc does not expose the Apis of its "implementation" dependencies.
6464
// The alternative would be to make common an "api" dep of remote-config.
6565
// It should not matter for released artifacts.
66-
implementation project(":firebase-common")
67-
implementation project(":firebase-components")
66+
implementation "com.google.firebase:firebase-common:20.3.1"
67+
implementation "com.google.firebase:firebase-components:17.1.0"
6868

6969
implementation project(":firebase-installations-interop")
7070
runtimeOnly project(":firebase-installations")

‎firebase-config/firebase-config.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ android {
4949
}
5050

5151
dependencies {
52-
implementation project(':firebase-annotations')
53-
implementation project(':firebase-common')
54-
implementation project(':firebase-abt')
55-
implementation project(':firebase-components')
56-
implementation project(':firebase-installations-interop')
57-
runtimeOnly project(':firebase-installations')
52+
implementation 'com.google.firebase:firebase-annotations:16.2.0'
53+
implementation 'com.google.firebase:firebase-common:20.3.1'
54+
implementation 'com.google.firebase:firebase-abt:21.1.1'
55+
implementation 'com.google.firebase:firebase-components:17.1.0'
56+
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
57+
runtimeOnly 'com.google.firebase:firebase-installations:17.1.2'
5858

5959
implementation 'com.google.firebase:firebase-measurement-connector:18.0.0'
6060
implementation 'com.google.android.gms:play-services-tasks:18.0.1'

‎firebase-config/ktx/ktx.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ android {
4444
dependencies {
4545
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
4646

47-
implementation project(':firebase-common')
48-
implementation project(':firebase-components')
49-
implementation project(':firebase-common:ktx')
47+
implementation 'com.google.firebase:firebase-common:20.3.1'
48+
implementation 'com.google.firebase:firebase-components:17.1.0'
49+
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
5050
implementation project(':firebase-config')
51-
implementation project(':firebase-abt')
52-
implementation project(':firebase-installations-interop')
51+
implementation 'com.google.firebase:firebase-abt:21.1.1'
52+
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
5353
runtimeOnly project(':firebase-installations')
5454

5555
implementation 'androidx.annotation:annotation:1.1.0'

‎firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ thirdPartyLicenses {
100100
}
101101

102102
dependencies {
103-
implementation project(':firebase-common')
104-
implementation project(':firebase-components')
103+
implementation 'com.google.firebase:firebase-common:20.3.1'
104+
implementation 'com.google.firebase:firebase-components:17.1.0'
105105
implementation project(':firebase-crashlytics')
106106
implementation 'com.google.android.gms:play-services-basement:18.1.0'
107107

‎firebase-crashlytics/firebase-crashlytics.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ thirdPartyLicenses {
5959
dependencies {
6060
compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
6161

62-
implementation project(':encoders:firebase-encoders')
63-
implementation project(':encoders:firebase-encoders-json')
64-
implementation project(':firebase-annotations')
65-
implementation project(':firebase-common')
66-
implementation project(':firebase-components')
67-
implementation project(':transport:transport-api')
62+
implementation 'com.google.firebase:firebase-encoders:17.0.0'
63+
implementation 'com.google.firebase:firebase-encoders-json:18.0.0'
64+
implementation 'com.google.firebase:firebase-annotations:16.2.0'
65+
implementation 'com.google.firebase:firebase-common:20.3.1'
66+
implementation 'com.google.firebase:firebase-components:17.1.0'
67+
implementation 'com.google.android.datatransport:transport-api:3.0.0'
6868
implementation project(':transport:transport-runtime')
6969
implementation project(':transport:transport-backend-cct')
70-
implementation project(':firebase-installations-interop')
70+
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'
7171
runtimeOnly project(':firebase-installations')
7272
implementation 'com.google.firebase:firebase-measurement-connector:18.0.2'
7373
implementation "com.google.android.gms:play-services-tasks:18.0.1"
@@ -84,7 +84,7 @@ dependencies {
8484
testImplementation 'org.mockito:mockito-core:3.4.3'
8585

8686

87-
androidTestImplementation project(':encoders:firebase-encoders-json')
87+
androidTestImplementation 'com.google.firebase:firebase-encoders-json:18.0.0'
8888
androidTestImplementation 'androidx.test:runner:1.4.0'
8989
androidTestImplementation 'androidx.test:core:1.4.0'
9090
androidTestImplementation 'androidx.test.ext:junit:1.1.3'

‎firebase-crashlytics/ktx/ktx.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ android {
4646
dependencies {
4747
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
4848

49-
implementation project(':firebase-common')
50-
implementation project(':firebase-components')
51-
implementation project(':firebase-common:ktx')
49+
implementation 'com.google.firebase:firebase-common:20.3.1'
50+
implementation 'com.google.firebase:firebase-components:17.1.0'
51+
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
5252
implementation project(':firebase-crashlytics')
5353
implementation 'androidx.annotation:annotation:1.1.0'
5454

‎firebase-database/firebase-database.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ android {
7070
}
7171

7272
dependencies {
73-
implementation project(':firebase-common')
74-
implementation project(':firebase-database-collection')
75-
implementation project(':firebase-components')
76-
implementation project(':appcheck:firebase-appcheck-interop')
73+
implementation 'com.google.firebase:firebase-common:20.3.1'
74+
implementation 'com.google.firebase:firebase-database-collection:18.0.1'
75+
implementation 'com.google.firebase:firebase-components:17.1.0'
76+
implementation 'com.google.firebase:firebase-appcheck-interop:16.1.1'
7777

7878
implementation 'androidx.annotation:annotation:1.1.0'
7979
implementation 'com.google.android.gms:play-services-basement:18.1.0'

‎firebase-database/ktx/ktx.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ android {
4646
dependencies {
4747
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
4848

49-
implementation project(':firebase-common')
50-
implementation project(':firebase-components')
51-
implementation project(':firebase-common:ktx')
49+
implementation 'com.google.firebase:firebase-common:20.3.1'
50+
implementation 'com.google.firebase:firebase-components:17.1.0'
51+
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
5252
implementation project(':firebase-database')
5353
implementation 'androidx.annotation:annotation:1.1.0'
5454
implementation 'com.google.android.gms:play-services-tasks:18.0.1'

‎firebase-datatransport/firebase-datatransport.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ android {
4545
}
4646

4747
dependencies {
48-
implementation project(':firebase-common')
49-
implementation project(':firebase-components')
50-
implementation project(':transport:transport-api')
51-
implementation project(':transport:transport-runtime')
52-
implementation project(':transport:transport-backend-cct')
48+
implementation 'com.google.firebase:firebase-common:20.3.1'
49+
implementation 'com.google.firebase:firebase-components:17.1.0'
50+
implementation 'com.google.android.datatransport:transport-api:3.0.0'
51+
implementation 'com.google.android.datatransport:transport-runtime:3.1.8'
52+
implementation 'com.google.android.datatransport:transport-backend-cct:3.1.8'
5353
implementation 'androidx.annotation:annotation:1.1.0'
5454

5555
testImplementation 'androidx.test:runner:1.2.0'

‎firebase-dynamic-links/firebase-dynamic-links.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ android {
4848
}
4949

5050
dependencies {
51-
implementation project(':firebase-common')
52-
implementation project(':firebase-components')
51+
implementation 'com.google.firebase:firebase-common:20.3.1'
52+
implementation 'com.google.firebase:firebase-components:17.1.0'
5353

5454
implementation 'androidx.annotation:annotation:1.2.0'
5555

0 commit comments

Comments
 (0)