Skip to content

Commit 6bd8518

Browse files
meotchwilliamsmeotch
authored andcommitted
feat!: bump checkstyle, gradle, java, mockito, spotless
1 parent d072055 commit 6bd8518

4 files changed

Lines changed: 41 additions & 39 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
uses: mxenabled/path-tools/.github/workflows/ci.yml@master
1717
with:
1818
force: ${{ inputs.force != '' && inputs.force }}
19-
java-version: '17'
19+
java-version: '21'
2020
skip-dependency-checks: true

build.gradle

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
33
plugins {
44
id "groovy"
55
id "java"
6-
id "com.github.mxenabled.coppuccino" version "5.+"
6+
id "com.github.mxenabled.coppuccino" version "6.+"
77
id "maven-publish"
88
id "java-gradle-plugin"
99
id "org.jetbrains.kotlin.jvm" version "2.1.0"
1010
}
1111

1212
group "com.mx.vogue"
1313
version "2.0.0" // x-release-please-version
14-
sourceCompatibility = JavaVersion.VERSION_17
15-
targetCompatibility = JavaVersion.VERSION_17
14+
15+
java {
16+
toolchain {
17+
languageVersion = JavaLanguageVersion.of(21)
18+
}
19+
}
1620

1721
repositories {
1822
mavenCentral()
@@ -27,9 +31,8 @@ dependencies {
2731
implementation "com.google.code.gson:gson:[2.0,3.0["
2832
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:[2.20,3.0)"
2933
implementation "com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.53.0"
30-
implementation "com.github.spotbugs:spotbugs-annotations:4.9.8" // For annotating classes and methods to suppress SpotBugs violations
3134

32-
api "org.mockito:mockito-inline:[5.0,6.0["
35+
api "org.mockito:mockito-core:[5.21.0,6.0)"
3336
api "org.spockframework:spock-core:2.4-M6-groovy-3.0"
3437
}
3538

@@ -48,12 +51,12 @@ gradlePlugin {
4851

4952
kotlin {
5053
compilerOptions {
51-
jvmTarget = JvmTarget.JVM_17
54+
jvmTarget = JvmTarget.JVM_21
5255
}
5356
}
5457

5558
coppuccino {
56-
kotlin { enabled = true }
59+
kotlin { required = true }
5760
coverage {
5861
minimumCoverage = 0.73
5962
excludes = [
@@ -65,6 +68,6 @@ coppuccino {
6568
test { useJUnitPlatform() }
6669

6770
wrapper {
68-
gradleVersion = "7.6.4"
71+
gradleVersion = "8.14.3"
6972
distributionType = Wrapper.DistributionType.ALL
7073
}

gradle.lockfile

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5-
com.fasterxml.jackson.core:jackson-core:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6-
com.fasterxml.jackson.core:jackson-databind:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
7-
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
8-
com.fasterxml.jackson:jackson-bom:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
4+
com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5+
com.fasterxml.jackson.core:jackson-core:2.21.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.21.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
7+
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
8+
com.fasterxml.jackson:jackson-bom:2.21.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
99
com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.53.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1010
com.github.ben-manes:gradle-versions-plugin:0.53.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
11-
com.github.spotbugs:spotbugs-annotations:4.9.4=compileOnlyDependenciesMetadata
12-
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
11+
com.github.spotbugs:spotbugs-annotations:4.9.4=compileClasspath,compileOnlyDependenciesMetadata
12+
com.github.spotbugs:spotbugs-annotations:4.9.8=spotbugs
1313
com.github.spotbugs:spotbugs:4.9.8=spotbugs
1414
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
15-
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
15+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs
1616
com.google.code.gson:gson:2.13.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1717
com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1818
com.squareup.moshi:moshi-kotlin:1.12.0=runtimeClasspath,testRuntimeClasspath
1919
com.squareup.moshi:moshi:1.12.0=runtimeClasspath,testRuntimeClasspath
2020
com.squareup.okhttp3:okhttp:4.12.0=runtimeClasspath,testRuntimeClasspath
2121
com.squareup.okio:okio-jvm:3.6.0=runtimeClasspath,testRuntimeClasspath
2222
com.squareup.okio:okio:3.6.0=runtimeClasspath,testRuntimeClasspath
23-
commons-io:commons-io:2.20.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
23+
commons-io:commons-io:2.20.0=spotbugs
24+
commons-io:commons-io:2.21.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
2425
dev.drewhamilton.poko:poko-annotations-jvm:0.17.1=detekt
2526
dev.drewhamilton.poko:poko-annotations:0.17.1=detekt
2627
io.github.davidburstrom.contester:contester-breakpoint:0.2.0=detekt
@@ -51,22 +52,24 @@ io.gitlab.arturbosch.detekt:detekt-tooling:1.23.8=detekt
5152
io.gitlab.arturbosch.detekt:detekt-utils:1.23.8=detekt
5253
io.leangen.geantyref:geantyref:1.3.16=runtimeClasspath,testRuntimeClasspath
5354
jaxen:jaxen:2.0.0=spotbugs
54-
net.bytebuddy:byte-buddy-agent:1.14.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
55-
net.bytebuddy:byte-buddy:1.14.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
55+
net.bytebuddy:byte-buddy-agent:1.17.7=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
56+
net.bytebuddy:byte-buddy:1.17.7=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5657
net.sf.saxon:Saxon-HE:12.9=spotbugs
57-
org.apache.bcel:bcel:6.11.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
58-
org.apache.commons:commons-lang3:3.19.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
58+
org.apache.bcel:bcel:6.11.0=spotbugs
59+
org.apache.bcel:bcel:6.12.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
60+
org.apache.commons:commons-lang3:3.19.0=spotbugs
61+
org.apache.commons:commons-lang3:3.20.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5962
org.apache.commons:commons-text:1.14.0=spotbugs
6063
org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
6164
org.apache.logging.log4j:log4j-core:2.25.2=spotbugs
6265
org.apiguardian:apiguardian-api:1.1.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
6366
org.codehaus.groovy:groovy:3.0.24=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6467
org.dom4j:dom4j:2.2.0=spotbugs
6568
org.hamcrest:hamcrest:3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
66-
org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
67-
org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
68-
org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
69-
org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
69+
org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
70+
org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
71+
org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
72+
org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
7073
org.jcommander:jcommander:1.85=detekt
7174
org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
7275
org.jetbrains.kotlin:kotlin-bom:2.0.21=runtimeClasspath,testRuntimeClasspath
@@ -103,24 +106,20 @@ org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=detekt
103106
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=detekt
104107
org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=detekt
105108
org.jetbrains:annotations:13.0=compileClasspath,detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
106-
org.junit.platform:junit-platform-commons:1.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
107-
org.junit.platform:junit-platform-commons:1.14.0=runtimeClasspath,testRuntimeClasspath
108-
org.junit.platform:junit-platform-engine:1.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
109-
org.junit.platform:junit-platform-engine:1.14.0=runtimeClasspath,testRuntimeClasspath
110-
org.junit:junit-bom:5.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
111-
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath
112-
org.mockito:mockito-core:5.2.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
113-
org.mockito:mockito-inline:5.2.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
109+
org.junit.platform:junit-platform-commons:1.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
110+
org.junit.platform:junit-platform-engine:1.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
111+
org.junit:junit-bom:5.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
112+
org.junit:junit-bom:5.14.0=spotbugs
113+
org.mockito:mockito-core:5.21.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
114114
org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
115115
org.opentest4j:opentest4j:1.3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
116-
org.ow2.asm:asm-analysis:9.2=jacocoAnt
117116
org.ow2.asm:asm-analysis:9.9=spotbugs
118-
org.ow2.asm:asm-commons:9.2=jacocoAnt
117+
org.ow2.asm:asm-commons:9.8=jacocoAnt
119118
org.ow2.asm:asm-commons:9.9=spotbugs
120-
org.ow2.asm:asm-tree:9.2=jacocoAnt
119+
org.ow2.asm:asm-tree:9.8=jacocoAnt
121120
org.ow2.asm:asm-tree:9.9=spotbugs
122121
org.ow2.asm:asm-util:9.9=spotbugs
123-
org.ow2.asm:asm:9.2=jacocoAnt
122+
org.ow2.asm:asm:9.8=jacocoAnt
124123
org.ow2.asm:asm:9.9=spotbugs
125124
org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
126125
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)