Skip to content

Commit 504ffd7

Browse files
milaGGLmilaGGL
authored
Merge branch 'master' into mila/composite-index-testing
2 parents a8b167b + dc48e69 commit 504ffd7

File tree

85 files changed

+1372
-396
lines changed

Some content is hidden

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

85 files changed

+1372
-396
lines changed

‎appcheck/firebase-appcheck-debug-testing/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Unreleased
2-
2+
* [unchanged] Updated to keep [app_check] SDK versions aligned.
3+
*
34
# 17.0.0
45
* [unchanged] Updated to keep [app_check] SDK versions aligned.
56

‎appcheck/firebase-appcheck-debug/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Unreleased
2-
2+
* [unchanged] Updated to keep [app_check] SDK versions aligned.
3+
*
34
# 17.0.0
45
* [unchanged] Updated to keep [app_check] SDK versions aligned.
56

‎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/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Unreleased
2-
2+
* [unchanged] Updated to keep [app_check] SDK versions aligned.
33

44
# 17.0.0
55
* [unchanged] Updated to keep [app_check] SDK versions aligned.

‎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/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
# Unreleased
2+
* [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-appcheck-ktx`
3+
to `com.google.firebase:firebase-appcheck` under the `com.google.firebase.appcheck` package.
4+
For details, see the
5+
[FAQ about this initiative](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
6+
7+
* [deprecated] All the APIs from `com.google.firebase:firebase-appcheck-ktx` have been added to
8+
`com.google.firebase:firebase-appcheck` under the `com.google.firebase.appcheck` package,
9+
and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-appcheck-ktx` are
10+
now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
11+
[FAQ about this initiative](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
12+
13+
214

315
# 17.0.1
416
* [changed] Internal updates to allow Firebase SDKs to obtain limited-use tokens.

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,20 @@ 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'
6164
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
6265
implementation 'com.google.firebase:firebase-annotations:16.2.0'
6366
implementation project(':appcheck:firebase-appcheck-interop')
6467
implementation project(path: ':appcheck:firebase-appcheck-interop')
65-
implementation(project(":firebase-common"))
66-
implementation(project(":firebase-common:ktx"))
67-
implementation(project(":firebase-components"))
68+
implementation("com.google.firebase:firebase-common:20.4.0")
69+
implementation("com.google.firebase:firebase-common-ktx:20.4.0")
70+
implementation("com.google.firebase:firebase-components:17.1.3")
6871
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
6972
testImplementation "androidx.test:core:$androidxTestCoreVersion"
7073
testImplementation "com.google.truth:truth:$googleTruthVersion"
@@ -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
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ dependencies {
5858
androidTestImplementation 'junit:junit:4.12'
5959
api(project(":appcheck:firebase-appcheck"))
6060
androidTestImplementation(project(":appcheck:firebase-appcheck-interop"))
61-
api(project(":firebase-common"))
62-
api(project(":firebase-common:ktx"))
63-
implementation(project(":firebase-components"))
61+
api("com.google.firebase:firebase-common:20.4.0")
62+
api("com.google.firebase:firebase-common-ktx:20.4.0")
63+
implementation("com.google.firebase:firebase-components:17.1.3")
6464
testImplementation "com.google.truth:truth:$googleTruthVersion"
6565
testImplementation "org.robolectric:robolectric:$robolectricVersion"
6666
testImplementation 'junit:junit:4.12'

‎appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/ktx/FirebaseAppCheck.kt

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,16 @@ import com.google.firebase.components.ComponentRegistrar
2222
import com.google.firebase.ktx.Firebase
2323
import com.google.firebase.ktx.app
2424

25-
/** Returns the [FirebaseAppCheck] instance of the default [FirebaseApp]. */
25+
/**
26+
* Returns the [FirebaseAppCheck] instance of the default [FirebaseApp].
27+
* @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
28+
* respective main modules, and the Kotlin extension (KTX) APIs in
29+
* `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no
30+
* longer release KTX modules. For details, see the
31+
* [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
32+
*/
2633
@Deprecated(
27-
"Use `com.google.firebase.appcheck.Firebase.appCheck` from the main module instead. The Kotlin extensions (KTX) APIs have been added to their respective main modules, and the Kotlin extension (KTX) APIs in `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules){:.external}",
34+
"Use `com.google.firebase.appcheck.Firebase.appCheck` from the main module instead.",
2835
ReplaceWith(
2936
expression = "com.google.firebase.Firebase.appCheck",
3037
imports = ["com.google.firebase.Firebase", "com.google.firebase.appcheck.appCheck"]
@@ -33,9 +40,16 @@ import com.google.firebase.ktx.app
3340
val Firebase.appCheck: FirebaseAppCheck
3441
get() = FirebaseAppCheck.getInstance()
3542

36-
/** Returns the [FirebaseAppCheck] instance of a given [FirebaseApp]. */
43+
/**
44+
* Returns the [FirebaseAppCheck] instance of a given [FirebaseApp].
45+
* @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
46+
* respective main modules, and the Kotlin extension (KTX) APIs in
47+
* `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no
48+
* longer release KTX modules. For details, see the
49+
* [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
50+
*/
3751
@Deprecated(
38-
"Use `com.google.firebase.appcheck.Firebase.appCheck(app)` from the main module instead. The Kotlin extensions (KTX) APIs have been added to their respective main modules, and the Kotlin extension (KTX) APIs in `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules){:.external}",
52+
"Use `com.google.firebase.appcheck.Firebase.appCheck(app)` from the main module instead.",
3953
ReplaceWith(
4054
expression = "com.google.firebase.Firebase.appCheck(app)",
4155
imports = ["com.google.firebase.Firebase", "com.google.firebase.appcheck.appCheck"]
@@ -47,9 +61,14 @@ fun Firebase.appCheck(app: FirebaseApp) = FirebaseAppCheck.getInstance(app)
4761
* Destructuring declaration for [AppCheckToken] to provide token.
4862
*
4963
* @return the token of the [AppCheckToken]
64+
* @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
65+
* respective main modules, and the Kotlin extension (KTX) APIs in
66+
* `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no
67+
* longer release KTX modules. For details, see the
68+
* [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
5069
*/
5170
@Deprecated(
52-
"Use `com.google.firebase.appcheck.AppCheckToken.component1` from the main module instead. The Kotlin extensions (KTX) APIs have been added to their respective main modules, and the Kotlin extension (KTX) APIs in `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules){:.external}",
71+
"Use `com.google.firebase.appcheck.AppCheckToken.component1` from the main module instead.",
5372
ReplaceWith(expression = "component1()", imports = ["com.google.firebase.appcheck.component1"])
5473
)
5574
operator fun AppCheckToken.component1() = token
@@ -58,16 +77,28 @@ operator fun AppCheckToken.component1() = token
5877
* Destructuring declaration for [AppCheckToken] to provide expireTimeMillis.
5978
*
6079
* @return the expireTimeMillis of the [AppCheckToken]
80+
* @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
81+
* respective main modules, and the Kotlin extension (KTX) APIs in
82+
* `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no
83+
* longer release KTX modules. For details, see the
84+
* [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
6185
*/
6286
@Deprecated(
63-
"Use `com.google.firebase.appcheck.AppCheckToken.component2` from the main module instead. The Kotlin extensions (KTX) APIs have been added to their respective main modules, and the Kotlin extension (KTX) APIs in `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules){:.external}",
87+
"Use `com.google.firebase.appcheck.AppCheckToken.component2` from the main module instead.",
6488
ReplaceWith(expression = "component2()", imports = ["com.google.firebase.appcheck.component2"])
6589
)
6690
operator fun AppCheckToken.component2() = expireTimeMillis
6791

68-
/** @suppress */
92+
/**
93+
* @suppress
94+
* @deprecated **Deprecation Notice:** The Kotlin extensions (KTX) APIs have been added to their
95+
* respective main modules, and the Kotlin extension (KTX) APIs in
96+
* `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no
97+
* longer release KTX modules. For details, see the
98+
* [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
99+
*/
69100
@Deprecated(
70-
"Use `com.google.firebase.appcheck.FirebaseAppCheckKtxRegistrar` from the main module instead. The Kotlin extensions (KTX) APIs have been added to their respective main modules, and the Kotlin extension (KTX) APIs in `com.google.firebase.firebase-appcheck-ktx` are now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the [FAQ about this initiative.](https://firebase.google.com/docs/android/ktx-apis-to-main-modules){:.external}",
101+
"Use `com.google.firebase.appcheck.FirebaseAppCheckKtxRegistrar` from the main module instead.",
71102
ReplaceWith(
72103
expression = "FirebaseAppCheckKtxRegistrar",
73104
imports =

‎contributor-docs/onboarding/new_sdk.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ android {
9696
}
9797

9898
dependencies {
99-
implementation(project(":firebase-common"))
100-
implementation(project(":firebase-components"))
99+
implementation("com.google.firebase:firebase-common:20.4.0")
100+
implementation("com.google.firebase:firebase-components:17.1.3")
101101
}
102102

103103
```

‎firebase-appdistribution-api/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
# Unreleased
2+
* [changed] Added Kotlin extensions (KTX) APIs from
3+
`com.google.firebase:firebase-appdistribution-api-ktx`
4+
to `com.google.firebase:firebase-appdistribution-api` under the
5+
`com.google.firebase.appdistribution` package.
6+
For details, see the
7+
[FAQ about this initiative](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
8+
9+
* [deprecated] All the APIs from `com.google.firebase:firebase-appdistribution-api-ktx` have been
10+
added to
11+
`com.google.firebase:firebase-appdistribution-api` under the
12+
`com.google.firebase.appdistribution` package,
13+
and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-appdistribution-api-ktx`
14+
are now deprecated. As early as April 2024, we'll no longer release KTX modules. For details,
15+
see the
16+
[FAQ about this initiative](https://firebase.google.com/docs/android/ktx-apis-to-main-modules)
217

318
# 16.0.0-beta09
419
* [feature] Improved development mode to allow all API calls to be made without having to sign in.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ dependencies {
5454
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
5555
implementation 'androidx.annotation:annotation:1.1.0'
5656
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
57-
implementation(project(":firebase-common"))
58-
implementation(project(":firebase-common:ktx"))
59-
implementation(project(":firebase-components"))
57+
implementation("com.google.firebase:firebase-common:20.4.0")
58+
implementation("com.google.firebase:firebase-common-ktx:20.4.0")
59+
implementation("com.google.firebase:firebase-components:17.1.3")
6060
testImplementation "androidx.test:core:$androidxTestCoreVersion"
6161
testImplementation "com.google.truth:truth:$googleTruthVersion"
6262
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
@@ -57,9 +57,9 @@ dependencies {
5757
androidTestImplementation 'androidx.test:runner:1.2.0'
5858
androidTestImplementation 'junit:junit:4.12'
5959
api(project(":firebase-appdistribution-api"))
60-
api(project(":firebase-common"))
61-
api(project(":firebase-common:ktx"))
62-
implementation(project(":firebase-components"))
60+
api("com.google.firebase:firebase-common:20.4.0")
61+
api("com.google.firebase:firebase-common-ktx:20.4.0")
62+
implementation("com.google.firebase:firebase-components:17.1.3")
6363
testImplementation "com.google.truth:truth:$googleTruthVersion"
6464
testImplementation "org.robolectric:robolectric:$robolectricVersion"
6565
testImplementation 'junit:junit:4.12'

0 commit comments

Comments
 (0)