From ae79f4bb542dfd9fc993b46cf15a6c8ec3c18368 Mon Sep 17 00:00:00 2001
From: Eric Labelle <2840799+eric-labelle@users.noreply.github.com>
Date: Thu, 23 May 2024 11:04:43 -0400
Subject: [PATCH] Bump to AGP 8.4.1 and Gradle 8.7 (#121)

* Bump Gradle to 8.7

* Bump to AGP 8.4.1

* Copy changes from 8.4.1 to DependencyConfigurator
---
 .../android/build/gradle/internal/DependencyConfigurator.kt | 6 +++---
 gradle/libs.versions.toml                                   | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/agp-patch/src/main/kotlin/com/android/build/gradle/internal/DependencyConfigurator.kt b/agp-patch/src/main/kotlin/com/android/build/gradle/internal/DependencyConfigurator.kt
index dcedc2c..11b0421 100644
--- a/agp-patch/src/main/kotlin/com/android/build/gradle/internal/DependencyConfigurator.kt
+++ b/agp-patch/src/main/kotlin/com/android/build/gradle/internal/DependencyConfigurator.kt
@@ -495,7 +495,7 @@ class DependencyConfigurator(
             experimentalPropertiesApiGenerator
               ?: project.dependencies.create(
                 projectServices.projectOptions.get(StringOption.ANDROID_PRIVACY_SANDBOX_SDK_API_GENERATOR)
-                  ?: "androidx.privacysandbox.tools:tools-apigenerator:1.0.0-alpha03"
+                    ?: MavenCoordinates.ANDROIDX_PRIVACY_SANDBOX_SDK_API_GENERATOR.toString()
               ) as Dependency
 
           val experimentalPropertiesRuntimeApigeneratorDependencies =
@@ -505,7 +505,7 @@ class DependencyConfigurator(
               ?: (projectServices.projectOptions
                 .get(StringOption.ANDROID_PRIVACY_SANDBOX_SDK_API_GENERATOR_GENERATED_RUNTIME_DEPENDENCIES)
                 ?.split(",")
-                ?: listOf("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")).map {
+                ?: listOf(MavenCoordinates.ORG_JETBRAINS_KOTLINX_KOTLINX_COROUTINES_ANDROID.toString())).map {
                   project.dependencies.create(it)
                 }
 
@@ -524,7 +524,7 @@ class DependencyConfigurator(
           params.bootstrapClasspath.from(bootstrapCreationConfig.fullBootClasspath)
 
           val kotlinCompiler = project.configurations.detachedConfiguration(
-            project.dependencies.create("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10")
+                    project.dependencies.create(MavenCoordinates.KOTLIN_COMPILER.toString())
           )
           kotlinCompiler.isCanBeConsumed = false
           kotlinCompiler.isCanBeResolved = true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9b2f871..e820d0b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-agp = "8.3.2"               # keep in sync with android-tools
-android-tools = "31.3.2"    # = 23.0.0 + agp
+agp = "8.4.1"               # keep in sync with android-tools
+android-tools = "31.4.1"    # = 23.0.0 + agp
 compilerTesting = "0.2.1"
 compose = "1.4.7"
 kotlin = "1.8.21"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 216f4e3..017240f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Oct 20 09:50:20 EDT 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists