Skip to content

feat!: bump to gradle 9.5.1 and spotless 8.6 #93

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

Open
meotch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat!: bump to gradle 9.5.1 and spotless 8.6 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
plugins {
id "com.github.mxenabled.vogue" version "3.+"
id "com.github.mxenabled.vogue" version "4.+"
id "groovy"
id "java-gradle-plugin"
id "maven-publish"
id "com.github.ben-manes.versions" version "0.53.0"
id "com.github.ben-manes.versions" version "0.54.0"
}

group "com.mx.coppuccino"
version "7.0.1" // x-release-please-version
group = "com.mx.coppuccino"
version = "7.0.1" // x-release-please-version

java {
toolchain {
Expand All @@ -19,14 +19,13 @@ repositories {
mavenCentral()
mavenLocal()
gradlePluginPortal()
maven { url "https://jitpack.io" }
maven { url = "https://jitpack.io" }
}

dependencies {
implementation "ru.vyarus:gradle-quality-plugin:[6.0,7.0)"
implementation "com.github.spotbugs:com.github.spotbugs.gradle.plugin:[6.4,7.0)"
// spotless-plugin-gradle 8.1.+ requires gradle 8+
implementation "com.diffplug.spotless:spotless-plugin-gradle:7.0.2"
implementation "com.diffplug.spotless:spotless-plugin-gradle:[8.6,9.0)"
implementation "org.kordamp.gradle:jacoco-gradle-plugin:0.54.0"
implementation "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8"
}
Expand All @@ -47,6 +46,6 @@ gradlePlugin {
}

wrapper {
gradleVersion = "8.14.3"
gradleVersion = "9.5.1"
distributionType = Wrapper.DistributionType.ALL
}
20 changes: 10 additions & 10 deletions gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ com.diffplug.durian:durian-collect:1.2.0=runtimeClasspath,testRuntimeClasspath
com.diffplug.durian:durian-core:1.2.0=runtimeClasspath,testRuntimeClasspath
com.diffplug.durian:durian-io:1.2.0=runtimeClasspath,testRuntimeClasspath
com.diffplug.durian:durian-swt.os:4.3.0=runtimeClasspath,testRuntimeClasspath
com.diffplug.spotless:spotless-lib-extra:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.diffplug.spotless:spotless-lib:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.diffplug.spotless:spotless-plugin-gradle:7.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.diffplug.spotless:spotless-lib-extra:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.diffplug.spotless:spotless-lib:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.diffplug.spotless:spotless-plugin-gradle:8.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs.snom:spotbugs-gradle-plugin:6.5.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:com.github.spotbugs.gradle.plugin:6.5.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.googlecode.concurrent-trees:concurrent-trees:2.6.1=runtimeClasspath,testRuntimeClasspath
com.googlecode.javaewah:JavaEWAH:1.2.3=runtimeClasspath,testRuntimeClasspath
com.squareup.okhttp3:okhttp:4.12.0=runtimeClasspath,testRuntimeClasspath
com.squareup.okio:okio-jvm:3.6.0=runtimeClasspath,testRuntimeClasspath
com.squareup.okio:okio:3.6.0=runtimeClasspath,testRuntimeClasspath
commons-codec:commons-codec:1.17.0=runtimeClasspath,testRuntimeClasspath
dev.equo.ide:solstice:1.8.1=runtimeClasspath,testRuntimeClasspath
commons-codec:commons-codec:1.22.0=runtimeClasspath,testRuntimeClasspath
dev.equo.ide:solstice:1.8.2=runtimeClasspath,testRuntimeClasspath
io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=runtimeClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.8.1=runtimeClasspath,testRuntimeClasspath
Expand All @@ -26,8 +26,8 @@ org.apache.maven:maven-model-builder:3.8.8=runtimeClasspath,testRuntimeClasspath
org.apache.maven:maven-model:3.8.8=runtimeClasspath,testRuntimeClasspath
org.codehaus.plexus:plexus-interpolation:1.26=runtimeClasspath,testRuntimeClasspath
org.codehaus.plexus:plexus-utils:3.3.1=runtimeClasspath,testRuntimeClasspath
org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r=runtimeClasspath,testRuntimeClasspath
org.eclipse.platform:org.eclipse.osgi:3.18.500=runtimeClasspath,testRuntimeClasspath
org.eclipse.jgit:org.eclipse.jgit:7.7.0.202606012155-r=runtimeClasspath,testRuntimeClasspath
org.eclipse.platform:org.eclipse.osgi:3.24.200=runtimeClasspath,testRuntimeClasspath
org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=runtimeClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21=runtimeClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10=runtimeClasspath,testRuntimeClasspath
Expand All @@ -37,7 +37,7 @@ org.jetbrains:annotations:13.0=compileClasspath,runtimeClasspath,testCompileClas
org.kordamp.gradle.base:org.kordamp.gradle.base.gradle.plugin:0.54.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.kordamp.gradle:base-gradle-plugin:0.54.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.kordamp.gradle:jacoco-gradle-plugin:0.54.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.slf4j:slf4j-api:1.7.36=runtimeClasspath,testRuntimeClasspath
org.slf4j:slf4j-api:2.0.18=runtimeClasspath,testRuntimeClasspath
org.tukaani:xz:1.9=runtimeClasspath,testRuntimeClasspath
ru.vyarus:gradle-quality-plugin:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=annotationProcessor,testAnnotationProcessor
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
40 changes: 22 additions & 18 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 22 additions & 32 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pluginManagement {
gradlePluginPortal()
mavenCentral()
mavenLocal()
maven { url "https://jitpack.io" }
maven { url = "https://jitpack.io" }
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/com/mx/coppuccino/CoppuccinoPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class CoppuccinoPlugin implements Plugin<Project> {
// Quality plugin configuration
// **************************************
quality {
checkstyleVersion = '10.25.0'
checkstyleVersion = '13.6.0'
checkstyle = javaEx.enabled
codenarc = false
pmd = true
Expand Down
2 changes: 2 additions & 0 deletions src/main/groovy/com/mx/coppuccino/SetupCoppuccino.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ import groovy.transform.CompileStatic
import org.gradle.api.DefaultTask
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.TaskAction
import org.gradle.work.DisableCachingByDefault

import java.nio.file.Paths

@CompileStatic
@DisableCachingByDefault
class SetupCoppuccino extends DefaultTask {

SetupCoppuccino() {
Expand Down
3 changes: 2 additions & 1 deletion src/main/groovy/com/mx/coppuccino/SpotbugsConsoleReporter.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.mx.coppuccino

import groovy.transform.CompileStatic
import groovy.transform.TypeCheckingMode
import groovy.xml.XmlParser
import org.gradle.api.Project
import org.gradle.internal.logging.text.StyledTextOutput.Style
import org.gradle.internal.logging.text.StyledTextOutputFactory
Expand All @@ -17,7 +18,7 @@ class SpotbugsConsoleReporter {
}

static String unescapeHtml(String html) {
new XmlSlurper().parseText("<t>${html.trim().replaceAll('\\&nbsp;', '')}</t>")
new XmlParser().parseText("<t>${html.trim().replaceAll('\\&nbsp;', '')}</t>")
}

String NL = String.format('%n')
Expand Down
Loading