From 1b12b0a7102dd77115f8991e637d8e82ba26baa4 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Thu, 28 Nov 2024 00:47:13 -0500 Subject: [PATCH] Fix data-collection-tests The dependencies were pulling kotlin stdlib versions that were breaking version alignment. The solution is to depend on the BOM as decribed in https://kotlinlang.org/docs/whatsnew18.html#usage-of-the-latest-kotlin-stdlib-version-in-transitive-dependencies --- .../data-collection-tests/data-collection-tests.gradle.kts | 1 + gradle/libs.versions.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/firebase-common/data-collection-tests/data-collection-tests.gradle.kts b/firebase-common/data-collection-tests/data-collection-tests.gradle.kts index b4558a6432b..ad1285a8cba 100644 --- a/firebase-common/data-collection-tests/data-collection-tests.gradle.kts +++ b/firebase-common/data-collection-tests/data-collection-tests.gradle.kts @@ -36,6 +36,7 @@ android { dependencies { implementation("com.google.firebase:firebase-common:21.0.0") implementation("com.google.firebase:firebase-components:18.0.0") + implementation(platform(libs.kotlin.bom)) testImplementation(libs.androidx.core) testImplementation(libs.androidx.test.junit) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a0dcc4991a5..9e47525d6f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -62,6 +62,7 @@ grpc-protoc-gen-kotlin = { module = "io.grpc:protoc-gen-grpc-kotlin", version.re grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" } javax-annotation-jsr250 = { module = "javax.annotation:jsr250-api", version = "1.0" } javax-inject = { module = "javax.inject:javax.inject", version = "1" } +kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } kotlin-coroutines-tasks = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "coroutines" }