Skip to content

Commit d5a1fed

Browse files
meotchwilliamsmeotch
authored andcommitted
feat!: bump gradle, quality plugin and snakeyaml
1 parent 56f2689 commit d5a1fed

File tree

4 files changed

+22
-36
lines changed

4 files changed

+22
-36
lines changed

.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: '11'
19+
java-version: '17'
2020
skip-dependency-checks: true

build.gradle

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22

33
plugins {
4-
id "com.github.mxenabled.coppuccino" version "4.4.2"
54
id "groovy"
65
id "java"
6+
id "com.github.mxenabled.coppuccino" version "5.+"
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 "1.1.0" // x-release-please-version
14-
sourceCompatibility = JavaVersion.VERSION_11
15-
targetCompatibility = JavaVersion.VERSION_11
14+
sourceCompatibility = JavaVersion.VERSION_17
15+
targetCompatibility = JavaVersion.VERSION_17
1616

1717
repositories {
1818
mavenCentral()
@@ -25,12 +25,11 @@ dependencies {
2525
implementation "org.apache.bcel:bcel:[6.11.0,7.0[" // Security update
2626
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0"
2727
implementation "com.google.code.gson:gson:[2.0,3.0["
28-
//upgrade to 2.15.0 after snakeyaml2
29-
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.3"
28+
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:[2.20,3.0)"
3029
implementation "com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.53.0"
3130
implementation "com.github.spotbugs:spotbugs-annotations:4.9.8" // For annotating classes and methods to suppress SpotBugs violations
3231

33-
api "org.mockito:mockito-inline:[4.0,5.0["
32+
api "org.mockito:mockito-inline:[5.0,6.0["
3433
api "org.spockframework:spock-core:2.4-M6-groovy-3.0"
3534
}
3635

@@ -49,13 +48,7 @@ gradlePlugin {
4948

5049
kotlin {
5150
compilerOptions {
52-
jvmTarget = JvmTarget.JVM_11
53-
}
54-
}
55-
56-
compileTestKotlin {
57-
kotlinOptions {
58-
jvmTarget = "11"
51+
jvmTarget = JvmTarget.JVM_17
5952
}
6053
}
6154

@@ -69,17 +62,9 @@ coppuccino {
6962
}
7063
}
7164

72-
sourceSets {
73-
test {
74-
groovy {
75-
srcDirs "src/test/groovy"
76-
}
77-
}
78-
}
79-
8065
test { useJUnitPlatform() }
8166

8267
wrapper {
83-
gradleVersion = "7.6.3"
68+
gradleVersion = "7.6.4"
8469
distributionType = Wrapper.DistributionType.ALL
8570
}

gradle.lockfile

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
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.14.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5-
com.fasterxml.jackson.core:jackson-core:2.14.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6-
com.fasterxml.jackson.core:jackson-databind:2.14.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
7-
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
8-
com.fasterxml.jackson:jackson-bom:2.14.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
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
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
1112
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1213
com.github.spotbugs:spotbugs:4.9.8=spotbugs
1314
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
14-
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
15+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1516
com.google.code.gson:gson:2.13.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1617
com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1718
com.squareup.moshi:moshi-kotlin:1.12.0=runtimeClasspath,testRuntimeClasspath
@@ -50,8 +51,8 @@ io.gitlab.arturbosch.detekt:detekt-tooling:1.23.8=detekt
5051
io.gitlab.arturbosch.detekt:detekt-utils:1.23.8=detekt
5152
io.leangen.geantyref:geantyref:1.3.16=runtimeClasspath,testRuntimeClasspath
5253
jaxen:jaxen:2.0.0=spotbugs
53-
net.bytebuddy:byte-buddy-agent:1.12.19=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
54-
net.bytebuddy:byte-buddy:1.12.19=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
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
5556
net.sf.saxon:Saxon-HE:12.9=spotbugs
5657
org.apache.bcel:bcel:6.11.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5758
org.apache.commons:commons-lang3:3.19.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
@@ -108,8 +109,8 @@ org.junit.platform:junit-platform-engine:1.12.2=apiDependenciesMetadata,compileC
108109
org.junit.platform:junit-platform-engine:1.14.0=runtimeClasspath,testRuntimeClasspath
109110
org.junit:junit-bom:5.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata
110111
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath
111-
org.mockito:mockito-core:4.11.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
112-
org.mockito:mockito-inline:4.11.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,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
113114
org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
114115
org.opentest4j:opentest4j:1.3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
115116
org.ow2.asm:asm-analysis:9.2=jacocoAnt
@@ -127,5 +128,5 @@ org.snakeyaml:snakeyaml-engine:2.7=detekt
127128
org.spockframework:spock-bom:2.4-M6-groovy-3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
128129
org.spockframework:spock-core:2.4-M6-groovy-3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
129130
org.xmlresolver:xmlresolver:5.3.3=spotbugs
130-
org.yaml:snakeyaml:1.33=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
131-
empty=annotationProcessor,compileOnlyDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
131+
org.yaml:snakeyaml:2.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
132+
empty=annotationProcessor,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
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.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)