diff --git a/.vogue.yml b/.vogue.yml deleted file mode 100644 index cd35d4b..0000000 --- a/.vogue.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -packageRules: -- package: "com.github.mxenabled.binks" - rules: - major: - maxDiff: 0 - requireLatest: false - minor: - maxDiff: 0 - requireLatest: false - micro: - maxDiff: 0 - requireLatest: false -- package: "com.github.mxenabled.coppuccino:com.github.mxenabled.coppuccino.gradle.plugin" - rules: {} - suppressUntil: "2026-03-02" -- package: "com.github.mxenabled.vogue:com.github.mxenabled.vogue.gradle.plugin" - rules: {} - suppressUntil: "2026-03-02" diff --git a/build.gradle b/build.gradle index 1f2ed83..e085ed1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,32 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - id "com.github.mxenabled.coppuccino" version "5.+" - id "com.github.mxenabled.vogue" version "2.+" + id "com.github.mxenabled.coppuccino" version "6.+" + id "com.github.mxenabled.vogue" version "3.+" id "groovy" - id "java" - id "maven-publish" id "java-gradle-plugin" + id "maven-publish" id "org.jetbrains.kotlin.jvm" version "2.1.0" } group "com.mx.binks" version "3.0.2" // 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 } +} repositories { mavenCentral() @@ -23,14 +36,14 @@ repositories { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" implementation "com.lordcodes.turtle:turtle:0.7.0" // Provides git and commandline interaction API - // Unit tests testImplementation "org.mockito:mockito-inline:[5.0,6.0)" testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0" } +test { useJUnitPlatform() } + gradlePlugin { plugins { binksPlugin { @@ -44,20 +57,6 @@ gradlePlugin { } } -kotlin { - compilerOptions { - jvmTarget = JvmTarget.JVM_17 - } -} - -coppuccino { - kotlin { - enabled = true - } -} - -test { useJUnitPlatform() } - wrapper { gradleVersion = "7.6.4" distributionType = Wrapper.DistributionType.ALL diff --git a/gradle.lockfile b/gradle.lockfile index 69ecc73..d47b62e 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -1,11 +1,10 @@ # 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.github.spotbugs:spotbugs-annotations:4.9.4=compileClasspath,compileOnlyDependenciesMetadata -com.github.spotbugs:spotbugs-annotations:4.9.8=spotbugs +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,spotbugs +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata 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 @@ -46,9 +45,9 @@ 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.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=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath @@ -76,13 +75,10 @@ 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=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.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 @@ -90,19 +86,13 @@ 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: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.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 @@ -119,4 +109,4 @@ 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,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions +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 diff --git a/settings.gradle b/settings.gradle index de38fd1..efa5beb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,12 +1,10 @@ pluginManagement { repositories { - maven { url "https://artifactory.internal.mx:443/maven-local" } - maven { url "https://artifactory.internal.mx:443/gradle-local" } gradlePluginPortal() mavenCentral() mavenLocal() - maven { url 'https://jitpack.io' } + maven { url "https://jitpack.io" } } } -rootProject.name = 'binks' +rootProject.name = "binks"