Skip to content

Commit

Permalink
chore: Resolve warnings in Gradle scripts (#2972)
Browse files Browse the repository at this point in the history
Co-authored-by: Vincent Tran <hello@vincetran.me>
  • Loading branch information
mattcreaser and vincetran authored Jan 16, 2025
1 parent 7581848 commit 83992a6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ allprojects {
}

tasks.register<Delete>("clean").configure {
delete(rootProject.buildDir)
delete(rootProject.layout.buildDirectory)
}

val internalApiAnnotations = listOf(
Expand Down Expand Up @@ -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 {
Expand All @@ -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")
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 83992a6

Please sign in to comment.