Skip to content

Commit

Permalink
update common & component versions (#5902)
Browse files Browse the repository at this point in the history
Co-authored-by: Rodrigo Lazo Paz <rlazo@google.com>
Co-authored-by: Rodrigo Lazo <rlazo@users.noreply.github.com>
  • Loading branch information
3 people committed Apr 25, 2024
1 parent 75a3b88 commit a350561
Show file tree
Hide file tree
Showing 68 changed files with 175 additions and 169 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ dependencies {
api project(':appcheck:firebase-appcheck')
api project(':appcheck:firebase-appcheck-debug')
api 'com.google.firebase:firebase-appcheck-interop:17.0.0'
api 'com.google.firebase:firebase-common:20.4.2'
api 'com.google.firebase:firebase-common-ktx:20.4.2'
api 'com.google.firebase:firebase-components:17.1.5'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-common-ktx:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'

implementation "androidx.test:core:$androidxTestCoreVersion"
implementation 'com.google.android.gms:play-services-base:18.0.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ dependencies {

api project(':appcheck:firebase-appcheck')
api 'com.google.firebase:firebase-annotations:16.2.0'
api 'com.google.firebase:firebase-common:20.4.2'
api 'com.google.firebase:firebase-common-ktx:20.4.2'
api 'com.google.firebase:firebase-components:17.1.5'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-common-ktx:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'

implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ dependencies {

api project(':appcheck:firebase-appcheck')
api 'com.google.firebase:firebase-annotations:16.2.0'
api 'com.google.firebase:firebase-common:20.4.2'
api 'com.google.firebase:firebase-common-ktx:20.4.2'
api 'com.google.firebase:firebase-components:17.1.5'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-common-ktx:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'

implementation 'com.google.android.gms:play-services-base:18.0.1'
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
Expand Down
6 changes: 3 additions & 3 deletions appcheck/firebase-appcheck/firebase-appcheck.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ dependencies {
api 'com.google.android.gms:play-services-tasks:18.1.0'
api 'com.google.firebase:firebase-annotations:16.2.0'
api "com.google.firebase:firebase-appcheck-interop:17.1.0"
api("com.google.firebase:firebase-common:20.4.2")
api("com.google.firebase:firebase-common-ktx:20.4.2")
api("com.google.firebase:firebase-components:17.1.5")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")
api("com.google.firebase:firebase-components:18.0.0")

implementation 'androidx.annotation:annotation:1.1.0'
implementation 'com.google.android.gms:play-services-base:18.1.0'
Expand Down
6 changes: 3 additions & 3 deletions appcheck/firebase-appcheck/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ android {

dependencies {
api(project(":appcheck:firebase-appcheck"))
api("com.google.firebase:firebase-common:20.4.2")
api("com.google.firebase:firebase-common-ktx:20.4.2")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")

implementation("com.google.firebase:firebase-components:17.1.5")
implementation("com.google.firebase:firebase-components:18.0.0")

testImplementation "com.google.truth:truth:$googleTruthVersion"
testImplementation 'junit:junit:4.12'
Expand Down
4 changes: 2 additions & 2 deletions contributor-docs/onboarding/new_sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ android {
}

dependencies {
implementation("com.google.firebase:firebase-common:20.4.2")
implementation("com.google.firebase:firebase-components:17.1.5")
implementation("com.google.firebase:firebase-common:21.0.0")
implementation("com.google.firebase:firebase-components:18.0.0")
}

```
Expand Down
6 changes: 4 additions & 2 deletions firebase-abt/firebase-abt.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,16 @@ android {
}

dependencies {
api 'com.google.firebase:firebase-common:20.4.2'
api 'com.google.firebase:firebase-components:17.1.5'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'

implementation 'com.google.android.gms:play-services-basement:18.1.0'
implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
exclude group: "com.google.firebase", module: "firebase-common"
}

implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")

testImplementation 'androidx.test:runner:1.2.0'
testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
testImplementation 'com.google.truth:truth:0.44'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
compileSdkVersion project.compileSdkVersion

defaultConfig {
minSdkVersion 16
minSdkVersion 21
targetSdkVersion project.targetSdkVersion
multiDexEnabled true
versionName version
Expand All @@ -48,9 +48,9 @@ android {

dependencies {
api 'com.google.android.gms:play-services-tasks:18.0.1'
api("com.google.firebase:firebase-common:20.4.2")
api("com.google.firebase:firebase-common-ktx:20.4.2")
api("com.google.firebase:firebase-components:17.1.5")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")
api("com.google.firebase:firebase-components:18.0.0")

implementation 'androidx.annotation:annotation:1.1.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
Expand Down
6 changes: 3 additions & 3 deletions firebase-appdistribution-api/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ android {

dependencies {
api(project(":firebase-appdistribution-api"))
api("com.google.firebase:firebase-common:20.4.2")
api("com.google.firebase:firebase-common-ktx:20.4.2")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")

implementation("com.google.firebase:firebase-components:17.1.5")
implementation("com.google.firebase:firebase-components:18.0.0")

testImplementation "com.google.truth:truth:$googleTruthVersion"
testImplementation 'junit:junit:4.12'
Expand Down
5 changes: 3 additions & 2 deletions firebase-appdistribution/firebase-appdistribution.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ dependencies {
exclude group: 'com.google.firebase', module: 'firebase-common'
exclude group: 'com.google.firebase', module: 'firebase-components'
}
api 'com.google.firebase:firebase-common:20.4.2'
api 'com.google.firebase:firebase-components:17.1.5'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'
api('com.google.firebase:firebase-installations-interop:17.1.0') {
exclude group: 'com.google.firebase', module: 'firebase-common'
exclude group: 'com.google.firebase', module: 'firebase-components'
Expand All @@ -72,6 +72,7 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
implementation libs.javax.inject
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")

compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'

Expand Down
2 changes: 1 addition & 1 deletion firebase-appdistribution/test-app/test-app.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ dependencies {
implementation "androidx.fragment:fragment-ktx:1.5.3"
implementation "com.google.android.gms:play-services-tasks:18.0.2"
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
implementation 'com.google.firebase:firebase-common-ktx:21.0.0'
// Shake detection
implementation 'com.squareup:seismic:1.0.3'
// Other dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ android {
}

dependencies {
implementation("com.google.firebase:firebase-common:20.3.1")
implementation("com.google.firebase:firebase-components:17.1.5")
implementation("com.google.firebase:firebase-common:21.0.0")
implementation("com.google.firebase:firebase-components:18.0.0")

testImplementation(libs.androidx.core)
testImplementation(libs.androidx.test.junit)
Expand Down
2 changes: 1 addition & 1 deletion firebase-common/firebase-common.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ android {
dependencies {
api(libs.kotlin.coroutines.tasks)

api("com.google.firebase:firebase-components:17.1.5")
api("com.google.firebase:firebase-components:18.0.0")
api("com.google.firebase:firebase-annotations:16.2.0")
implementation(libs.androidx.annotation)
implementation(libs.androidx.futures)
Expand Down
2 changes: 1 addition & 1 deletion firebase-common/ktx/ktx.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {

dependencies {
api(project(":firebase-common"))
implementation("com.google.firebase:firebase-components:17.1.5")
implementation("com.google.firebase:firebase-components:18.0.0")
implementation("com.google.firebase:firebase-annotations:16.2.0")
testImplementation(libs.androidx.test.core)
testImplementation(libs.junit)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ android {

dependencies {
implementation("com.google.android.play:feature-delivery:2.0.0")
api("com.google.firebase:firebase-common:20.3.1")
api("com.google.firebase:firebase-components:17.1.0")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-components:18.0.0")
}
6 changes: 3 additions & 3 deletions firebase-config/bandwagoner/bandwagoner.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ dependencies {
// "implementation" dependencies. The alternative would be to make common an "api" dep of remote-config.
// Released artifacts don't need these dependencies since they don't use `project` to refer
// to Remote Config.
implementation("com.google.firebase:firebase-common:20.4.2")
implementation("com.google.firebase:firebase-common-ktx:20.4.2")
implementation("com.google.firebase:firebase-components:17.1.5")
implementation("com.google.firebase:firebase-common:21.0.0")
implementation("com.google.firebase:firebase-common-ktx:21.0.0")
implementation("com.google.firebase:firebase-components:18.0.0")
implementation("com.google.firebase:firebase-installations-interop:17.1.1") {
exclude group: 'com.google.firebase', module: 'firebase-common'
exclude group: 'com.google.firebase', module: 'firebase-components'
Expand Down
8 changes: 4 additions & 4 deletions firebase-config/firebase-config.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ android {
compileSdk = targetSdkVersion

defaultConfig {
minSdk = 16
minSdk = 21
targetSdk = targetSdkVersion
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -68,9 +68,9 @@ dependencies {
exclude(group = "com.google.firebase", module = "firebase-common")
exclude(group = "com.google.firebase", module = "firebase-components")
}
api("com.google.firebase:firebase-common:20.4.2")
api("com.google.firebase:firebase-common-ktx:20.4.2")
api("com.google.firebase:firebase-components:17.1.5")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")
api("com.google.firebase:firebase-components:18.0.0")
api("com.google.firebase:firebase-installations:17.2.0")

// Kotlin & Android
Expand Down
6 changes: 3 additions & 3 deletions firebase-config/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ android {

dependencies {
api(project(":firebase-config"))
api("com.google.firebase:firebase-common:20.4.2")
api("com.google.firebase:firebase-common-ktx:20.4.2")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")
api("com.google.firebase:firebase-installations:17.2.0")

implementation('com.google.firebase:firebase-abt:21.1.1') {
exclude group: 'com.google.firebase', module: 'firebase-common'
exclude group: 'com.google.firebase', module: 'firebase-components'
}
implementation("com.google.firebase:firebase-components:17.1.5")
implementation("com.google.firebase:firebase-components:18.0.0")
implementation 'com.google.firebase:firebase-installations-interop:17.1.0'

testImplementation "androidx.test:core:$androidxTestCoreVersion"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,21 +287,6 @@ public void fetch_requestEncodesLanguageSubtags() throws Exception {
assertThat(requestBody.get(LANGUAGE_CODE)).isEqualTo(languageTag);
}

@Test
@Config(sdk = Build.VERSION_CODES.KITKAT /* 19 */)
public void fetch_localeUsesToStringBelowLollipop() throws Exception {
String languageTag = "zh-Hant-TW"; // Taiwan Chinese in traditional script
String languageString = "zh_TW_#Hant";
context.getResources().getConfiguration().setLocale(Locale.forLanguageTag(languageTag));

setServerResponseTo(noChangeResponseBody, SECOND_ETAG);

fetch(FIRST_ETAG);

JSONObject requestBody = new JSONObject(fakeHttpURLConnection.getOutputStream().toString());
assertThat(requestBody.get(LANGUAGE_CODE)).isEqualTo(languageString);
}

@Test
public void fetch_installationIdIsNull_throwsFRCClientException() throws Exception {
setServerResponseTo(noChangeResponseBody, SECOND_ETAG);
Expand Down
8 changes: 4 additions & 4 deletions firebase-config/test-app/test-app.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ dependencies {
// "implementation" dependencies. The alternative would be to make common an "api" dep of remote-config.
// Released artifacts don't need these dependencies since they don't use `project` to refer
// to Remote Config.
implementation("com.google.firebase:firebase-common:20.3.3")
implementation("com.google.firebase:firebase-common-ktx:20.3.3")
implementation("com.google.firebase:firebase-components:17.1.1")
implementation("com.google.firebase:firebase-common:21.0.0")
implementation("com.google.firebase:firebase-common-ktx:21.0.0")
implementation("com.google.firebase:firebase-components:18.0.0")

implementation("com.google.firebase:firebase-installations-interop:17.1.0")
runtimeOnly("com.google.firebase:firebase-installations:17.1.4")
Expand All @@ -81,7 +81,7 @@ dependencies {
implementation("androidx.core:core-ktx:1.9.0")
implementation("com.google.android.material:material:1.8.0")

androidTestImplementation("com.google.firebase:firebase-common-ktx:20.3.2")
androidTestImplementation("com.google.firebase:firebase-common-ktx:21.0.0")
androidTestImplementation(libs.androidx.test.junit)
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation(libs.truth)
Expand Down
6 changes: 3 additions & 3 deletions firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ thirdPartyLicenses {

dependencies {
api project(':firebase-crashlytics')
api "com.google.firebase:firebase-common:20.4.2"
api "com.google.firebase:firebase-common-ktx:20.4.2"
api "com.google.firebase:firebase-components:17.1.5"
api "com.google.firebase:firebase-common:21.0.0"
api "com.google.firebase:firebase-common-ktx:21.0.0"
api "com.google.firebase:firebase-components:18.0.0"

implementation 'com.google.android.gms:play-services-basement:18.1.0'

Expand Down
7 changes: 4 additions & 3 deletions firebase-crashlytics/firebase-crashlytics.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ dependencies {
api(project(":firebase-sessions"))
api "com.google.android.gms:play-services-tasks:18.0.1"
api 'com.google.firebase:firebase-annotations:16.2.0'
api("com.google.firebase:firebase-common:20.4.2")
api("com.google.firebase:firebase-common-ktx:20.4.2")
api("com.google.firebase:firebase-components:17.1.5")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")
api("com.google.firebase:firebase-components:18.0.0")
api 'com.google.firebase:firebase-config-interop:16.0.0'
api 'com.google.firebase:firebase-encoders:17.0.0'
api 'com.google.firebase:firebase-encoders-json:18.0.0'
Expand All @@ -84,6 +84,7 @@ dependencies {
implementation 'com.google.android.datatransport:transport-backend-cct:3.1.9'
implementation 'com.google.android.datatransport:transport-runtime:3.1.9'
implementation(libs.androidx.annotation)
compileOnly(libs.errorprone.annotations)

compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'

Expand Down
6 changes: 3 additions & 3 deletions firebase-crashlytics/ktx/ktx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ android {

dependencies {
api(project(":firebase-crashlytics"))
api("com.google.firebase:firebase-common:20.4.2")
api("com.google.firebase:firebase-common-ktx:20.4.2")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")

implementation("com.google.firebase:firebase-components:17.1.5")
implementation("com.google.firebase:firebase-components:18.0.0")

androidTestImplementation(libs.androidx.test.junit)
androidTestImplementation(libs.androidx.test.runner)
Expand Down
6 changes: 3 additions & 3 deletions firebase-database/firebase-database.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ android {

dependencies {
api("com.google.firebase:firebase-appcheck-interop:17.1.0")
api("com.google.firebase:firebase-common:20.4.2")
api("com.google.firebase:firebase-common-ktx:20.4.2")
api("com.google.firebase:firebase-components:17.1.5")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")
api("com.google.firebase:firebase-components:18.0.0")
api("com.google.firebase:firebase-auth-interop:20.0.0") {
exclude(group = "com.google.firebase", module = "firebase-common")
exclude(group = "com.google.firebase", module = "firebase-components")
Expand Down
6 changes: 3 additions & 3 deletions firebase-database/ktx/ktx.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ android {
}

dependencies {
api("com.google.firebase:firebase-common:20.4.2")
api("com.google.firebase:firebase-common-ktx:20.4.2")
api("com.google.firebase:firebase-common:21.0.0")
api("com.google.firebase:firebase-common-ktx:21.0.0")
api(project(":firebase-database"))

implementation("com.google.firebase:firebase-components:17.1.5")
implementation("com.google.firebase:firebase-components:18.0.0")

testImplementation(libs.androidx.test.core)
testImplementation(libs.junit)
Expand Down
5 changes: 3 additions & 2 deletions firebase-datatransport/firebase-datatransport.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,14 @@ android {
}

dependencies {
api 'com.google.firebase:firebase-common:20.4.2'
api 'com.google.firebase:firebase-components:17.1.5'
api 'com.google.firebase:firebase-common:21.0.0'
api 'com.google.firebase:firebase-components:18.0.0'

implementation 'androidx.annotation:annotation:1.1.0'
implementation 'com.google.android.datatransport:transport-api:3.1.0'
implementation 'com.google.android.datatransport:transport-backend-cct:3.2.0'
implementation 'com.google.android.datatransport:transport-runtime:3.2.0'
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22")

testImplementation "androidx.test:core:$androidxTestCoreVersion"
testImplementation 'androidx.test:runner:1.2.0'
Expand Down
Loading

0 comments on commit a350561

Please sign in to comment.