Skip to content

Commit 5a71263

Browse files
committed
Upgrade to Gradle 8.12.1
* Use `toolchain` for Java * Add `org.gradle.toolchains.foojay-resolver-convention` to download missed toolchains * Use `main` for reusable GHA workflows
1 parent de20111 commit 5a71263

File tree

8 files changed

+10
-7
lines changed

8 files changed

+10
-7
lines changed

.github/workflows/ci-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717

1818
jobs:
1919
build-snapshot:
20-
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-snapshot.yml@v5
20+
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-snapshot.yml@main
2121
with:
2222
gradleTasks: ${{ github.event_name == 'schedule' && '--rerun-tasks' || '' }}
2323
secrets:

.github/workflows/merge-dependabot-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
merge-dependabot-pr:
1313
permissions: write-all
1414

15-
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@v5
15+
uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@main
1616
with:
1717
mergeArguments: --auto --squash
1818
autoMergeSnapshots: true

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
contents: write
1313
issues: write
1414

15-
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@v5
15+
uses: spring-io/spring-github-workflows/.github/workflows/spring-artifactory-gradle-release.yml@main
1616
secrets:
1717
GH_ACTIONS_REPO_TOKEN: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
1818
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,9 @@ configure(javaProjects) { subproject ->
171171
apply from: "${rootProject.projectDir}/gradle/publish-maven.gradle"
172172

173173
java {
174+
toolchain {
175+
languageVersion = JavaLanguageVersion.of(17)
176+
}
174177
withJavadocJar()
175178
withSourcesJar()
176179
registerFeature('optional') {

gradle/wrapper/gradle-wrapper.jar

79 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pluginManagement {
77

88
plugins {
99
id 'io.spring.develocity.conventions' version '0.0.22'
10+
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
1011
}
1112

1213
rootProject.name = 'spring-amqp-dist'

0 commit comments

Comments
 (0)