diff --git a/build.gradle b/build.gradle index 6136654..c55e9f0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,37 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { + id "com.github.mxenabled.coppuccino" version "6.+" id "groovy" - id "java" - id "com.github.mxenabled.coppuccino" version "5.+" - id "maven-publish" id "java-gradle-plugin" + id "maven-publish" id "org.jetbrains.kotlin.jvm" version "2.1.0" } group "com.mx.vogue" version "3.0.1" // x-release-please-version -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_17 + } +} + +coppuccino { + kotlin { enabled = true } + coverage { + minimumCoverage = 0.73 + excludes = [ + "com/mx/vogue/core/models/**" + ] + } +} repositories { mavenCentral() @@ -22,17 +41,16 @@ repositories { } 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[" + implementation "com.google.code.gson:gson:[2.0,3.0)" 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:[5.0,6.0[" - api "org.spockframework:spock-core:2.4-M6-groovy-3.0" + testImplementation "org.mockito:mockito-inline:[5.0,6.0)" + testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0" } +test { useJUnitPlatform() } + gradlePlugin { plugins { voguePlugin { @@ -46,24 +64,6 @@ gradlePlugin { } } -kotlin { - compilerOptions { - jvmTarget = JvmTarget.JVM_17 - } -} - -coppuccino { - kotlin { enabled = true } - coverage { - minimumCoverage = 0.73 - excludes = [ - "com/mx/vogue/core/models/**" - ] - } -} - -test { useJUnitPlatform() } - wrapper { gradleVersion = "7.6.4" distributionType = Wrapper.DistributionType.ALL diff --git a/dependency_suppression.xml b/dependency_suppression.xml deleted file mode 100644 index c87104a..0000000 --- a/dependency_suppression.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - This plugin is not used in runtime code, so we are safe to suppress these. - cpe:/a:gradle:gradle - cpe:/a:jetbrains:kotlin - CVE-2021-29425 - CVE-2021-35517 - CVE-2021-35516 - CVE-2021-35515 - CVE-2021-36090 - CVE-2020-36518 - - - GSON false positive. We are on an unaffected version. - CVE-2022-25647 - - \ No newline at end of file diff --git a/gradle.lockfile b/gradle.lockfile index 11c1b0d..b42f5cd 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -1,18 +1,17 @@ # 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.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.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.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-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata 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,compileOnlyDependenciesMetadata,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata 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 @@ -20,7 +19,7 @@ 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 +commons-io:commons-io:2.20.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 @@ -49,20 +48,20 @@ 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 +io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs -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.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.1=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.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.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.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.dom4j:dom4j:2.2.0=spotbugs -org.hamcrest:hamcrest:3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.hamcrest:hamcrest:3.0=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 @@ -88,14 +87,12 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.1.0=kotlinBuildToolsApiClasspath, 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-common:2.1.0=detekt,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-jdk7:2.0.21=runtimeClasspath,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.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.kotlinx:kotlinx-html-jvm:0.8.1=detekt org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=detekt @@ -103,16 +100,14 @@ 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: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.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=spotbugs +org.mockito:mockito-core:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.mockito:mockito-inline:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.objenesis:objenesis:3.3=testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=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 @@ -125,8 +120,8 @@ 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.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.xmlresolver:xmlresolver:5.3.3=spotbugs -org.yaml:snakeyaml:2.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -empty=annotationProcessor,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions +org.yaml:snakeyaml:2.5=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +empty=annotationProcessor,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..efde7bf --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk17