diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 549f5c0..aa68db8 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: '8' + java-version: '11' skip-dependency-checks: true diff --git a/build.gradle b/build.gradle index 51c83a8..9ed10d9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,18 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { - id "com.github.mxenabled.coppuccino" version "3.2.1" + id "com.github.mxenabled.coppuccino" version "4.4.2" id "groovy" id "java" id "maven-publish" id "java-gradle-plugin" - id "org.jetbrains.kotlin.jvm" version "1.6.10" + id "org.jetbrains.kotlin.jvm" version "2.1.0" } group "com.mx.vogue" version "1.0.3" // x-release-please-version -sourceCompatibility = 1.8 +sourceCompatibility = JavaVersion.VERSION_11 +targetCompatibility = JavaVersion.VERSION_11 repositories { mavenCentral() @@ -19,22 +22,16 @@ repositories { } dependencies { - implementation "org.apache.bcel:bcel:[6.6.0,7.0[" // Security update - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" + 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[" - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3" - implementation "com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.42.0" - implementation "com.github.spotbugs:spotbugs-annotations:4.7.2" // For annotating classes and methods to suppress SpotBugs violations - - constraints { - implementation ("com.thoughtworks.xstream:xstream:1.4.19") { because "It resolves a bajillion CVEs" } - } + //upgrade to 2.15.0 after snakeyaml2 + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.3" + 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 - // Unit tests - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:[5.8.0,5.9.0[" - testImplementation "org.junit.jupiter:junit-jupiter-api:[5.8.0,5.9.0[" - testImplementation "org.mockito:mockito-inline:[4.0,5.0[" - testImplementation "org.spockframework:spock-core:2.2-M1-groovy-3.0" + api "org.mockito:mockito-inline:[4.0,5.0[" + api "org.spockframework:spock-core:2.4-M6-groovy-3.0" } gradlePlugin { @@ -50,20 +47,22 @@ gradlePlugin { } } -compileKotlin { - kotlinOptions { - jvmTarget = "1.8" - } } +kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_11 + } +} compileTestKotlin { kotlinOptions { - jvmTarget = "1.8" - } } + jvmTarget = "11" + } +} coppuccino { kotlin { enabled = true } coverage { - minimumCoverage = 0.70 + minimumCoverage = 0.73 excludes = [ "com/mx/vogue/core/models/**" ] @@ -71,12 +70,16 @@ coppuccino { } sourceSets { - test { groovy { srcDirs "src/test/groovy" } } + test { + groovy { + srcDirs "src/test/groovy" + } + } } test { useJUnitPlatform() } wrapper { - gradleVersion = "7.4.1" + gradleVersion = "7.6.3" distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle.lockfile b/gradle.lockfile index b846732..10c13a3 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -1,134 +1,131 @@ # 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. -cglib:cglib-nodep:3.3.0=testRuntimeClasspath -com.beust:jcommander:1.82=detekt -com.fasterxml.jackson.core:jackson-annotations:2.13.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.13.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.13.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.13.3=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.42.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.github.ben-manes:gradle-versions-plugin:0.42.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs -com.github.spotbugs:spotbugs:4.7.3=spotbugs +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.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=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.gson:gson:2.10.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.google.code.gson:gson:2.9.1=spotbugs -com.thoughtworks.xstream:xstream:1.4.19=runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=spotbugs +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 +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=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +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:0.0.1=detekt -io.github.x-stream:mxparser:1.2.2=runtimeClasspath,testRuntimeClasspath -io.gitlab.arturbosch.detekt:detekt-api:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-cli:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-core:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-metrics:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-parser:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-psi-utils:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-report-html:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-report-md:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-report-sarif:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-report-txt:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-report-xml:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-rules-complexity:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-rules-coroutines:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-rules-documentation:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-rules-empty:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-rules-errorprone:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-rules-exceptions:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-rules-naming:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-rules-performance:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-rules-style:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-rules:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-tooling:1.22.0-RC2=detekt -io.gitlab.arturbosch.detekt:detekt-utils:1.22.0-RC2=detekt -jaxen:jaxen:1.2.0=spotbugs -net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.java.dev.jna:jna:5.6.0=detekt,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -net.jcip:jcip-annotations:1.0=spotbugs -net.sf.saxon:Saxon-HE:11.4=spotbugs -org.apache.bcel:bcel:6.5.0=spotbugs -org.apache.bcel:bcel:6.7.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.apache.commons:commons-lang3:3.12.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.logging.log4j:log4j-api:2.19.0=spotbugs -org.apache.logging.log4j:log4j-core:2.19.0=spotbugs -org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.23.1=testRuntimeClasspath -org.codehaus.groovy:groovy:3.0.9=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.dom4j:dom4j:2.1.3=spotbugs -org.hamcrest:hamcrest:2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.7=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.7=jacocoAnt -org.jacoco:org.jacoco.core:0.8.7=jacocoAnt -org.jacoco:org.jacoco.report:0.8.7=jacocoAnt -org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.20=detekt -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.20=detekt -org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.10=kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-reflect:1.7.20=detekt -org.jetbrains.kotlin:kotlin-script-runtime:1.6.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-script-runtime:1.7.20=detekt -org.jetbrains.kotlin:kotlin-scripting-common:1.6.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20=detekt -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.6.10=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.7.20=detekt -org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.0=detekt -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.1.0=detekt -org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0=detekt -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0=detekt -org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0=detekt -org.jetbrains:annotations:13.0=compileClasspath,detekt,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata -org.jetbrains:annotations:20.1.0=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.8.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-api:5.9.0=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.8.2=testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.9.0=testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.8.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-commons:1.9.0=testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.8.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.9.0=testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.9.0=testRuntimeClasspath -org.junit.platform:junit-platform-testkit:1.9.0=testRuntimeClasspath -org.junit:junit-bom:5.8.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.junit:junit-bom:5.9.0=runtimeClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.1=spotbugs -org.mockito:mockito-core:4.11.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.mockito:mockito-inline:4.11.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.objenesis:objenesis:3.3=testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.ow2.asm:asm-analysis:9.1=jacocoAnt -org.ow2.asm:asm-analysis:9.4=spotbugs -org.ow2.asm:asm-commons:9.1=jacocoAnt -org.ow2.asm:asm-commons:9.4=spotbugs -org.ow2.asm:asm-tree:9.1=jacocoAnt -org.ow2.asm:asm-tree:9.4=spotbugs -org.ow2.asm:asm-util:9.4=spotbugs -org.ow2.asm:asm:9.1=jacocoAnt -org.ow2.asm:asm:9.2=testRuntimeClasspath -org.ow2.asm:asm:9.4=spotbugs -org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.2-M1-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.xmlresolver:xmlresolver:4.4.3=spotbugs -org.yaml:snakeyaml:1.30=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.yaml:snakeyaml:1.33=detekt -xml-apis:xml-apis:1.4.01=spotbugs -xmlpull:xmlpull:1.1.3.1=runtimeClasspath,testRuntimeClasspath -empty=annotationProcessor,apiDependenciesMetadata,compile,compileOnly,compileOnlyDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtime,runtimeOnlyDependenciesMetadata,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompile,testCompileOnly,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions,testRuntime +io.github.detekt.sarif4k:sarif4k-jvm:0.6.0=detekt +io.github.detekt.sarif4k:sarif4k:0.6.0=detekt +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 +io.gitlab.arturbosch.detekt:detekt-metrics:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-parser:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-psi-utils:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-report-html:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-report-md:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-report-sarif:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-report-txt:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-report-xml:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-rules-complexity:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-rules-coroutines:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-rules-documentation:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-rules-empty:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-rules-errorprone:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-rules-exceptions:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-rules-naming:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-rules-performance:1.23.8=detekt +io.gitlab.arturbosch.detekt:detekt-rules-style:1.23.8=detekt +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=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.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 +org.apache.commons:commons-text:1.14.0=spotbugs +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apiguardian:apiguardian-api:1.1.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata +org.codehaus.groovy:groovy:3.0.24=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.dom4j:dom4j:2.2.0=spotbugs +org.hamcrest:hamcrest:3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt +org.jacoco:org.jacoco.core:0.8.8=jacocoAnt +org.jacoco:org.jacoco.report:0.8.8=jacocoAnt +org.jcommander:jcommander:1.85=detekt +org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +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-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-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-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.0.21=detekt +org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0=runtimeClasspath,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=detekt +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=detekt +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.0.21=detekt +org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileClasspath,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.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=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata +org.junit.platform:junit-platform-commons:1.14.0=runtimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,testCompileClasspath,testImplementationDependenciesMetadata +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.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 +org.ow2.asm:asm-analysis:9.9=spotbugs +org.ow2.asm:asm-commons:9.2=jacocoAnt +org.ow2.asm:asm-commons:9.9=spotbugs +org.ow2.asm:asm-tree:9.2=jacocoAnt +org.ow2.asm:asm-tree:9.9=spotbugs +org.ow2.asm:asm-util:9.9=spotbugs +org.ow2.asm:asm:9.2=jacocoAnt +org.ow2.asm:asm:9.9=spotbugs +org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j +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=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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..afba109 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 00e33ed..ec7c722 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/settings.gradle b/settings.gradle index 0c07b54..4752faf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,4 +7,4 @@ pluginManagement { } } -rootProject.name = "vogue" \ No newline at end of file +rootProject.name = "vogue" diff --git a/src/main/kotlin/com/mx/vogue/VoguePlugin.kt b/src/main/kotlin/com/mx/vogue/VoguePlugin.kt index f6a13a0..c8494e7 100644 --- a/src/main/kotlin/com/mx/vogue/VoguePlugin.kt +++ b/src/main/kotlin/com/mx/vogue/VoguePlugin.kt @@ -38,7 +38,7 @@ import org.gradle.api.Project import org.gradle.api.logging.LogLevel class VoguePlugin : Plugin { - @Suppress("MaxLineLength") + @Suppress("ktlint:standard:max-line-length") override fun apply(project: Project) { var dependenciesExtension = project.extensions.create("vogue", VogueDependenciesExtension::class.java) diff --git a/src/main/kotlin/com/mx/vogue/core/ReportRenderer.kt b/src/main/kotlin/com/mx/vogue/core/ReportRenderer.kt index 86ee827..2adf106 100644 --- a/src/main/kotlin/com/mx/vogue/core/ReportRenderer.kt +++ b/src/main/kotlin/com/mx/vogue/core/ReportRenderer.kt @@ -79,12 +79,12 @@ private fun buildUpgradeMessages(dependencyContexts: List, bu } } -@Suppress("MaxLineLength") +@Suppress("ktlint:standard:max-line-length") private fun buildWarningUpgradeMessage(dependencyContext: DependencyContext): String { return " - ${yellow(getPackage(dependencyContext.versionsPluginDependency))} [${green(dependencyContext.current.toString())} -> ${green(dependencyContext.latest.toString())}]\n" } -@Suppress("MaxLineLength") +@Suppress("ktlint:standard:max-line-length") private fun buildErrorUpgradeMessage(dependencyContext: DependencyContext): String { return " - ${red(getPackage(dependencyContext.versionsPluginDependency))} [${green(dependencyContext.current.toString())} -> ${green(dependencyContext.latest.toString())}]\n" } diff --git a/src/main/kotlin/com/mx/vogue/core/ReportUtils.kt b/src/main/kotlin/com/mx/vogue/core/ReportUtils.kt index 01cb17f..b16534d 100644 --- a/src/main/kotlin/com/mx/vogue/core/ReportUtils.kt +++ b/src/main/kotlin/com/mx/vogue/core/ReportUtils.kt @@ -14,6 +14,7 @@ * limitations under the License. */ @file:Suppress("TooManyFunctions") + package com.mx.vogue.core import com.mx.vogue.core.exceptions.VogueProcessingException @@ -51,7 +52,6 @@ fun getPackage(versionsPluginDependency: VersionsPluginDependency): String { return "${versionsPluginDependency.group}:${versionsPluginDependency.name}" } -@SuppressFBWarnings("BC_BAD_CAST_TO_ABSTRACT_COLLECTION") fun getPackageRule(versionsPluginDependency: VersionsPluginDependency, packageRules: List): PackageRule? { return packageRules.firstOrNull { Regex(it.`package`).containsMatchIn(getPackage(versionsPluginDependency)) @@ -76,7 +76,7 @@ fun filterStaleSuppressions(packageRules: List?): List }.toList() } -@Suppress("MaxLineLength") +@Suppress("ktlint:standard:max-line-length") fun reportStaleSuppressions(packageRules: List?) { if (packageRules == null) { return @@ -101,7 +101,7 @@ fun reportStaleSuppressions(packageRules: List?) { } } -@Suppress("MaxLineLength", "ThrowsCount", "ReturnCount") +@Suppress("ktlint:standard:max-line-length", "ThrowsCount", "ReturnCount") fun shouldSuppressPackageRule(packageRule: PackageRule?): Boolean { if (packageRule == null) { return false diff --git a/src/main/kotlin/com/mx/vogue/core/VersionNumber.kt b/src/main/kotlin/com/mx/vogue/core/VersionNumber.kt index 49c533c..8ba6872 100644 --- a/src/main/kotlin/com/mx/vogue/core/VersionNumber.kt +++ b/src/main/kotlin/com/mx/vogue/core/VersionNumber.kt @@ -22,7 +22,7 @@ import org.gradle.internal.impldep.com.google.common.base.Objects import org.gradle.internal.impldep.com.google.common.collect.Ordering import java.util.Locale -@Suppress("MaxLineLength") +@Suppress("ktlint:standard:max-line-length") class VersionNumber private constructor(val major: Int, val minor: Int, val micro: Int, val patch: Int, val qualifier: String?, private val scheme: AbstractScheme) : Comparable { constructor(major: Int, minor: Int, micro: Int, qualifier: String?) : this(major, minor, micro, 0, qualifier, DEFAULT_SCHEME) constructor(major: Int, minor: Int, micro: Int, patch: Int, qualifier: String?) : this(major, minor, micro, patch, qualifier, PATCH_SCHEME) @@ -47,7 +47,9 @@ class VersionNumber private constructor(val major: Int, val minor: Int, val micr } return if (patch != other.patch) { patch - other.patch - } else Ordering.natural>().nullsLast?>().compare(toLowerCase(qualifier), toLowerCase(other.qualifier)) + } else { + Ordering.natural>().nullsLast?>().compare(toLowerCase(qualifier), toLowerCase(other.qualifier)) + } } override fun equals(other: Any?): Boolean { diff --git a/src/test/groovy/com/mx/vogue/core/ConfigUtilsTest.groovy b/src/test/groovy/com/mx/vogue/core/ConfigUtilsTest.groovy index 5a85fb6..7f5ce11 100644 --- a/src/test/groovy/com/mx/vogue/core/ConfigUtilsTest.groovy +++ b/src/test/groovy/com/mx/vogue/core/ConfigUtilsTest.groovy @@ -183,4 +183,4 @@ class ConfigUtilsTest extends Specification { defaultConfig.packageRules[1].package == "com.mx.*" } -} \ No newline at end of file +}