From 6153e580f3980a4567a23485e2d439a890ee016f Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Tue, 17 Oct 2023 17:52:50 -0700
Subject: [PATCH] Specify gradle dependency versions in ONLY one place (#2399)

---
 .github/dependabot.yml              |  2 ++
 kotlin/android/app/build.gradle.kts |  8 +++-----
 kotlin/android/build.gradle.kts     | 21 +++++++--------------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d843cdda6..b7b62ef8e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -39,6 +39,8 @@ updates:
     directory: "kotlin/android/"
     schedule:
       interval: "daily"
+    # Requires using a newer Java runtime
+    ignore: "org.jetbrains.kotlin:kotlin-gradle-plugin"
   - package-ecosystem: "gradle"
     directory: "kotlin/android/app/"
     schedule:
diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts
index 81e970e06..61e6d19e8 100644
--- a/kotlin/android/app/build.gradle.kts
+++ b/kotlin/android/app/build.gradle.kts
@@ -1,10 +1,8 @@
 plugins {
     id("com.android.application")
     id("kotlin-android")
-    id("dagger.hilt.android.plugin")
+    id("com.google.dagger.hilt.android")
     id("kotlin-parcelize")
-    id("androidx.navigation.safeargs")
-    id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
     id("com.google.gms.google-services")
     id("com.google.firebase.crashlytics")
     id("com.diffplug.spotless") version "6.22.0"
@@ -171,7 +169,7 @@ dependencies {
     implementation("androidx.core:core-ktx:$coreVersion")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
     kapt("androidx.hilt:hilt-compiler:1.0.0")
-    kapt("com.google.dagger:hilt-android-compiler:2.48.1")
+    kapt("com.google.dagger:hilt-android-compiler")
 
     // Retrofit 2
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
@@ -197,7 +195,7 @@ dependencies {
     implementation("androidx.browser:browser:1.5.0")
 
     // Import the BoM for the Firebase platform
-    implementation(platform("com.google.firebase:firebase-bom:32.2.2"))
+    implementation(platform("com.google.firebase:firebase-bom:32.3.1"))
 
     // Add the dependencies for the Crashlytics and Analytics libraries
     // When using the BoM, you don't specify versions in Firebase library dependencies
diff --git a/kotlin/android/build.gradle.kts b/kotlin/android/build.gradle.kts
index d5f87c64e..f86635b81 100644
--- a/kotlin/android/build.gradle.kts
+++ b/kotlin/android/build.gradle.kts
@@ -6,24 +6,17 @@ buildscript {
         maven(url = "https://jitpack.io")
         maven(url = "https://plugins.gradle.org/m2/")
     }
-    dependencies {
-        // Should support Gradle version
-        // See https://developer.android.com/build/releases/gradle-plugin
-        classpath("com.android.tools.build:gradle:8.1.2")
-
-        // Should match Kotlin compiler version
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
-        classpath("com.google.dagger:hilt-android-gradle-plugin:2.44.1")
-        classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
-        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3")
-        classpath("org.mozilla.rust-android-gradle:plugin:0.9.3")
-        classpath("com.google.gms:google-services:4.3.15")
-        classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.8")
-    }
 }
 
 plugins {
+    id("org.jetbrains.kotlin.android") version "1.8.22" apply false
+    id("com.android.application") version "8.1.2" apply false
+    id("com.android.library") version "8.1.2" apply false
     id("com.google.firebase.appdistribution") version "4.0.0" apply false
+    id("com.google.dagger.hilt.android") version "2.44" apply false
+    id("com.google.gms.google-services") version "4.4.0" apply false
+    id("org.mozilla.rust-android-gradle.rust-android") version "0.9.3" apply false
+    id("com.google.firebase.crashlytics") version "2.9.9" apply false
 }
 
 tasks.register("clean", Delete::class) {