Skip to content

Commit 8d20109

Browse files
authored
Merge pull request #6 from mxenabled/mitch/upgrade_checkstyle_gradle_java_mockito
feat!: bump checkstyle, gradle, java, mockito, spotless
2 parents af12dbb + 8cdd488 commit 8d20109

7 files changed

Lines changed: 64 additions & 58 deletions

File tree

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v3
17-
- name: Set up JDK 17
17+
- name: Set up JDK 21
1818
uses: actions/setup-java@v3
1919
with:
20-
java-version: '17'
20+
java-version: '21'
2121
distribution: 'temurin'
2222
- name: Build with Gradle
2323
uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee

build.gradle

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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"
77
id "java"
88
id "maven-publish"
@@ -12,8 +12,12 @@ plugins {
1212

1313
group "com.mx.binks"
1414
version "2.0.0"
15-
sourceCompatibility = JavaVersion.VERSION_17
16-
targetCompatibility = JavaVersion.VERSION_17
15+
16+
java {
17+
toolchain {
18+
languageVersion = JavaLanguageVersion.of(21)
19+
}
20+
}
1721

1822
repositories {
1923
mavenCentral()
@@ -27,7 +31,7 @@ dependencies {
2731
implementation "com.lordcodes.turtle:turtle:0.7.0" // Provides git and commandline interaction API
2832

2933
// Unit tests
30-
testImplementation "org.mockito:mockito-inline:[5.0,6.0)"
34+
testImplementation "org.mockito:mockito-core:5.21.0"
3135
testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0"
3236
}
3337

@@ -46,19 +50,19 @@ gradlePlugin {
4650

4751
kotlin {
4852
compilerOptions {
49-
jvmTarget = JvmTarget.JVM_17
53+
jvmTarget = JvmTarget.JVM_21
5054
}
5155
}
5256

5357
coppuccino {
5458
kotlin {
55-
enabled = true
59+
required = true
5660
}
5761
}
5862

5963
test { useJUnitPlatform() }
6064

6165
wrapper {
62-
gradleVersion = "7.6.4"
66+
gradleVersion = "8.14.3"
6367
distributionType = Wrapper.DistributionType.ALL
6468
}

gradle.lockfile

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@ io.gitlab.arturbosch.detekt:detekt-tooling:1.23.8=detekt
4040
io.gitlab.arturbosch.detekt:detekt-utils:1.23.8=detekt
4141
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
4242
jaxen:jaxen:2.0.0=spotbugs
43-
net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
44-
net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
43+
net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
44+
net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
4545
net.sf.saxon:Saxon-HE:12.9=spotbugs
4646
org.apache.bcel:bcel:6.11.0=spotbugs
4747
org.apache.commons:commons-lang3:3.19.0=spotbugs
4848
org.apache.commons:commons-text:1.14.0=spotbugs
4949
org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
5050
org.apache.logging.log4j:log4j-core:2.25.2=spotbugs
51-
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeOnlyDependenciesMetadata
51+
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDependenciesMetadata
5252
org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5353
org.dom4j:dom4j:2.2.0=spotbugs
5454
org.hamcrest:hamcrest:3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
55-
org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
56-
org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
57-
org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
58-
org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
55+
org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
56+
org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
57+
org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
58+
org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
5959
org.jcommander:jcommander:1.85=detekt
6060
org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
6161
org.jetbrains.kotlin:kotlin-build-common:2.1.0=kotlinBuildToolsApiClasspath
@@ -90,33 +90,25 @@ org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=detekt
9090
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=detekt
9191
org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=detekt
9292
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
9593
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
96-
org.junit.platform:junit-platform-commons:1.8.2=testRuntimeOnlyDependenciesMetadata
9794
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
98-
org.junit.platform:junit-platform-engine:1.8.2=testRuntimeOnlyDependenciesMetadata
9995
org.junit:junit-bom:5.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
10096
org.junit:junit-bom:5.14.0=spotbugs
101-
org.junit:junit-bom:5.8.2=testRuntimeOnlyDependenciesMetadata
102-
org.mockito:mockito-core:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
103-
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
97+
org.mockito:mockito-core:5.21.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
10498
org.objenesis:objenesis:3.3=testRuntimeClasspath
105-
org.opentest4j:opentest4j:1.2.0=testRuntimeOnlyDependenciesMetadata
10699
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
107-
org.ow2.asm:asm-analysis:9.2=jacocoAnt
108100
org.ow2.asm:asm-analysis:9.9=spotbugs
109-
org.ow2.asm:asm-commons:9.2=jacocoAnt
101+
org.ow2.asm:asm-commons:9.8=jacocoAnt
110102
org.ow2.asm:asm-commons:9.9=spotbugs
111-
org.ow2.asm:asm-tree:9.2=jacocoAnt
103+
org.ow2.asm:asm-tree:9.8=jacocoAnt
112104
org.ow2.asm:asm-tree:9.9=spotbugs
113105
org.ow2.asm:asm-util:9.9=spotbugs
114-
org.ow2.asm:asm:9.2=jacocoAnt
106+
org.ow2.asm:asm:9.8=jacocoAnt
115107
org.ow2.asm:asm:9.9=spotbugs
116108
org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
117109
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
118110
org.snakeyaml:snakeyaml-engine:2.7=detekt
119111
org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
120112
org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
121113
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
114+
empty=annotationProcessor,apiDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions

gradle/wrapper/gradle-wrapper.jar

-17.4 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 22 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 14 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)