Skip to content

Commit 83992a6

Browse files
chore: Resolve warnings in Gradle scripts (#2972)
Co-authored-by: Vincent Tran <[email protected]>
1 parent 7581848 commit 83992a6

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

build.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ allprojects {
5959
}
6060

6161
tasks.register<Delete>("clean").configure {
62-
delete(rootProject.buildDir)
62+
delete(rootProject.layout.buildDirectory)
6363
}
6464

6565
val internalApiAnnotations = listOf(
@@ -132,7 +132,6 @@ fun Project.configureAndroid() {
132132
val sdkVersionName = findProperty("VERSION_NAME") ?: rootProject.findProperty("VERSION_NAME")
133133

134134
configure<LibraryExtension> {
135-
buildToolsVersion = "30.0.3"
136135
compileSdk = 34
137136

138137
buildFeatures {
@@ -142,7 +141,6 @@ fun Project.configureAndroid() {
142141

143142
defaultConfig {
144143
minSdk = 24
145-
targetSdk = 30
146144
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
147145
testInstrumentationRunnerArguments += "clearPackageData" to "true"
148146
consumerProguardFiles += rootProject.file("configuration/consumer-rules.pro")
@@ -170,7 +168,7 @@ fun Project.configureAndroid() {
170168
// Needed when running integration tests. The oauth2 library uses relies on two
171169
// dependencies (Apache's httpcore and httpclient), both of which include
172170
// META-INF/DEPENDENCIES. Tried a couple other options to no avail.
173-
packagingOptions {
171+
packaging {
174172
resources.excludes.addAll(
175173
listOf(
176174
"META-INF/DEPENDENCIES",

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
agp = "8.4.0"
33
androidx-activity = "1.2.0"
4-
androidx-annotation = "1.1.0"
4+
androidx-annotation = "1.9.1"
55
androidx-appcompat = "1.2.0"
66
androidx-browser = "1.4.0"
77
androidx-concurrent = "1.1.0"

0 commit comments

Comments
 (0)