diff --git a/build.gradle b/build.gradle index 6ff5311..6b858da 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id "com.github.mxenabled.coppuccino" version "7.+" + id "com.github.mxenabled.coppuccino" version "8.+" id "groovy" id "java-gradle-plugin" id "maven-publish" - id "org.jetbrains.kotlin.jvm" version "2.1.0" + id "org.jetbrains.kotlin.jvm" version "2.3.0" } group "com.mx.vogue" @@ -41,11 +41,12 @@ repositories { dependencies { implementation "com.google.code.gson:gson:[2.0,3.0)" - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:[2.21.0,2.22.0)" - implementation "com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.53.0" + implementation "tools.jackson.dataformat:jackson-dataformat-yaml:[3.1.4,4.0.0)" + implementation "com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.54.0" testImplementation "org.mockito:mockito-core:[5.0,6.0)" - testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0" + testImplementation "org.spockframework:spock-core:2.4-groovy-4.0" + testRuntimeOnly "org.junit.platform:junit-platform-launcher" } test { useJUnitPlatform() } @@ -64,6 +65,6 @@ gradlePlugin { } wrapper { - gradleVersion = "8.14.3" + gradleVersion = "9.5.1" distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle.lockfile b/gradle.lockfile index 1b969ac..c4b0dfe 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -1,32 +1,27 @@ # 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.21=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.4=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.8=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata -com.github.spotbugs:spotbugs:4.9.8=spotbugs +com.fasterxml.jackson.core:jackson-annotations:2.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.54.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ben-manes:gradle-versions-plugin:0.54.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath +com.github.spotbugs:spotbugs:4.10.2=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata -com.google.code.gson:gson:2.13.2=spotbugs -com.google.code.gson:gson:2.14.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.41.0=spotbugs -com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath +com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.squareup.moshi:moshi-kotlin:1.12.0=runtimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.12.0=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-io:commons-io:2.20.0=spotbugs +commons-io:commons-io:2.21.0=spotbugs dev.drewhamilton.poko:poko-annotations-jvm:0.17.1=detekt dev.drewhamilton.poko:poko-annotations:0.17.1=detekt io.github.davidburstrom.contester:contester-breakpoint:0.2.0=detekt io.github.detekt.sarif4k:sarif4k-jvm:0.6.0=detekt io.github.detekt.sarif4k:sarif4k:0.6.0=detekt +io.github.java-diff-utils:java-diff-utils:4.12=kotlinInternalAbiValidation io.gitlab.arturbosch.detekt:detekt-api:1.23.8=detekt io.gitlab.arturbosch.detekt:detekt-cli:1.23.8=detekt io.gitlab.arturbosch.detekt:detekt-core:1.23.8=detekt @@ -51,77 +46,92 @@ io.gitlab.arturbosch.detekt:detekt-rules:1.23.8=detekt 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=testRuntimeClasspath -jaxen:jaxen:2.0.0=spotbugs -net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +jaxen:jaxen:2.0.6=spotbugs +net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.9=spotbugs -org.apache.bcel:bcel:6.11.0=spotbugs -org.apache.commons:commons-lang3:3.19.0=spotbugs -org.apache.commons:commons-text:1.14.0=spotbugs -org.apache.logging.log4j:log4j-api:2.25.3=spotbugs -org.apache.logging.log4j:log4j-core:2.25.3=spotbugs -org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata -org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apache.bcel:bcel:6.12.0=spotbugs +org.apache.commons:commons-lang3:3.20.0=spotbugs +org.apache.commons:commons-text:1.15.0=spotbugs +org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath +org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.26.0=spotbugs +org.apache.logging.log4j:log4j-core:2.26.0=spotbugs +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.dom4j:dom4j:2.2.0=spotbugs -org.hamcrest:hamcrest:3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt -org.jacoco:org.jacoco.core:0.8.13=jacocoAnt -org.jacoco:org.jacoco.report:0.8.13=jacocoAnt +org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath +org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt +org.jacoco:org.jacoco.core:0.8.14=jacocoAnt +org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.jcommander:jcommander:1.85=detekt -org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt +org.jetbrains.kotlin:abi-tools-api:2.3.0=kotlinInternalAbiValidation +org.jetbrains.kotlin:abi-tools:2.3.0=kotlinInternalAbiValidation org.jetbrains.kotlin:kotlin-bom:2.0.21=runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-build-common:2.1.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlin:kotlin-build-tools-api:2.1.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlin:kotlin-build-tools-impl:2.1.0=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-api:2.3.0=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-compat:2.3.0=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-impl:2.3.0=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21=detekt -org.jetbrains.kotlin:kotlin-compiler-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-compiler-runner:2.1.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlin:kotlin-daemon-client:2.1.0=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:2.3.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-runner:2.3.0=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-daemon-client:2.3.0=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21=detekt -org.jetbrains.kotlin:kotlin-daemon-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.1.0=kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:2.3.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-klib-abi-reader:2.3.0=kotlinInternalAbiValidation +org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.3.0=kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0=kotlinInternalAbiValidation org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-reflect:2.0.21=detekt,runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-script-runtime:2.0.21=detekt -org.jetbrains.kotlin:kotlin-script-runtime:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-scripting-common:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-jvm:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0=detekt,runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-script-runtime:2.3.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-scripting-common:2.3.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.3.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.3.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-scripting-jvm:2.3.0=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0=detekt +org.jetbrains.kotlin:kotlin-stdlib-common:2.3.0=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=detekt org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21=runtimeClasspath,testRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=detekt org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21=runtimeClasspath,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:2.1.0=apiDependenciesMetadata,compileClasspath,detekt,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.1.0=detekt +org.jetbrains.kotlin:kotlin-stdlib:2.3.0=compileClasspath,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-tooling-core:2.3.0=kotlinBuildToolsApiClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=detekt +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1=detekt org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=detekt org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=detekt org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=detekt org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=detekt -org.jetbrains:annotations:13.0=compileClasspath,detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit:junit-bom:5.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit:junit-bom:5.14.0=annotationProcessor,spotbugs,testAnnotationProcessor -org.mockito:mockito-core:5.23.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains:annotations:13.0=compileClasspath,detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath +org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:6.1.0=annotationProcessor,spotbugs,testAnnotationProcessor +org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.ow2.asm:asm-analysis:9.9=spotbugs -org.ow2.asm:asm-commons:9.8=jacocoAnt -org.ow2.asm:asm-commons:9.9=spotbugs -org.ow2.asm:asm-tree:9.8=jacocoAnt -org.ow2.asm:asm-tree:9.9=spotbugs -org.ow2.asm:asm-util:9.9=spotbugs -org.ow2.asm:asm:9.8=jacocoAnt -org.ow2.asm:asm:9.9=spotbugs -org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.10.1=spotbugs +org.ow2.asm:asm-commons:9.10.1=spotbugs +org.ow2.asm:asm-commons:9.9=jacocoAnt +org.ow2.asm:asm-tree:9.10.1=spotbugs +org.ow2.asm:asm-tree:9.9=jacocoAnt +org.ow2.asm:asm-util:9.10.1=spotbugs +org.ow2.asm:asm:9.10.1=spotbugs +org.ow2.asm:asm:9.9=jacocoAnt +org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j +org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j org.snakeyaml:snakeyaml-engine:2.7=detekt -org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.snakeyaml:snakeyaml-engine:3.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs -org.yaml:snakeyaml:2.5=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -empty=detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testApiDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions +tools.jackson.core:jackson-core:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-databind:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.dataformat:jackson-dataformat-yaml:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson:jackson-bom:3.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +empty=detektPlugins,implementationDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testImplementationDependenciesMetadata,testKotlinScriptDefExtensions diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55..b1b8ef5 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7705927..e74c870 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +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 diff --git a/gradlew b/gradlew index 23d15a9..b9bb139 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index 5eed7ee..aa5f10b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,30 +65,18 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/src/main/kotlin/com/mx/vogue/core/ConfigUtils.kt b/src/main/kotlin/com/mx/vogue/core/ConfigUtils.kt index 71b0e42..c87d9e6 100644 --- a/src/main/kotlin/com/mx/vogue/core/ConfigUtils.kt +++ b/src/main/kotlin/com/mx/vogue/core/ConfigUtils.kt @@ -16,12 +16,12 @@ package com.mx.vogue.core import com.fasterxml.jackson.annotation.JsonInclude -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory import com.mx.vogue.core.models.Configuration import com.mx.vogue.core.models.PackageRule import com.mx.vogue.core.models.Rules import edu.umd.cs.findbugs.annotations.SuppressFBWarnings +import tools.jackson.databind.DeserializationFeature +import tools.jackson.dataformat.yaml.YAMLMapper import java.io.File import java.io.FileNotFoundException @@ -32,7 +32,9 @@ fun loadConfiguration(path: String): Configuration? { return null } - val mapper = ObjectMapper(YAMLFactory()) + val mapper: YAMLMapper = YAMLMapper.builder() + .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES) + .build() val contents = file.readText(Charsets.UTF_8) if (contents.isEmpty()) { @@ -45,8 +47,12 @@ fun loadConfiguration(path: String): Configuration? { fun writeConfiguration(path: String, config: Configuration) { val file = File(path) - val mapper = ObjectMapper(YAMLFactory()) - mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY) + val mapper = YAMLMapper.builder() + .changeDefaultPropertyInclusion { incl -> + incl.withValueInclusion(JsonInclude.Include.NON_EMPTY) + } + .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES) + .build() file.writeBytes(mapper.writeValueAsBytes(config)) } @@ -55,8 +61,12 @@ fun loadDefaultConfiguration(): Configuration { val stream = object {}.javaClass.classLoader.getResourceAsStream("default.vogue.yml") ?: throw FileNotFoundException("Default configuration file could not be loaded") - val mapper = ObjectMapper(YAMLFactory()) - mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY) + val mapper = YAMLMapper.builder() + .changeDefaultPropertyInclusion { incl -> + incl.withValueInclusion(JsonInclude.Include.NON_EMPTY) + } + .disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES) + .build() return mapper.readValue(stream.readBytes(), Configuration::class.java) } diff --git a/src/test/groovy/com/mx/vogue/core/ReportRendererTest.groovy b/src/test/groovy/com/mx/vogue/core/ReportRendererTest.groovy index 156e330..22781ae 100644 --- a/src/test/groovy/com/mx/vogue/core/ReportRendererTest.groovy +++ b/src/test/groovy/com/mx/vogue/core/ReportRendererTest.groovy @@ -11,11 +11,11 @@ class ReportRendererTest extends Specification { given: def report = new Reporter(new Configuration().tap { defaultRules = new Rules( - new Rule(1000, false), - new Rule(0, false), - new Rule(0, false), - new Rule(0, false) - ) + new Rule(1000, false), + new Rule(0, false), + new Rule(0, false), + new Rule(0, false) + ) }).generate("src/test/resources/report.json") when: