Skip to content

chore: Resolve warnings in Gradle scripts #2972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 16, 2025
Merged

chore: Resolve warnings in Gradle scripts #2972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32c91d0
Resolve warnings in Gradle scripts
mattcreaser Jan 14, 2025
b743fbd
Merge branch 'main' into mattcreaser/gradle-warnings
mattcreaser Jan 14, 2025
9d202ba
Merge branch 'main' into mattcreaser/gradle-warnings
vincetran Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions build.gradle.kts
View file
Open in desktop
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
View file
Open in desktop
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
Loading