Skip to content

Commit 133ed4e

Browse files
meotchwilliamsmeotchwilliams
committed
feat!: bump to gradle 9.5.1 and spotless 8.6
1 parent ec7ce17 commit 133ed4e

10 files changed

Lines changed: 75 additions & 76 deletions

File tree

‎build.gradle‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
plugins {
2-
id "com.github.mxenabled.vogue" version "3.+"
2+
id "com.github.mxenabled.vogue" version "4.+"
33
id "groovy"
44
id "java-gradle-plugin"
55
id "maven-publish"
6-
id "com.github.ben-manes.versions" version "0.53.0"
6+
id "com.github.ben-manes.versions" version "0.54.0"
77
}
88

9-
group "com.mx.coppuccino"
10-
version "7.0.1" // x-release-please-version
9+
group = "com.mx.coppuccino"
10+
version = "7.0.1" // x-release-please-version
1111

1212
java {
1313
toolchain {
@@ -19,14 +19,13 @@ repositories {
1919
mavenCentral()
2020
mavenLocal()
2121
gradlePluginPortal()
22-
maven { url "https://jitpack.io" }
22+
maven { url = "https://jitpack.io" }
2323
}
2424

2525
dependencies {
2626
implementation "ru.vyarus:gradle-quality-plugin:[6.0,7.0)"
2727
implementation "com.github.spotbugs:com.github.spotbugs.gradle.plugin:[6.4,7.0)"
28-
// spotless-plugin-gradle 8.1.+ requires gradle 8+
29-
implementation "com.diffplug.spotless:spotless-plugin-gradle:7.0.2"
28+
implementation "com.diffplug.spotless:spotless-plugin-gradle:[8.6,9.0)"
3029
implementation "org.kordamp.gradle:jacoco-gradle-plugin:0.54.0"
3130
implementation "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
3231
}
@@ -47,6 +46,6 @@ gradlePlugin {
4746
}
4847

4948
wrapper {
50-
gradleVersion = "8.14.3"
49+
gradleVersion = "9.5.1"
5150
distributionType = Wrapper.DistributionType.ALL
5251
}

‎gradle.lockfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ com.diffplug.durian:durian-collect:1.2.0=runtimeClasspath,testRuntimeClasspath
55
com.diffplug.durian:durian-core:1.2.0=runtimeClasspath,testRuntimeClasspath
66
com.diffplug.durian:durian-io:1.2.0=runtimeClasspath,testRuntimeClasspath
77
com.diffplug.durian:durian-swt.os:4.3.0=runtimeClasspath,testRuntimeClasspath
8-
com.diffplug.spotless:spotless-lib-extra:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
9-
com.diffplug.spotless:spotless-lib:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
10-
com.diffplug.spotless:spotless-plugin-gradle:7.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
11-
com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12-
com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8+
com.diffplug.spotless:spotless-lib-extra:4.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
9+
com.diffplug.spotless:spotless-lib:4.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
10+
com.diffplug.spotless:spotless-plugin-gradle:8.8.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
11+
com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1313
com.googlecode.concurrent-trees:concurrent-trees:2.6.1=runtimeClasspath,testRuntimeClasspath
1414
com.googlecode.javaewah:JavaEWAH:1.2.3=runtimeClasspath,testRuntimeClasspath
1515
com.squareup.okhttp3:okhttp:4.12.0=runtimeClasspath,testRuntimeClasspath
1616
com.squareup.okio:okio-jvm:3.6.0=runtimeClasspath,testRuntimeClasspath
1717
com.squareup.okio:okio:3.6.0=runtimeClasspath,testRuntimeClasspath
18-
commons-codec:commons-codec:1.17.0=runtimeClasspath,testRuntimeClasspath
19-
dev.equo.ide:solstice:1.8.1=runtimeClasspath,testRuntimeClasspath
18+
commons-codec:commons-codec:1.22.0=runtimeClasspath,testRuntimeClasspath
19+
dev.equo.ide:solstice:1.8.2=runtimeClasspath,testRuntimeClasspath
2020
io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
2121
javax.inject:javax.inject:1=runtimeClasspath,testRuntimeClasspath
2222
org.apache.commons:commons-lang3:3.8.1=runtimeClasspath,testRuntimeClasspath
@@ -26,8 +26,8 @@ org.apache.maven:maven-model-builder:3.8.8=runtimeClasspath,testRuntimeClasspath
2626
org.apache.maven:maven-model:3.8.8=runtimeClasspath,testRuntimeClasspath
2727
org.codehaus.plexus:plexus-interpolation:1.26=runtimeClasspath,testRuntimeClasspath
2828
org.codehaus.plexus:plexus-utils:3.3.1=runtimeClasspath,testRuntimeClasspath
29-
org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r=runtimeClasspath,testRuntimeClasspath
30-
org.eclipse.platform:org.eclipse.osgi:3.18.500=runtimeClasspath,testRuntimeClasspath
29+
org.eclipse.jgit:org.eclipse.jgit:7.7.0.202606012155-r=runtimeClasspath,testRuntimeClasspath
30+
org.eclipse.platform:org.eclipse.osgi:3.24.200=runtimeClasspath,testRuntimeClasspath
3131
org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=runtimeClasspath,testRuntimeClasspath
3232
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21=runtimeClasspath,testRuntimeClasspath
3333
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=runtimeClasspath,testRuntimeClasspath
@@ -37,7 +37,7 @@ org.jetbrains:annotations:13.0=compileClasspath,runtimeClasspath,testCompileClas
3737
org.kordamp.gradle.base:org.kordamp.gradle.base.gradle.plugin:0.54.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3838
org.kordamp.gradle:base-gradle-plugin:0.54.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3939
org.kordamp.gradle:jacoco-gradle-plugin:0.54.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
40-
org.slf4j:slf4j-api:1.7.36=runtimeClasspath,testRuntimeClasspath
40+
org.slf4j:slf4j-api:2.0.18=runtimeClasspath,testRuntimeClasspath
4141
org.tukaani:xz:1.9=runtimeClasspath,testRuntimeClasspath
4242
ru.vyarus:gradle-quality-plugin:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4343
empty=annotationProcessor,testAnnotationProcessor

‎gradle/wrapper/gradle-wrapper.jar‎

-12.9 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
7+
validateDistributionUrl=true
58
zipStoreBase=GRADLE_USER_HOME
69
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 22 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 22 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pluginManagement {
33
gradlePluginPortal()
44
mavenCentral()
55
mavenLocal()
6-
maven { url "https://jitpack.io" }
6+
maven { url = "https://jitpack.io" }
77
}
88
}
99

‎src/main/groovy/com/mx/coppuccino/CoppuccinoPlugin.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class CoppuccinoPlugin implements Plugin<Project> {
6969
// Quality plugin configuration
7070
// **************************************
7171
quality {
72-
checkstyleVersion = '10.25.0'
72+
checkstyleVersion = '13.7.0'
7373
checkstyle = javaEx.enabled
7474
codenarc = false
7575
pmd = true
@@ -273,10 +273,10 @@ class CoppuccinoPlugin implements Plugin<Project> {
273273
}
274274

275275
// Provide @SuppressFBWarnings annotation for suppressing Spotbugs violations
276-
project.dependencies.add('compileOnly', 'com.github.spotbugs:spotbugs-annotations:4.9.8')
277-
project.dependencies.add('testCompileOnly', 'com.github.spotbugs:spotbugs-annotations:4.9.8')
278-
project.dependencies.add('annotationProcessor', 'com.github.spotbugs:spotbugs-annotations:4.9.8')
279-
project.dependencies.add('testAnnotationProcessor', 'com.github.spotbugs:spotbugs-annotations:4.9.8')
276+
project.dependencies.add('compileOnly', 'com.github.spotbugs:spotbugs-annotations:4.10.2')
277+
project.dependencies.add('testCompileOnly', 'com.github.spotbugs:spotbugs-annotations:4.10.2')
278+
project.dependencies.add('annotationProcessor', 'com.github.spotbugs:spotbugs-annotations:4.10.2')
279+
project.dependencies.add('testAnnotationProcessor', 'com.github.spotbugs:spotbugs-annotations:4.10.2')
280280

281281
project.tasks.spotlessGroovy.dependsOn(compileJava, compileTestGroovy)
282282
project.tasks.spotlessJava.dependsOn(compileJava, compileTestGroovy, spotlessGroovy)

‎src/main/groovy/com/mx/coppuccino/SetupCoppuccino.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ import groovy.transform.CompileStatic
1919
import org.gradle.api.DefaultTask
2020
import org.gradle.api.tasks.Input
2121
import org.gradle.api.tasks.TaskAction
22+
import org.gradle.work.DisableCachingByDefault
2223

2324
import java.nio.file.Paths
2425

2526
@CompileStatic
27+
@DisableCachingByDefault
2628
class SetupCoppuccino extends DefaultTask {
2729

2830
SetupCoppuccino() {

‎src/main/groovy/com/mx/coppuccino/SpotbugsConsoleReporter.groovy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.mx.coppuccino
22

33
import groovy.transform.CompileStatic
44
import groovy.transform.TypeCheckingMode
5+
import groovy.xml.XmlParser
56
import org.gradle.api.Project
67
import org.gradle.internal.logging.text.StyledTextOutput.Style
78
import org.gradle.internal.logging.text.StyledTextOutputFactory
@@ -17,7 +18,7 @@ class SpotbugsConsoleReporter {
1718
}
1819

1920
static String unescapeHtml(String html) {
20-
new XmlSlurper().parseText("<t>${html.trim().replaceAll('\\&nbsp;', '')}</t>")
21+
new XmlParser().parseText("<t>${html.trim().replaceAll('\\&nbsp;', '')}</t>")
2122
}
2223

2324
String NL = String.format('%n')

0 commit comments

Comments
 (0)