Skip to content

Commit dd1c83c

Browse files
feat!: bump gradle 8 java 21
1 parent 42fc43f commit dd1c83c

7 files changed

Lines changed: 66 additions & 56 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
uses: mxenabled/path-tools/.github/workflows/ci.yml@master
1717
with:
1818
force: ${{ inputs.force != '' && inputs.force }}
19-
java-version: '17'
19+
java-version: '21'
2020
skip-dependency-checks: true

build.gradle

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

33
plugins {
4-
id "com.github.mxenabled.coppuccino" version "6.+"
4+
id "com.github.mxenabled.coppuccino" version "7.+"
55
id "groovy"
66
id "java-gradle-plugin"
77
id "maven-publish"
@@ -13,13 +13,13 @@ version "3.0.2" // x-release-please-version
1313

1414
java {
1515
toolchain {
16-
languageVersion = JavaLanguageVersion.of(17)
16+
languageVersion = JavaLanguageVersion.of(21)
1717
}
1818
}
1919

2020
kotlin {
2121
compilerOptions {
22-
jvmTarget = JvmTarget.JVM_17
22+
jvmTarget = JvmTarget.JVM_21
2323
}
2424
}
2525

@@ -45,7 +45,7 @@ dependencies {
4545
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:[2.20,3.0)"
4646
implementation "com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.53.0"
4747

48-
testImplementation "org.mockito:mockito-inline:[5.0,6.0)"
48+
testImplementation "org.mockito:mockito-core:[5.0,6.0)"
4949
testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0"
5050
}
5151

@@ -65,6 +65,6 @@ gradlePlugin {
6565
}
6666

6767
wrapper {
68-
gradleVersion = "7.6.4"
68+
gradleVersion = "8.14.3"
6969
distributionType = Wrapper.DistributionType.ALL
7070
}

gradle.lockfile

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5-
com.fasterxml.jackson.core:jackson-core:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6-
com.fasterxml.jackson.core:jackson-databind:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
7-
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
8-
com.fasterxml.jackson:jackson-bom:2.21.1=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5+
com.fasterxml.jackson.core:jackson-core:2.21.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.21.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
7+
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
8+
com.fasterxml.jackson:jackson-bom:2.21.4=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
99
com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.53.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1010
com.github.ben-manes:gradle-versions-plugin:0.53.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
11-
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata
11+
com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata
1212
com.github.spotbugs:spotbugs:4.9.8=spotbugs
1313
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
14-
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata
15-
com.google.code.gson:gson:2.13.2=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
16-
com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,spotbugs,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
14+
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata
15+
com.google.code.gson:gson:2.13.2=spotbugs
16+
com.google.code.gson:gson:2.14.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
17+
com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
18+
com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
1719
com.squareup.moshi:moshi-kotlin:1.12.0=runtimeClasspath,testRuntimeClasspath
1820
com.squareup.moshi:moshi:1.12.0=runtimeClasspath,testRuntimeClasspath
1921
com.squareup.okhttp3:okhttp:4.12.0=runtimeClasspath,testRuntimeClasspath
@@ -50,8 +52,8 @@ io.gitlab.arturbosch.detekt:detekt-tooling:1.23.8=detekt
5052
io.gitlab.arturbosch.detekt:detekt-utils:1.23.8=detekt
5153
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
5254
jaxen:jaxen:2.0.0=spotbugs
53-
net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
54-
net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
55+
net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
56+
net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5557
net.sf.saxon:Saxon-HE:12.9=spotbugs
5658
org.apache.bcel:bcel:6.11.0=spotbugs
5759
org.apache.commons:commons-lang3:3.19.0=spotbugs
@@ -62,10 +64,10 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDep
6264
org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
6365
org.dom4j:dom4j:2.2.0=spotbugs
6466
org.hamcrest:hamcrest:3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
65-
org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
66-
org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
67-
org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
68-
org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
67+
org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
68+
org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
69+
org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
70+
org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
6971
org.jcommander:jcommander:1.85=detekt
7072
org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
7173
org.jetbrains.kotlin:kotlin-bom:2.0.21=runtimeClasspath,testRuntimeClasspath
@@ -103,19 +105,17 @@ org.jetbrains:annotations:13.0=compileClasspath,detekt,kotlinBuildToolsApiClassp
103105
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
104106
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
105107
org.junit:junit-bom:5.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
106-
org.junit:junit-bom:5.14.0=spotbugs
107-
org.mockito:mockito-core:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
108-
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
108+
org.junit:junit-bom:5.14.0=annotationProcessor,spotbugs,testAnnotationProcessor
109+
org.mockito:mockito-core:5.23.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
109110
org.objenesis:objenesis:3.3=testRuntimeClasspath
110111
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
111-
org.ow2.asm:asm-analysis:9.2=jacocoAnt
112112
org.ow2.asm:asm-analysis:9.9=spotbugs
113-
org.ow2.asm:asm-commons:9.2=jacocoAnt
113+
org.ow2.asm:asm-commons:9.8=jacocoAnt
114114
org.ow2.asm:asm-commons:9.9=spotbugs
115-
org.ow2.asm:asm-tree:9.2=jacocoAnt
115+
org.ow2.asm:asm-tree:9.8=jacocoAnt
116116
org.ow2.asm:asm-tree:9.9=spotbugs
117117
org.ow2.asm:asm-util:9.9=spotbugs
118-
org.ow2.asm:asm:9.2=jacocoAnt
118+
org.ow2.asm:asm:9.8=jacocoAnt
119119
org.ow2.asm:asm:9.9=spotbugs
120120
org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
121121
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
@@ -124,4 +124,4 @@ org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testImplemen
124124
org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
125125
org.xmlresolver:xmlresolver:5.3.3=spotbugs
126126
org.yaml:snakeyaml:2.5=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
127-
empty=annotationProcessor,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
127+
empty=detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testApiDependenciesMetadata,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)