From 308a8a564cf2579f30a1341bb76e6bb0e3e64a58 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Tue, 5 Aug 2025 16:31:44 -0500
Subject: [PATCH] Update to Gradle v9.0.0 (#5642)

---
 app/build.gradle.kts                     | 2 --
 authenticator/build.gradle.kts           | 2 --
 authenticatorbridge/build.gradle.kts     | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 settings.gradle.kts                      | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8a6911b8fb..b11f6aec8c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -58,8 +58,6 @@ android {
         versionCode = libs.versions.appVersionCode.get().toInt()
         versionName = libs.versions.appVersionName.get()
 
-        setProperty("archivesBaseName", "com.x8bit.bitwarden")
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField(
diff --git a/authenticator/build.gradle.kts b/authenticator/build.gradle.kts
index 3d32a00ea2..74d75ca3b8 100644
--- a/authenticator/build.gradle.kts
+++ b/authenticator/build.gradle.kts
@@ -34,8 +34,6 @@ android {
         versionName = libs.versions.appVersionName.get()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        setProperty("archivesBaseName", "com.bitwarden.authenticator")
     }
 
     androidResources {
diff --git a/authenticatorbridge/build.gradle.kts b/authenticatorbridge/build.gradle.kts
index c9ed1fc3f4..3676c253be 100644
--- a/authenticatorbridge/build.gradle.kts
+++ b/authenticatorbridge/build.gradle.kts
@@ -16,7 +16,7 @@ android {
 
     defaultConfig {
         // This min value is selected to accommodate known consumers
-        minSdk = 28
+        minSdk = libs.versions.minSdkBwa.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 515da9b617..ecfe799090 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed May 07 19:53:50 CDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e5a41f404e..0c845ca0d6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -43,7 +43,6 @@ buildCache {
     local {
         isEnabled = true
         directory = File(rootDir, "build-cache")
-        removeUnusedEntriesAfterDays = 15
     }
 }