Skip to content

Commit bdb73bf

Browse files
astrapisixtynineclaude
astrapisixtynine
and
claude
committed
Upgrade Gradle wrapper to 9.7.0 and replace license-gradle-plugin with Spotless
Bumps the wrapper and Gradle plugin versions (spotless, grgit, version-catalog-update, ben-manes versions) for Gradle 9 compatibility, fixes the resulting module-info.java module names and Groovy DSL property-assignment deprecations, and drops the unmaintained com.github.hierynomus.license plugin in favor of Spotless's licenseHeaderFile step. Also bumps CI workflow action versions. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
1 parent 2de5cc3 commit bdb73bf

15 files changed

Lines changed: 246 additions & 216 deletions

‎.github/workflows/gradle.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ jobs:
2020

2121
steps:
2222
- name: Checkout sources
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v7
2424
- name: Setup Java
25-
uses: actions/setup-java@v4
25+
uses: actions/setup-java@v5
2626
with:
2727
java-version: '17'
2828
distribution: 'temurin'
2929
- name: Setup Gradle
30-
uses: gradle/actions/setup-gradle@v3
30+
uses: gradle/actions/setup-gradle@v6
3131
- name: Execute Gradle build
3232
run: ./gradlew build
3333
env:
3434
ossrhUsername: ${{secrets.OSSRHUSERNAME}}
3535
ossrhPassword: ${{secrets.OSSRHPASSWORD}}
36-
- uses: codecov/codecov-action@v4
36+
- uses: codecov/codecov-action@v7
3737
with:
3838
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos

‎build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
repositories {
33
maven {
4-
url projectRepositoriesMavenUrl
4+
url = projectRepositoriesMavenUrl
55
}
66
}
77
}
@@ -13,7 +13,6 @@ plugins {
1313
id 'signing'
1414
id 'jacoco'
1515
alias(libs.plugins.gradle.versions.plugin)
16-
alias(libs.plugins.license.gradle.plugin)
1716
alias(libs.plugins.grgit.gradle)
1817
alias(libs.plugins.spotless.plugin.gradle)
1918
alias(libs.plugins.version.catalog.update)
@@ -27,7 +26,6 @@ description = "$rootProject.name"
2726
apply from: "gradle/dependencies.gradle"
2827
apply from: "gradle/formatting.gradle"
2928
apply from: "gradle/grgit.gradle"
30-
apply from: "gradle/licensing.gradle"
3129
apply from: "gradle/packaging.gradle"
3230
apply from: "gradle/publishing.gradle"
3331
apply from: "gradle/repositories.gradle"

‎gradle/formatting.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ spotless {
77

88
// define the steps to apply to those files
99
trimTrailingWhitespace()
10-
indentWithSpaces() // or spaces. Takes an integer argument if you don"t like 4
10+
leadingTabsToSpaces() // or spaces. Takes an integer argument if you don"t like 4
1111
endWithNewline()
1212
}
1313
java {
1414
// export config file: https://github.com/diffplug/spotless/blob/main/ECLIPSE_SCREENSHOTS.md#creating-spotlessimportorder
1515
importOrderFile('src/test/resources/spotless/importorder.properties') // import order file as exported from eclipse
1616
eclipse("4.21").configFile("src/test/resources/spotless/alpharo-formatter.xml")
17+
licenseHeaderFile(rootProject.file("src/main/resources/license-header.txt"))
1718
}
1819
}

‎gradle/libs.versions.toml‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
[versions]
2-
commons-lang3-version = "3.14.0"
3-
equalsverifier-version = "3.16.1"
4-
gradle-plugin-grgit-version = "5.2.2"
5-
gradle-plugin-license-version = "0.16.1"
6-
gradle-plugin-spotless-version = "7.0.0.BETA1"
7-
gradle-plugin-version-catalog-update-version = "0.8.4"
8-
gradle-plugin-versions-version = "0.51.0"
2+
commons-lang3-version = "3.20.0"
3+
equalsverifier-version = "4.5"
4+
gradle-plugin-grgit-version = "5.3.3"
5+
gradle-plugin-spotless-version = "8.10.0"
6+
gradle-plugin-version-catalog-update-version = "1.1.1"
7+
gradle-plugin-versions-version = "0.61.0"
98
jobj-copy-version = "4.2"
10-
jobj-core-version = "8.2"
9+
jobj-core-version = "9.1"
1110
jobj-reflect-version = "2.4"
12-
junit-jupiter-params-version = "5.11.0-M2"
13-
junit-jupiter-version = "5.11.0-M2"
14-
junit-platform-launcher-version = "1.11.0-M2"
11+
junit-jupiter-params-version = "6.1.3"
12+
junit-jupiter-version = "6.1.3"
13+
junit-platform-launcher-version = "6.1.3"
1514
meanbean-version = "3.0.0-M9"
16-
silly-collection-version = "27.1"
15+
silly-collection-version = "28.1"
1716
silly-math-version = "2.3"
18-
silly-strings-version = "9.1"
19-
test-object-version = "8.2"
17+
silly-strings-version = "9.2"
18+
test-object-version = "9"
2019
vintage-time-version = "6"
2120

2221
[libraries]
@@ -44,8 +43,7 @@ unit-testing = [
4443
]
4544

4645
[plugins]
47-
gradle-versions-plugin = { id = "com.github.ben-manes.versions", version.ref = "gradle-plugin-versions-version" }
46+
gradle-versions-plugin = { id = "io.github.ben-manes.versions", version.ref = "gradle-plugin-versions-version" }
4847
grgit-gradle = { id = "org.ajoberstar.grgit", version.ref = "gradle-plugin-grgit-version" }
49-
license-gradle-plugin = { id = "com.github.hierynomus.license", version.ref = "gradle-plugin-license-version" }
5048
spotless-plugin-gradle = { id = "com.diffplug.spotless", version.ref = "gradle-plugin-spotless-version" }
5149
version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "gradle-plugin-version-catalog-update-version" }

‎gradle/licensing.gradle‎

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

‎gradle/publishing.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ publishing {
6363
repositories {
6464
maven {
6565
credentials {
66-
username System.getenv("$projectRepositoriesUserNameKey") ?: project.property("$projectRepositoriesUserNameKey")
67-
password System.getenv("$projectRepositoriesPasswordKey") ?: project.property("$projectRepositoriesPasswordKey")
66+
username = System.getenv("$projectRepositoriesUserNameKey") ?: project.property("$projectRepositoriesUserNameKey")
67+
password = System.getenv("$projectRepositoriesPasswordKey") ?: project.property("$projectRepositoriesPasswordKey")
6868
}
6969
def releasesRepoUrl = "$projectRepositoriesReleasesRepoUrl" as Object
7070
def snapshotsRepoUrl = "$projectRepositoriesSnapshotsRepoUrl" as Object

‎gradle/repositories.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ repositories {
55
* This repository is intended for release versions
66
**/
77
maven {
8-
name "$projectRepositoriesReleasesName"
9-
url "$projectRepositoriesReleasesRepoUrl"
8+
name = "$projectRepositoriesReleasesName"
9+
url = "$projectRepositoriesReleasesRepoUrl"
1010
mavenContent {
1111
releasesOnly()
1212
}
@@ -16,8 +16,8 @@ repositories {
1616
* on the specified url for snapshots
1717
**/
1818
maven {
19-
name "$projectRepositoriesSnapshotsName"
20-
url "$projectRepositoriesSnapshotsRepoUrl"
19+
name = "$projectRepositoriesSnapshotsName"
20+
url = "$projectRepositoriesSnapshotsRepoUrl"
2121
mavenContent {
2222
snapshotsOnly()
2323
}

‎gradle/version-catalog-update.gradle‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,5 @@ versionCatalogUpdate {
2424

2525
// keep versions without any library or plugin reference
2626
keepUnusedVersions = true
27-
// keep all libraries that aren't used in the project
28-
keepUnusedLibraries = true
29-
// keep all plugins that aren't used in the project
30-
keepUnusedPlugins = true
3127
}
32-
}
28+
}

‎gradle/wrapper/gradle-wrapper.jar‎

7.92 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed Jan 22 15:59:51 CET 2020
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)