Skip to content

Commit acb1321

Browse files
feat!: bump gradle, quality plugin, java
1 parent 733e799 commit acb1321

7 files changed

Lines changed: 41 additions & 34 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 11
17+
- name: Set up JDK 17
1818
uses: actions/setup-java@v3
1919
with:
20-
java-version: '11'
20+
java-version: '17'
2121
distribution: 'temurin'
2222
- name: Build with Gradle
2323
uses: gradle/gradle-build-action@0d13054264b0bb894ded474f08ebb30921341cee

build.gradle

Lines changed: 7 additions & 15 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 "4.4.2"
5-
id "com.github.mxenabled.vogue" version "1.1.0"
4+
id "com.github.mxenabled.coppuccino" version "5.+"
5+
id "com.github.mxenabled.vogue" version "2.+"
66
id "groovy"
77
id "java"
88
id "maven-publish"
@@ -12,8 +12,8 @@ plugins {
1212

1313
group "com.mx.binks"
1414
version "1.0.0"
15-
sourceCompatibility = JavaVersion.VERSION_11
16-
targetCompatibility = JavaVersion.VERSION_11
15+
sourceCompatibility = JavaVersion.VERSION_17
16+
targetCompatibility = JavaVersion.VERSION_17
1717

1818
repositories {
1919
mavenCentral()
@@ -27,7 +27,7 @@ dependencies {
2727
implementation "com.lordcodes.turtle:turtle:0.7.0" // Provides git and commandline interaction API
2828

2929
// Unit tests
30-
testImplementation "org.mockito:mockito-inline:[4.0,5.0)"
30+
testImplementation "org.mockito:mockito-inline:[5.0,6.0)"
3131
testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0"
3232
}
3333

@@ -46,7 +46,7 @@ gradlePlugin {
4646

4747
kotlin {
4848
compilerOptions {
49-
jvmTarget = JvmTarget.JVM_11
49+
jvmTarget = JvmTarget.JVM_17
5050
}
5151
}
5252

@@ -56,17 +56,9 @@ coppuccino {
5656
}
5757
}
5858

59-
sourceSets {
60-
test {
61-
groovy {
62-
srcDirs "src/test/groovy"
63-
}
64-
}
65-
}
66-
6759
test { useJUnitPlatform() }
6860

6961
wrapper {
70-
gradleVersion = "7.6.3"
62+
gradleVersion = "7.6.4"
7163
distributionType = Wrapper.DistributionType.ALL
7264
}

gradle.lockfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
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
45
com.github.spotbugs:spotbugs-annotations:4.9.8=spotbugs
56
com.github.spotbugs:spotbugs:4.9.8=spotbugs
67
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
7-
com.google.code.findbugs:jsr305:3.0.2=spotbugs
8+
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs
89
com.google.code.gson:gson:2.13.2=spotbugs
910
com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
1011
com.lordcodes.turtle:turtle:0.7.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
@@ -39,8 +40,8 @@ io.gitlab.arturbosch.detekt:detekt-tooling:1.23.8=detekt
3940
io.gitlab.arturbosch.detekt:detekt-utils:1.23.8=detekt
4041
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
4142
jaxen:jaxen:2.0.0=spotbugs
42-
net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
43-
net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
43+
net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
44+
net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
4445
net.sf.saxon:Saxon-HE:12.9=spotbugs
4546
org.apache.bcel:bcel:6.11.0=spotbugs
4647
org.apache.commons:commons-lang3:3.19.0=spotbugs
@@ -98,8 +99,8 @@ org.junit.platform:junit-platform-engine:1.8.2=testRuntimeOnlyDependenciesMetada
9899
org.junit:junit-bom:5.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
99100
org.junit:junit-bom:5.14.0=spotbugs
100101
org.junit:junit-bom:5.8.2=testRuntimeOnlyDependenciesMetadata
101-
org.mockito:mockito-core:4.11.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
102-
org.mockito:mockito-inline:4.11.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
102+
org.mockito:mockito-core:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
103+
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
103104
org.objenesis:objenesis:3.3=testRuntimeClasspath
104105
org.opentest4j:opentest4j:1.2.0=testRuntimeOnlyDependenciesMetadata
105106
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
@@ -118,4 +119,4 @@ org.snakeyaml:snakeyaml-engine:2.7=detekt
118119
org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
119120
org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
120121
org.xmlresolver:xmlresolver:5.3.3=spotbugs
121-
empty=annotationProcessor,apiDependenciesMetadata,compileOnlyDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions
122+
empty=annotationProcessor,apiDependenciesMetadata,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDef,kotlinScriptDefExtensions,runtimeOnlyDependenciesMetadata,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDef,testKotlinScriptDefExtensions

gradle/wrapper/gradle-wrapper.jar

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

gradlew

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

gradlew.bat

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

0 commit comments

Comments
 (0)