Skip to content
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

Jump to bottom

Update gradle build tool from 8.0.2 to 8.1.1 #2158

Merged
merged 3 commits into from
Sep 12, 2023
Merged

Update gradle build tool from 8.0.2 to 8.1.1 #2158

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
79db7c1
Update gradle build tool from 8.0.2 t0 8.1.1
jingtang10 Sep 8, 2023
4c3739c
Remove redundant compile options
jingtang10 Sep 11, 2023
5af6063
Merge branch 'master' into gradle
jingtang10 Sep 12, 2023
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
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repositories {
dependencies {
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.6.0")

implementation("com.android.tools.build:gradle:8.0.2")
implementation("com.android.tools.build:gradle:8.1.1")

implementation("app.cash.licensee:licensee-gradle-plugin:1.3.0")
implementation("com.osacky.flank.gradle:fladle:0.17.4")
Expand Down
2 changes: 0 additions & 2 deletions catalog/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ android {
// Flag to enable support for the new language APIs
// See https://developer.android.com/studio/write/java8-support
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}

packaging {
Expand Down
4 changes: 0 additions & 4 deletions common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ android {
defaultConfig { minSdk = Sdk.minSdk }
configureJacocoTestOptions()
kotlin { jvmToolchain(11) }
compileOptions {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}
}

configurations { all { exclude(module = "xpp3") } }
Expand Down
4 changes: 0 additions & 4 deletions contrib/barcode/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ android {

testOptions { animationsDisabled = true }
kotlin { jvmToolchain(11) }
compileOptions {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}
}

configurations { all { exclude(module = "xpp3") } }
Expand Down
2 changes: 0 additions & 2 deletions datacapture/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ android {
// Flag to enable support for the new language APIs
// See https://developer.android.com/studio/write/java8-support
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}

packaging {
Expand Down
2 changes: 0 additions & 2 deletions demo/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ android {
// Flag to enable support for the new language APIs
// See https://developer.android.com/studio/write/java8-support
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}

packaging { resources.excludes.addAll(listOf("META-INF/ASL-2.0.txt", "META-INF/LGPL-3.0.txt")) }
Expand Down
4 changes: 0 additions & 4 deletions engine/benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ android {
)
}
kotlin { jvmToolchain(11) }
compileOptions {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}
}

afterEvaluate { configureFirebaseTestLabForMicroBenchmark() }
Expand Down
2 changes: 0 additions & 2 deletions engine/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ android {
// Flag to enable support for the new language APIs
// See https = //developer.android.com/studio/write/java8-support
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}

packaging { resources.excludes.addAll(listOf("META-INF/ASL-2.0.txt", "META-INF/LGPL-3.0.txt")) }
Expand Down
6 changes: 1 addition & 5 deletions knowledge/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,7 @@ android {
}
}

compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}
compileOptions { isCoreLibraryDesugaringEnabled = true }

packaging {
resources.excludes.addAll(
Expand Down
4 changes: 0 additions & 4 deletions workflow-testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ android {
compileSdk = Sdk.compileSdk
defaultConfig { minSdk = Sdk.minSdk }
kotlin { jvmToolchain(11) }
compileOptions {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}
}

configurations {
Expand Down
4 changes: 0 additions & 4 deletions workflow/benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ android {
)
}
kotlin { jvmToolchain(11) }
compileOptions {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}
}

afterEvaluate { configureFirebaseTestLabForMicroBenchmark() }
Expand Down
6 changes: 1 addition & 5 deletions workflow/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,7 @@ android {
}
configureJacocoTestOptions()
kotlin { jvmToolchain(11) }
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}
compileOptions { isCoreLibraryDesugaringEnabled = true }
}

afterEvaluate { configureFirebaseTestLabForLibraries() }
Expand Down
Loading