diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd4f7fc..3d30d10 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: '17' + java-version: '21' skip-dependency-checks: true diff --git a/build.gradle b/build.gradle index 73a613f..c5b960d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { id "groovy" id "java" - id "com.github.mxenabled.coppuccino" version "5.+" + id "com.github.mxenabled.coppuccino" version "6.+" id "maven-publish" id "java-gradle-plugin" id "org.jetbrains.kotlin.jvm" version "2.1.0" @@ -11,8 +11,12 @@ plugins { group "com.mx.vogue" version "2.0.0" // x-release-please-version -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} repositories { mavenCentral() @@ -27,9 +31,8 @@ dependencies { 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.mockito:mockito-core:[5.21.0,6.0)" api "org.spockframework:spock-core:2.4-M6-groovy-3.0" } @@ -48,12 +51,12 @@ gradlePlugin { kotlin { compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_21 } } coppuccino { - kotlin { enabled = true } + kotlin { required = true } coverage { minimumCoverage = 0.73 excludes = [ @@ -65,6 +68,6 @@ coppuccino { test { useJUnitPlatform() } wrapper { - gradleVersion = "7.6.4" + gradleVersion = "8.14.3" distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle.lockfile b/gradle.lockfile index 11c1b0d..153651e 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -1,18 +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.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.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.0=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.4=compileClasspath,compileOnlyDependenciesMetadata +com.github.spotbugs:spotbugs-annotations:4.9.8=spotbugs 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 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 +20,8 @@ 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 +commons-io:commons-io:2.21.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,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 @@ -51,11 +52,13 @@ 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.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.17.7=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.17.7=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.bcel:bcel:6.11.0=spotbugs +org.apache.bcel:bcel:6.12.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.apache.commons:commons-lang3:3.19.0=spotbugs +org.apache.commons:commons-lang3:3.20.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,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 @@ -63,10 +66,10 @@ org.apiguardian:apiguardian-api:1.1.2=apiDependenciesMetadata,compileClasspath,i 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.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.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 @@ -103,24 +106,20 @@ 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.junit.platform:junit-platform-commons:1.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit:junit-bom:5.12.2=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit:junit-bom:5.14.0=spotbugs +org.mockito:mockito-core:5.21.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.8=jacocoAnt org.ow2.asm:asm-commons:9.9=spotbugs -org.ow2.asm:asm-tree:9.2=jacocoAnt +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.2=jacocoAnt +org.ow2.asm:asm:9.8=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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5c00f61..37a6725 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.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists