From 86ae4337e50259c9d8515e3335e38becee3a87cb Mon Sep 17 00:00:00 2001
From: Ben Weiss <benweiss@google.com>
Date: Mon, 9 Dec 2024 15:09:15 +0100
Subject: [PATCH] Dependency version upgrades

Change-Id: Ib4a1f9bef1dd3e1736907479125d0abb5b22e9bd
---
 app/prodRelease-badging.txt                   |  4 +--
 ...roidApplicationFirebaseConventionPlugin.kt |  6 ++++-
 gradle/libs.versions.toml                     | 26 +++++++++----------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/prodRelease-badging.txt b/app/prodRelease-badging.txt
index 9908e775a..0d770604e 100644
--- a/app/prodRelease-badging.txt
+++ b/app/prodRelease-badging.txt
@@ -1,6 +1,6 @@
-package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
 sdkVersion:'21'
-targetSdkVersion:'34'
+targetSdkVersion:'35'
 uses-permission: name='android.permission.INTERNET'
 uses-permission: name='android.permission.ACCESS_NETWORK_STATE'
 uses-permission: name='android.permission.POST_NOTIFICATIONS'
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
index 422592b8a..b0228fe93 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
@@ -21,6 +21,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.exclude
 
 class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -35,7 +36,10 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
                 val bom = libs.findLibrary("firebase-bom").get()
                 add("implementation", platform(bom))
                 "implementation"(libs.findLibrary("firebase.analytics").get())
-                "implementation"(libs.findLibrary("firebase.performance").get())
+                "implementation"(libs.findLibrary("firebase.performance").get()) {
+                    exclude(group = "com.google.protobuf", module = "protobuf-javalite")
+                    exclude(group = "com.google.firebase", module = "protolite-well-known-types")
+                }
                 "implementation"(libs.findLibrary("firebase.crashlytics").get())
             }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aaaee166a..676b99ee5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
 accompanist = "0.36.0"
-androidDesugarJdkLibs = "2.0.4"
+androidDesugarJdkLibs = "2.1.3"
 # AGP and tools should be updated together
 androidGradlePlugin = "8.6.1"
-androidTools = "31.7.2"
+androidTools = "31.7.3"
 androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
 androidxBrowser = "1.8.0"
@@ -14,11 +14,11 @@ androidxCoreSplashscreen = "1.0.1"
 androidxDataStore = "1.1.1"
 androidxEspresso = "3.6.1"
 androidxHiltNavigationCompose = "1.2.0"
-androidxLifecycle = "2.8.6"
-androidxMacroBenchmark = "1.3.1"
+androidxLifecycle = "2.8.7"
+androidxMacroBenchmark = "1.3.3"
 androidxMetrics = "1.0.0-beta01"
-androidxNavigation = "2.8.0"
-androidxProfileinstaller = "1.3.1"
+androidxNavigation = "2.8.4"
+androidxProfileinstaller = "1.4.1"
 androidxTestCore = "1.6.1"
 androidxTestExt = "1.2.1"
 androidxTestRules = "1.6.1"
@@ -26,13 +26,13 @@ androidxTestRunner = "1.6.2"
 androidxTracing = "1.3.0-alpha02"
 androidxUiAutomator = "2.3.0"
 androidxWindowManager = "1.3.0"
-androidxWork = "2.9.0"
+androidxWork = "2.9.1"
 coil = "2.7.0"
 dependencyGuard = "0.5.0"
-firebaseBom = "33.3.0"
-firebaseCrashlyticsPlugin = "2.9.9"
+firebaseBom = "33.7.0"
+firebaseCrashlyticsPlugin = "3.0.2"
 firebasePerfPlugin = "1.4.2"
-gmsPlugin = "4.4.1"
+gmsPlugin = "4.4.2"
 googleOss = "17.1.0"
 googleOssPlugin = "0.10.6"
 hilt = "2.52"
@@ -46,12 +46,12 @@ kotlinxSerializationJson = "1.6.3"
 ksp = "2.0.20-1.0.25"
 moduleGraph = "2.7.1"
 okhttp = "4.12.0"
-protobuf = "4.26.1"
+protobuf = "4.28.2"
 protobufPlugin = "0.9.4"
 retrofit = "2.11.0"
 retrofitKotlinxSerializationJson = "1.0.0"
-robolectric = "4.14"
-roborazzi = "1.32.2"
+robolectric = "4.14.1"
+roborazzi = "1.36.0"
 room = "2.6.1"
 secrets = "2.0.1"
 truth = "1.4.4"