Skip to content

Commit 84cdaff

Browse files
meotchwilliamsmeotch
authored andcommitted
feat!: bump to gradle 8 and java 21
1 parent 14a70a4 commit 84cdaff

8 files changed

Lines changed: 60 additions & 52 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ 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'

build.gradle

Lines changed: 6 additions & 6 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 "6.+"
5-
id "com.github.mxenabled.vogue" version "3.+"
4+
id "com.github.mxenabled.coppuccino" version "7.+"
5+
id "com.github.mxenabled.vogue" version "4.+"
66
id "groovy"
77
id "java-gradle-plugin"
88
id "maven-publish"
@@ -14,13 +14,13 @@ version "3.0.3" // x-release-please-version
1414

1515
java {
1616
toolchain {
17-
languageVersion = JavaLanguageVersion.of(17)
17+
languageVersion = JavaLanguageVersion.of(21)
1818
}
1919
}
2020

2121
kotlin {
2222
compilerOptions {
23-
jvmTarget = JvmTarget.JVM_17
23+
jvmTarget = JvmTarget.JVM_21
2424
}
2525
}
2626

@@ -38,7 +38,7 @@ repositories {
3838
dependencies {
3939
implementation "com.lordcodes.turtle:turtle:0.7.0" // Provides git and commandline interaction API
4040

41-
testImplementation "org.mockito:mockito-inline:[5.0,6.0)"
41+
testImplementation "org.mockito:mockito-core:[5.0,6.0)"
4242
testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0"
4343
}
4444

@@ -58,6 +58,6 @@ gradlePlugin {
5858
}
5959

6060
wrapper {
61-
gradleVersion = "7.6.4"
61+
gradleVersion = "8.14.3"
6262
distributionType = Wrapper.DistributionType.ALL
6363
}

gradle.lockfile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +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.8=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata
4+
com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata
55
com.github.spotbugs:spotbugs:4.9.8=spotbugs
66
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
7-
com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testCompileClasspath,testCompileOnlyDependenciesMetadata
7+
com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,compileOnlyDependenciesMetadata,spotbugs,testAnnotationProcessor,testCompileClasspath,testCompileOnlyDependenciesMetadata
88
com.google.code.gson:gson:2.13.2=spotbugs
99
com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
1010
com.lordcodes.turtle:turtle:0.7.0=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
@@ -39,8 +39,8 @@ io.gitlab.arturbosch.detekt:detekt-tooling:1.23.8=detekt
3939
io.gitlab.arturbosch.detekt:detekt-utils:1.23.8=detekt
4040
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
4141
jaxen:jaxen:2.0.0=spotbugs
42-
net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
43-
net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
42+
net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
43+
net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
4444
net.sf.saxon:Saxon-HE:12.9=spotbugs
4545
org.apache.bcel:bcel:6.11.0=spotbugs
4646
org.apache.commons:commons-lang3:3.19.0=spotbugs
@@ -51,10 +51,10 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath,testImplementationDep
5151
org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
5252
org.dom4j:dom4j:2.2.0=spotbugs
5353
org.hamcrest:hamcrest:3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
54-
org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt
55-
org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
56-
org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
57-
org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
54+
org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt
55+
org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt
56+
org.jacoco:org.jacoco.core:0.8.13=jacocoAnt
57+
org.jacoco:org.jacoco.report:0.8.13=jacocoAnt
5858
org.jcommander:jcommander:1.85=detekt
5959
org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath
6060
org.jetbrains.kotlin:kotlin-build-common:2.1.0=kotlinBuildToolsApiClasspath
@@ -89,24 +89,22 @@ org.jetbrains:annotations:13.0=compileClasspath,detekt,kotlinBuildToolsApiClassp
8989
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
9090
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
9191
org.junit:junit-bom:5.12.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
92-
org.junit:junit-bom:5.14.0=spotbugs
93-
org.mockito:mockito-core:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
94-
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
92+
org.junit:junit-bom:5.14.0=annotationProcessor,spotbugs,testAnnotationProcessor
93+
org.mockito:mockito-core:5.23.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
9594
org.objenesis:objenesis:3.3=testRuntimeClasspath
9695
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
97-
org.ow2.asm:asm-analysis:9.2=jacocoAnt
9896
org.ow2.asm:asm-analysis:9.9=spotbugs
99-
org.ow2.asm:asm-commons:9.2=jacocoAnt
97+
org.ow2.asm:asm-commons:9.8=jacocoAnt
10098
org.ow2.asm:asm-commons:9.9=spotbugs
101-
org.ow2.asm:asm-tree:9.2=jacocoAnt
99+
org.ow2.asm:asm-tree:9.8=jacocoAnt
102100
org.ow2.asm:asm-tree:9.9=spotbugs
103101
org.ow2.asm:asm-util:9.9=spotbugs
104-
org.ow2.asm:asm:9.2=jacocoAnt
102+
org.ow2.asm:asm:9.8=jacocoAnt
105103
org.ow2.asm:asm:9.9=spotbugs
106104
org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
107105
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
108106
org.snakeyaml:snakeyaml-engine:2.7=detekt
109107
org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
110108
org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
111109
org.xmlresolver:xmlresolver:5.3.3=spotbugs
112-
empty=annotationProcessor,detektPlugins,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,spotbugsPlugins,testAnnotationProcessor,testApiDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
110+
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.

jitpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
jdk:
2-
- openjdk17
2+
- openjdk21

0 commit comments

Comments
 (0)