Skip to content

Commit 5992055

Browse files
committed
Workaround for b/328687152
1 parent de611de commit 5992055

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

firebase-sessions/firebase-sessions.gradle.kts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,19 @@ dependencies {
7272
api("com.google.firebase:firebase-encoders:17.0.0")
7373
api("com.google.firebase:firebase-encoders-json:18.0.1")
7474
implementation(libs.androidx.annotation)
75-
implementation(libs.androidx.datastore.preferences)
7675
compileOnly(libs.errorprone.annotations)
7776

77+
// Workaround for b/328687152, AndroidX desktop artifacts packaged in Android APK
78+
val datastoreVersion = "1.1.2"
79+
implementation("androidx.datastore:datastore-preferences-android:$datastoreVersion") {
80+
exclude(group = "androidx.datastore", module = "datastore")
81+
exclude(group = "androidx.datastore", module = "datastore-core")
82+
}
83+
implementation("androidx.datastore:datastore-android:$datastoreVersion") {
84+
exclude(group = "androidx.datastore", module = "datastore-core")
85+
}
86+
implementation("androidx.datastore:datastore-core-android:$datastoreVersion")
87+
7888
runtimeOnly("com.google.firebase:firebase-installations:18.0.0") {
7989
exclude(group = "com.google.firebase", module = "firebase-common")
8090
exclude(group = "com.google.firebase", module = "firebase-components")

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ constraintlayout = "2.1.4"
1818
coreKtx = "1.12.0"
1919
coroutines = "1.7.3"
2020
dagger = "2.43.2"
21-
datastorePreferences = "1.1.2"
2221
dexmaker = "2.28.1"
2322
dexmakerVersion = "1.2"
2423
espressoCore = "3.6.1"
@@ -92,7 +91,6 @@ androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "card
9291
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
9392
androidx-core = { module = "androidx.core:core", version = "1.2.0" }
9493
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
95-
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
9694
androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
9795
androidx-espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espressoCore" }
9896
androidx-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espressoCore" }

0 commit comments

Comments
 (0)