diff --git a/build.gradle b/build.gradle index 59b4246..9cff670 100644 --- a/build.gradle +++ b/build.gradle @@ -4,13 +4,13 @@ plugins { id "java-gradle-plugin" id "java-library" id "maven-publish" - id "com.github.ben-manes.versions" version "0.51.0" + id "com.github.ben-manes.versions" version "0.53.0" } group "com.mx.coppuccino" version "4.3.1" // x-release-please-version -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 repositories { gradlePluginPortal() @@ -18,11 +18,11 @@ repositories { } dependencies { - implementation "ru.vyarus:gradle-quality-plugin:4.9.0" - implementation "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.2.5" + implementation "ru.vyarus:gradle-quality-plugin:5.0.0" + implementation "com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.4.4" implementation "com.diffplug.spotless:spotless-plugin-gradle:7.0.2" - implementation "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6" implementation "org.kordamp.gradle:jacoco-gradle-plugin:0.54.0" + implementation "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8" } project.description = "Java style, standard, and safety enforcement" @@ -47,6 +47,6 @@ gradlePlugin { } wrapper { - gradleVersion = "7.5.1" - distributionType = Wrapper.DistributionType.BIN + gradleVersion = "7.6.3" + distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..609ab8e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/groovy/com/mx/coppuccino/CoppuccinoPlugin.groovy b/src/main/groovy/com/mx/coppuccino/CoppuccinoPlugin.groovy index fa3dfb5..344ef5e 100644 --- a/src/main/groovy/com/mx/coppuccino/CoppuccinoPlugin.groovy +++ b/src/main/groovy/com/mx/coppuccino/CoppuccinoPlugin.groovy @@ -16,8 +16,11 @@ package com.mx.coppuccino import com.diffplug.gradle.spotless.SpotlessPlugin +import com.github.spotbugs.snom.Confidence +import com.github.spotbugs.snom.Effort import com.github.spotbugs.snom.SpotBugsPlugin import com.github.spotbugs.snom.SpotBugsTask + import groovy.transform.CompileStatic import groovy.transform.TypeCheckingMode import io.gitlab.arturbosch.detekt.DetektPlugin @@ -28,7 +31,8 @@ import org.gradle.api.plugins.JavaPlugin import org.gradle.api.tasks.testing.Test import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent -import org.kordamp.gradle.plugin.jacoco.JacocoPlugin +import org.gradle.testing.jacoco.plugins.JacocoPlugin + import ru.vyarus.gradle.plugin.quality.QualityPlugin @CompileStatic @@ -65,7 +69,7 @@ class CoppuccinoPlugin implements Plugin { // Quality plugin configuration // ************************************** quality { - checkstyleVersion = '8.29' + checkstyleVersion = '10.25.0' checkstyle = javaEx.enabled codenarc = false pmd = true @@ -112,8 +116,8 @@ class CoppuccinoPlugin implements Plugin { // https://github.com/spotbugs/spotbugs-gradle-plugin // ************************************** spotbugs { - effort = "max" - reportLevel = "medium" + effort = Effort.valueOf("MAX") + reportLevel = Confidence.valueOf("MEDIUM") extraArgs = ["-longBugCodes"] excludeFilter = file("${coppuccino.rootDir}.coppuccino/spotbugs/exclude.xml") }