From 83992a63afd44c30147b4f75606b6bb26a4ae1b3 Mon Sep 17 00:00:00 2001
From: Matt Creaser <mattwcc@amazon.com>
Date: Thu, 16 Jan 2025 10:09:33 -0400
Subject: [PATCH] chore: Resolve warnings in Gradle scripts (#2972)

Co-authored-by: Vincent Tran <hello@vincetran.me>
---
 build.gradle.kts          | 6 ++----
 gradle/libs.versions.toml | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4441e6d20..0d0c1f66a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -59,7 +59,7 @@ allprojects {
 }
 
 tasks.register<Delete>("clean").configure {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
 
 val internalApiAnnotations = listOf(
@@ -132,7 +132,6 @@ fun Project.configureAndroid() {
         val sdkVersionName = findProperty("VERSION_NAME") ?: rootProject.findProperty("VERSION_NAME")
 
         configure<LibraryExtension> {
-            buildToolsVersion = "30.0.3"
             compileSdk = 34
 
             buildFeatures {
@@ -142,7 +141,6 @@ fun Project.configureAndroid() {
 
             defaultConfig {
                 minSdk = 24
-                targetSdk = 30
                 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 testInstrumentationRunnerArguments += "clearPackageData" to "true"
                 consumerProguardFiles += rootProject.file("configuration/consumer-rules.pro")
@@ -170,7 +168,7 @@ fun Project.configureAndroid() {
             // Needed when running integration tests. The oauth2 library uses relies on two
             // dependencies (Apache's httpcore and httpclient), both of which include
             // META-INF/DEPENDENCIES. Tried a couple other options to no avail.
-            packagingOptions {
+            packaging {
                 resources.excludes.addAll(
                     listOf(
                         "META-INF/DEPENDENCIES",
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 87370d50a..8d08b2237 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 agp = "8.4.0"
 androidx-activity = "1.2.0"
-androidx-annotation = "1.1.0"
+androidx-annotation = "1.9.1"
 androidx-appcompat = "1.2.0"
 androidx-browser = "1.4.0"
 androidx-concurrent = "1.1.0"