From 53a70dcf968d7370258f58a230d1588cfe5ecf2c Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Tue, 29 Oct 2024 19:31:08 +0000 Subject: [PATCH 1/2] libs.versions.toml: add ThreeTenAbp (backport of java.time for Android) --- firebase-dataconnect/connectors/connectors.gradle.kts | 3 +++ firebase-dataconnect/testutil/testutil.gradle.kts | 2 ++ gradle/libs.versions.toml | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/firebase-dataconnect/connectors/connectors.gradle.kts b/firebase-dataconnect/connectors/connectors.gradle.kts index ddced6b91ff..0c6b8f0ce9b 100644 --- a/firebase-dataconnect/connectors/connectors.gradle.kts +++ b/firebase-dataconnect/connectors/connectors.gradle.kts @@ -70,6 +70,8 @@ dependencies { testImplementation(project(":firebase-dataconnect:testutil")) testImplementation(libs.androidx.test.junit) + testImplementation(libs.kotest.assertions) + testImplementation(libs.kotest.property) testImplementation(libs.kotlin.coroutines.test) testImplementation(libs.mockk) testImplementation(libs.robolectric) @@ -84,6 +86,7 @@ dependencies { androidTestImplementation(libs.kotest.assertions) androidTestImplementation(libs.kotest.property) androidTestImplementation(libs.kotlin.coroutines.test) + androidTestImplementation(libs.three.ten.abp) androidTestImplementation(libs.truth) androidTestImplementation(libs.truth.liteproto.extension) androidTestImplementation(libs.turbine) diff --git a/firebase-dataconnect/testutil/testutil.gradle.kts b/firebase-dataconnect/testutil/testutil.gradle.kts index 097d97c1d4c..869ed62c436 100644 --- a/firebase-dataconnect/testutil/testutil.gradle.kts +++ b/firebase-dataconnect/testutil/testutil.gradle.kts @@ -55,6 +55,7 @@ dependencies { implementation("com.google.firebase:firebase-auth:22.3.1") implementation(libs.androidx.test.junit) + implementation(libs.kotest.assertions) implementation(libs.kotest.property) implementation(libs.kotlin.coroutines.test) implementation(libs.kotlinx.coroutines.core) @@ -62,6 +63,7 @@ dependencies { implementation(libs.mockk) implementation(libs.protobuf.java.lite) implementation(libs.robolectric) + implementation(libs.three.ten.abp) implementation(libs.truth) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1a263ab12c8..084ab482310 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -94,6 +94,12 @@ quickcheck = { module = "net.java:quickcheck", version.ref = "quickcheck" } spotless-plugin-gradle = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" } turbine = { module = "app.cash.turbine:turbine", version = "1.0.0" } +# Remove three-ten-abp once minSdkVersion is changed to 26 or later, and, instead use the +# correspondingly-named classes from the java.time package, which should be drop-in replacements. +# Do not use three-ten-abp in production code (it's only for tests) because it has performance +# issues. +three-ten-abp = { module = "com.jakewharton.threetenabp:threetenabp", version = "1.4.7" } + [bundles] kotest = ["kotest-runner", "kotest-assertions", "kotest-property", "kotest-property-arbs"] playservices = ["playservices-base", "playservices-basement", "playservices-tasks"] From 76087bf083bda4db6517a3f4f9b7d1f5f9f0d338 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 30 Oct 2024 14:31:53 -0400 Subject: [PATCH 2/2] add testing prefix --- firebase-dataconnect/connectors/connectors.gradle.kts | 2 +- firebase-dataconnect/testutil/testutil.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firebase-dataconnect/connectors/connectors.gradle.kts b/firebase-dataconnect/connectors/connectors.gradle.kts index 0c6b8f0ce9b..7180bec35ad 100644 --- a/firebase-dataconnect/connectors/connectors.gradle.kts +++ b/firebase-dataconnect/connectors/connectors.gradle.kts @@ -86,7 +86,7 @@ dependencies { androidTestImplementation(libs.kotest.assertions) androidTestImplementation(libs.kotest.property) androidTestImplementation(libs.kotlin.coroutines.test) - androidTestImplementation(libs.three.ten.abp) + androidTestImplementation(libs.testonly.three.ten.abp) androidTestImplementation(libs.truth) androidTestImplementation(libs.truth.liteproto.extension) androidTestImplementation(libs.turbine) diff --git a/firebase-dataconnect/testutil/testutil.gradle.kts b/firebase-dataconnect/testutil/testutil.gradle.kts index 869ed62c436..9e03b210684 100644 --- a/firebase-dataconnect/testutil/testutil.gradle.kts +++ b/firebase-dataconnect/testutil/testutil.gradle.kts @@ -63,7 +63,7 @@ dependencies { implementation(libs.mockk) implementation(libs.protobuf.java.lite) implementation(libs.robolectric) - implementation(libs.three.ten.abp) + implementation(libs.testonly.three.ten.abp) implementation(libs.truth) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 084ab482310..9a9ff794ba2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -98,7 +98,7 @@ turbine = { module = "app.cash.turbine:turbine", version = "1.0.0" } # correspondingly-named classes from the java.time package, which should be drop-in replacements. # Do not use three-ten-abp in production code (it's only for tests) because it has performance # issues. -three-ten-abp = { module = "com.jakewharton.threetenabp:threetenabp", version = "1.4.7" } +testonly-three-ten-abp = { module = "com.jakewharton.threetenabp:threetenabp", version = "1.4.7" } [bundles] kotest = ["kotest-runner", "kotest-assertions", "kotest-property", "kotest-property-arbs"]