diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7c61926..82ded00 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '11' distribution: 'temurin' - name: Build with Gradle uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee diff --git a/build.gradle b/build.gradle index 309a6aa..6351939 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,19 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { - id "com.github.mxenabled.coppuccino" version "3.0.4" - id "com.github.mxenabled.vogue" version "1.0.1" - id "com.github.mxenabled.hush" version "2.0.1" - id "com.github.mxenabled.binks" version "0.0.1" - // id "com.mx.binks" version "0.0.1" // for local testing + id "com.github.mxenabled.coppuccino" version "4.4.2" + id "com.github.mxenabled.vogue" version "1.1.0" id "groovy" id "java" id "maven-publish" id "java-gradle-plugin" - id "org.jetbrains.kotlin.jvm" version "1.7.10" + id "org.jetbrains.kotlin.jvm" version "2.1.0" } group "com.mx.binks" version "0.0.1" -sourceCompatibility = 1.8 +sourceCompatibility = JavaVersion.VERSION_11 +targetCompatibility = JavaVersion.VERSION_11 repositories { mavenCentral() @@ -26,15 +26,9 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" implementation "com.lordcodes.turtle:turtle:0.7.0" // Provides git and commandline interaction API - constraints { - implementation ("com.thoughtworks.xstream:xstream:1.4.19") { because "It resolves a bajillion CVEs" } - } - // Unit tests - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.+" - testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.+" - testImplementation "org.mockito:mockito-inline:4.+" - testImplementation "org.spockframework:spock-core:2.2-M1-groovy-3.0" + testImplementation "org.mockito:mockito-inline:[4.0,5.0)" + testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0" } gradlePlugin { @@ -50,19 +44,29 @@ gradlePlugin { } } -compileKotlin { kotlinOptions { jvmTarget = "1.8" } } - -compileTestKotlin { kotlinOptions { jvmTarget = "1.8" } } +kotlin { + compilerOptions { + jvmTarget = JvmTarget.JVM_11 + } +} -coppuccino { kotlin { enabled = true } } +coppuccino { + kotlin { + enabled = true + } +} 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 3823421..672cbbc 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -1,86 +1,121 @@ # 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.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=spotbugs +com.google.code.gson:gson:2.13.2=spotbugs +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs com.lordcodes.turtle:turtle:0.7.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -io.github.detekt.sarif4k:sarif4k:0.0.1=detekt -io.gitlab.arturbosch.detekt:detekt-api:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-cli:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-core:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-metrics:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-parser:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-psi-utils:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-report-html:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-report-sarif:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-report-txt:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-report-xml:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-complexity:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-coroutines:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-documentation:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-empty:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-errorprone:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-exceptions:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-naming:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-performance:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-style:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-tooling:1.20.0=detekt -io.gitlab.arturbosch.detekt:detekt-utils:1.20.0=detekt -net.bytebuddy:byte-buddy-agent:1.12.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.java.dev.jna:jna:5.6.0=detekt,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +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 +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=testRuntimeClasspath +jaxen:jaxen:2.0.0=spotbugs +net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testImplementationDependenciesMetadata,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.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata -org.assertj:assertj-core:3.20.2=testRuntimeClasspath -org.codehaus.groovy:groovy:3.0.9=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -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.20200330=detekt,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20=detekt -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20=detekt -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.7.10=kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-reflect:1.6.20=detekt -org.jetbrains.kotlin:kotlin-reflect:1.7.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-script-runtime:1.6.20=detekt -org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20=detekt -org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.6.20=detekt -org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.5=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,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.jupiter:junit-jupiter-engine:5.8.2=testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-commons:1.8.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-engine:1.8.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.junit.platform:junit-platform-launcher:1.8.2=testRuntimeClasspath -org.junit.platform:junit-platform-testkit:1.8.2=testRuntimeClasspath -org.junit:junit-bom:5.8.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.mockito:mockito-core:4.6.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.mockito:mockito-inline:4.6.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.objenesis:objenesis:3.2=testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath,testRuntimeOnlyDependenciesMetadata -org.ow2.asm:asm-analysis:9.1=jacocoAnt -org.ow2.asm:asm-commons:9.1=jacocoAnt -org.ow2.asm:asm-tree:9.1=jacocoAnt -org.ow2.asm:asm:9.1=jacocoAnt -org.ow2.asm:asm:9.2=testRuntimeClasspath -org.spockframework:spock-core:2.2-M1-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.yaml:snakeyaml:1.30=detekt -empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions +org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.dom4j:dom4j:2.2.0=spotbugs +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 +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-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 +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-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.jupiter:junit-jupiter-api:5.8.2=testRuntimeOnlyDependenciesMetadata +org.junit.jupiter:junit-jupiter-engine:5.8.2=testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.8.2=testRuntimeOnlyDependenciesMetadata +org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.8.2=testRuntimeOnlyDependenciesMetadata +org.junit:junit-bom:5.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.junit:junit-bom:5.14.0=spotbugs +org.junit:junit-bom:5.8.2=testRuntimeOnlyDependenciesMetadata +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=testRuntimeOnlyDependenciesMetadata +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 +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=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.3.3=spotbugs +empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..41d9927 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..609ab8e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ 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 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index a997645..de38fd1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,4 +9,4 @@ pluginManagement { } } -rootProject.name = 'binks' \ No newline at end of file +rootProject.name = 'binks' diff --git a/src/main/kotlin/com/mx/binks/ReleaseTask.kt b/src/main/kotlin/com/mx/binks/ReleaseTask.kt index 7e5dc76..f004593 100644 --- a/src/main/kotlin/com/mx/binks/ReleaseTask.kt +++ b/src/main/kotlin/com/mx/binks/ReleaseTask.kt @@ -29,7 +29,6 @@ open class ReleaseTask : DefaultTask() { option = "force", description = "Force tag. Moves existing tag to current hash" ) - @get:Input var force: Boolean = false @@ -72,9 +71,9 @@ open class ReleaseTask : DefaultTask() { } throw ReleaseError( "${ - red("You'sa in big doodoo, dis time!") + red("You'sa in big doodoo, dis time!") }\n${ - yellow("Version ($version) already in use. Change the version or use --force") + yellow("Version ($version) already in use. Change the version or use --force") }" ) }