Update datastore dependency to 1.1.3

Author: mrober

firebase-sessions/CHANGELOG.md

@@ -1,7 +1,9 @@
 # Unreleased
 
-* [changed] Updated datastore dependency to `1.1.2` to
+* [changed] Updated datastore dependency to `1.1.3` to
   fix [CVE-2024-7254](https://github.com/advisories/GHSA-735f-pc8j-v9w8).
+
+# 2.0.9
 * [fixed] Make AQS resilient to background init in multi-process apps.
 
 # 2.0.7

firebase-sessions/firebase-sessions.gradle.kts

@@ -72,19 +72,9 @@ dependencies {
   api("com.google.firebase:firebase-encoders:17.0.0")
   api("com.google.firebase:firebase-encoders-json:18.0.1")
   implementation(libs.androidx.annotation)
+  implementation(libs.androidx.datastore.preferences)
   compileOnly(libs.errorprone.annotations)
 
-  // Workaround for b/328687152, AndroidX desktop artifacts packaged in Android APK
-  val datastoreVersion = "1.1.2"
-  implementation("androidx.datastore:datastore-preferences-android:$datastoreVersion") {
-    exclude(group = "androidx.datastore", module = "datastore")
-    exclude(group = "androidx.datastore", module = "datastore-core")
-  }
-  implementation("androidx.datastore:datastore-android:$datastoreVersion") {
-    exclude(group = "androidx.datastore", module = "datastore-core")
-  }
-  implementation("androidx.datastore:datastore-core-android:$datastoreVersion")
-
   runtimeOnly("com.google.firebase:firebase-installations:18.0.0") {
     exclude(group = "com.google.firebase", module = "firebase-common")
     exclude(group = "com.google.firebase", module = "firebase-components")

gradle/libs.versions.toml

@@ -18,6 +18,7 @@ constraintlayout = "2.1.4"
 coreKtx = "1.12.0"
 coroutines = "1.7.3"
 dagger = "2.43.2"
+datastore = "1.1.3"
 dexmaker = "2.28.1"
 dexmakerVersion = "1.2"
 espressoCore = "3.6.1"
@@ -91,6 +92,7 @@ androidx-cardview = { module = "androidx.cardview:cardview", version.ref = "card
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 androidx-core = { module = "androidx.core:core", version = "1.2.0" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
+androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
 androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
 androidx-espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espressoCore" }
 androidx-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espressoCore" }

smoke-tests/build.gradle

@@ -24,12 +24,14 @@ buildscript {
 
   dependencies {
     classpath "com.android.tools.build:gradle:8.3.2"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0"
     classpath "com.google.gms:google-services:4.3.14"
     classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
   }
 }
 
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 
 android {
   compileSdkVersion 34