Skip to content

Commit f2a72cb

Browse files
stevecl5stevecl5
committed
fix: resolve snyk vulnerabilities
build: update dependencies build: clean up gradle configuration files
1 parent d377b8f commit f2a72cb

5 files changed

Lines changed: 33 additions & 63 deletions

File tree

‎.vogue.yml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎build.gradle‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,32 @@
11
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22

33
plugins {
4-
id "com.github.mxenabled.coppuccino" version "5.+"
5-
id "com.github.mxenabled.vogue" version "2.+"
4+
id "com.github.mxenabled.coppuccino" version "6.+"
5+
id "com.github.mxenabled.vogue" version "3.+"
66
id "groovy"
7-
id "java"
8-
id "maven-publish"
97
id "java-gradle-plugin"
8+
id "maven-publish"
109
id "org.jetbrains.kotlin.jvm" version "2.1.0"
1110
}
1211

1312
group "com.mx.binks"
1413
version "3.0.2" // x-release-please-version
15-
sourceCompatibility = JavaVersion.VERSION_17
16-
targetCompatibility = JavaVersion.VERSION_17
14+
15+
java {
16+
toolchain {
17+
languageVersion = JavaLanguageVersion.of(17)
18+
}
19+
}
20+
21+
kotlin {
22+
compilerOptions {
23+
jvmTarget = JvmTarget.JVM_17
24+
}
25+
}
26+
27+
coppuccino {
28+
kotlin { enabled = true }
29+
}
1730

1831
repositories {
1932
mavenCentral()
@@ -23,14 +36,14 @@ repositories {
2336
}
2437

2538
dependencies {
26-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
2739
implementation "com.lordcodes.turtle:turtle:0.7.0" // Provides git and commandline interaction API
2840

29-
// Unit tests
3041
testImplementation "org.mockito:mockito-inline:[5.0,6.0)"
3142
testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0"
3243
}
3344

45+
test { useJUnitPlatform() }
46+
3447
gradlePlugin {
3548
plugins {
3649
binksPlugin {
@@ -44,20 +57,6 @@ gradlePlugin {
4457
}
4558
}
4659

47-
kotlin {
48-
compilerOptions {
49-
jvmTarget = JvmTarget.JVM_17
50-
}
51-
}
52-
53-
coppuccino {
54-
kotlin {
55-
enabled = true
56-
}
57-
}
58-
59-
test { useJUnitPlatform() }
60-
6160
wrapper {
6261
gradleVersion = "7.6.4"
6362
distributionType = Wrapper.DistributionType.ALL

‎gradle.lockfile‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
com.github.spotbugs:spotbugs-annotations:4.9.4=compileClasspath,compileOnlyDependenciesMetadata
5-
com.github.spotbugs:spotbugs-annotations:4.9.8=spotbugs
4+
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata
65
com.github.spotbugs:spotbugs:4.9.8=spotbugs
76
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
8-
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs
7+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata
98
com.google.code.gson:gson:2.13.2=spotbugs
109
com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
1110
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
4645
org.apache.bcel:bcel:6.11.0=spotbugs
4746
org.apache.commons:commons-lang3:3.19.0=spotbugs
4847
org.apache.commons:commons-text:1.14.0=spotbugs
49-
org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
50-
org.apache.logging.log4j:log4j-core:2.25.2=spotbugs
51-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
48+
org.apache.logging.log4j:log4j-api:2.25.3=spotbugs
49+
org.apache.logging.log4j:log4j-core:2.25.3=spotbugs
50+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
5251
org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5352
org.dom4j:dom4j:2.2.0=spotbugs
5453
org.hamcrest:hamcrest:3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
@@ -76,33 +75,24 @@ org.jetbrains.kotlin:kotlin-scripting-common:2.1.0=kotlinBuildToolsApiClasspath,
7675
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
7776
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
7877
org.jetbrains.kotlin:kotlin-scripting-jvm:2.1.0=kotlinBuildToolsApiClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest
79-
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21=detekt
78+
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0=detekt
8079
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=detekt
81-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
8280
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=detekt
83-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
84-
org.jetbrains.kotlin:kotlin-stdlib:2.0.21=detekt
85-
org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
81+
org.jetbrains.kotlin:kotlin-stdlib:2.1.0=apiDependenciesMetadata,compileClasspath,detekt,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
8682
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
8783
org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1=detekt
8884
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=detekt
8985
org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=detekt
9086
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=detekt
9187
org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=detekt
9288
org.jetbrains:annotations:13.0=compileClasspath,detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,kotlinCompilerPluginClasspathTest,kotlinKlibCommonizerClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
93-
org.junit.jupiter:junit-jupiter-api:5.8.2=testRuntimeOnlyDependenciesMetadata
94-
org.junit.jupiter:junit-jupiter-engine:5.8.2=testRuntimeOnlyDependenciesMetadata
9589
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
96-
org.junit.platform:junit-platform-commons:1.8.2=testRuntimeOnlyDependenciesMetadata
9790
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
98-
org.junit.platform:junit-platform-engine:1.8.2=testRuntimeOnlyDependenciesMetadata
9991
org.junit:junit-bom:5.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
10092
org.junit:junit-bom:5.14.0=spotbugs
101-
org.junit:junit-bom:5.8.2=testRuntimeOnlyDependenciesMetadata
10293
org.mockito:mockito-core:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
10394
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
10495
org.objenesis:objenesis:3.3=testRuntimeClasspath
105-
org.opentest4j:opentest4j:1.2.0=testRuntimeOnlyDependenciesMetadata
10696
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
10797
org.ow2.asm:asm-analysis:9.2=jacocoAnt
10898
org.ow2.asm:asm-analysis:9.9=spotbugs
@@ -119,4 +109,4 @@ org.snakeyaml:snakeyaml-engine:2.7=detekt
119109
org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
120110
org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
121111
org.xmlresolver:xmlresolver:5.3.3=spotbugs
122-
empty=annotationProcessor,apiDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions
112+
empty=annotationProcessor,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

‎jitpack.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
jdk:
2+
- openjdk17

‎settings.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
pluginManagement {
22
repositories {
3-
maven { url "https://artifactory.internal.mx:443/maven-local" }
4-
maven { url "https://artifactory.internal.mx:443/gradle-local" }
53
gradlePluginPortal()
64
mavenCentral()
75
mavenLocal()
8-
maven { url 'https://jitpack.io' }
6+
maven { url "https://jitpack.io" }
97
}
108
}
119

12-
rootProject.name = 'binks'
10+
rootProject.name = "binks"

0 commit comments

Comments
 (0)