From 891e8e924a605955e2ecce06bcc49bef6bbbabd0 Mon Sep 17 00:00:00 2001 From: Mitchell Williams Date: Tue, 9 Dec 2025 13:09:03 -0700 Subject: [PATCH] feat!: bump gradle, quality plugin and snakeyaml --- .github/workflows/ci.yml | 2 +- build.gradle | 29 ++++++------------------ gradle.lockfile | 25 ++++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 22 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa68db8..cd4f7fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,5 +16,5 @@ jobs: uses: mxenabled/path-tools/.github/workflows/ci.yml@master with: force: ${{ inputs.force != '' && inputs.force }} - java-version: '11' + java-version: '17' skip-dependency-checks: true diff --git a/build.gradle b/build.gradle index 16b552a..85be1bb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id "com.github.mxenabled.coppuccino" version "4.4.2" id "groovy" id "java" + id "com.github.mxenabled.coppuccino" version "5.+" id "maven-publish" id "java-gradle-plugin" id "org.jetbrains.kotlin.jvm" version "2.1.0" @@ -11,8 +11,8 @@ plugins { group "com.mx.vogue" version "1.1.0" // x-release-please-version -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 repositories { mavenCentral() @@ -25,12 +25,11 @@ dependencies { implementation "org.apache.bcel:bcel:[6.11.0,7.0[" // Security update implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0" implementation "com.google.code.gson:gson:[2.0,3.0[" - //upgrade to 2.15.0 after snakeyaml2 - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.3" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:[2.20,3.0)" implementation "com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.53.0" implementation "com.github.spotbugs:spotbugs-annotations:4.9.8" // For annotating classes and methods to suppress SpotBugs violations - api "org.mockito:mockito-inline:[4.0,5.0[" + api "org.mockito:mockito-inline:[5.0,6.0[" api "org.spockframework:spock-core:2.4-M6-groovy-3.0" } @@ -49,13 +48,7 @@ gradlePlugin { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_11 - } -} - -compileTestKotlin { - kotlinOptions { - jvmTarget = "11" + jvmTarget = JvmTarget.JVM_17 } } @@ -69,17 +62,9 @@ coppuccino { } } -sourceSets { - test { - groovy { - srcDirs "src/test/groovy" - } - } -} - test { useJUnitPlatform() } wrapper { - gradleVersion = "7.6.3" + gradleVersion = "7.6.4" distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle.lockfile b/gradle.lockfile index 10c13a3..11c1b0d 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -1,17 +1,18 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.14.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.14.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.14.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.14.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.20=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.20.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.53.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.github.ben-manes:gradle-versions-plugin:0.53.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.9.4=compileOnlyDependenciesMetadata com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs -com.google.code.findbugs:jsr305:3.0.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.code.gson:gson:2.13.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.squareup.moshi:moshi-kotlin:1.12.0=runtimeClasspath,testRuntimeClasspath @@ -50,8 +51,8 @@ io.gitlab.arturbosch.detekt:detekt-tooling:1.23.8=detekt io.gitlab.arturbosch.detekt:detekt-utils:1.23.8=detekt io.leangen.geantyref:geantyref:1.3.16=runtimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs -net.bytebuddy:byte-buddy-agent:1.12.19=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.19=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.9=spotbugs org.apache.bcel:bcel:6.11.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath 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 org.junit.platform:junit-platform-engine:1.14.0=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath -org.mockito:mockito-core:4.11.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.mockito:mockito-inline:4.11.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.mockito:mockito-core:5.2.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.mockito:mockito-inline:5.2.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt @@ -127,5 +128,5 @@ org.snakeyaml:snakeyaml-engine:2.7=detekt org.spockframework:spock-bom:2.4-M6-groovy-3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.spockframework:spock-core:2.4-M6-groovy-3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs -org.yaml:snakeyaml:1.33=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -empty=annotationProcessor,compileOnlyDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions +org.yaml:snakeyaml:2.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +empty=annotationProcessor,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ec7c722..5c00f61 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists