Skip to content

Commit 27be0ad

Browse files
committed
refactor: update convention plugin
1 parent c6b44ef commit 27be0ad

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

build-logic/conventions/src/main/kotlin/AndroidQualityPlugin.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import com.github.spotbugs.snom.Confidence
22
import com.github.spotbugs.snom.Effort
3+
import com.github.spotbugs.snom.SpotBugsExtension
34
import com.github.spotbugs.snom.SpotBugsTask
45
import org.gradle.api.Plugin
56
import org.gradle.api.Project
67
import org.gradle.api.plugins.quality.Checkstyle
78
import org.gradle.api.plugins.quality.CheckstyleExtension
9+
import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
810
import org.gradle.testing.jacoco.tasks.JacocoReport
911

1012
class AndroidQualityPlugin : Plugin<Project> {
@@ -16,11 +18,12 @@ class AndroidQualityPlugin : Plugin<Project> {
1618
pluginManager.apply("jacoco")
1719

1820
extensions.configure(CheckstyleExtension::class.java) {
21+
toolVersion = "8.2"
1922
configFile = rootProject.file("tools/checkstyle/google_checks.xml")
2023
}
2124

2225
tasks.register("checkstyleMain", Checkstyle::class.java) {
23-
source("src")
26+
source = fileTree("src/main/java")
2427
include("**/*.java")
2528
exclude("**/gen/**", "**/*Test.java", "**/annotation/*.java")
2629
classpath = files()
@@ -31,7 +34,8 @@ class AndroidQualityPlugin : Plugin<Project> {
3134
isIgnoreFailures = true
3235
}
3336

34-
extensions.configure<com.github.spotbugs.snom.SpotBugsExtension>("spotbugs") {
37+
extensions.configure(SpotBugsExtension::class.java) {
38+
toolVersion.set("6.3.0")
3539
includeFilter.set(rootProject.file("tools/findbugs/findbugs.xml"))
3640
}
3741

@@ -51,12 +55,12 @@ class AndroidQualityPlugin : Plugin<Project> {
5155

5256
reports.create("html") {
5357
required.set(true)
54-
outputLocation.set(layout.buildDirectory.file("reports/spotbugs/main/spotbugs.html").get().asFile)
58+
outputLocation.set(layout.buildDirectory.file("reports/spotbugs/main/spotbugs.html"))
5559
setStylesheet("fancy-hist.xsl")
5660
}
5761
}
5862

59-
extensions.configure<org.gradle.testing.jacoco.plugins.JacocoPluginExtension>("jacoco") {
63+
extensions.configure(JacocoPluginExtension::class.java) {
6064
toolVersion = "0.8.6"
6165
}
6266

0 commit comments

Comments
 (0)