Skip to content

Commit 377e6d3

Browse files
committed
Consistently use Java 25 for the build
1 parent 3ac1574 commit 377e6d3

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

.github/actions/build-and-publish/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: 'Builds the project, optionally publishing it to a local deployment
33
inputs:
44
java-version:
55
required: false
6-
default: '24'
6+
default: '25'
77
description: 'The Java version to compile and test with'
88
java-distribution:
99
required: false

.github/actions/prepare-gradle-build/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ inputs:
2323
java-version:
2424
description: 'Java version to use for the build'
2525
required: false
26-
default: '17'
26+
default: '25'
2727
runs:
2828
using: composite
2929
steps:
@@ -34,6 +34,7 @@ runs:
3434
java-version: |
3535
${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
3636
${{ inputs.java-toolchain == 'true' && '17' || '' }}
37+
25
3738
- name: Set Up Gradle With Read/Write Cache
3839
if: ${{ inputs.cache-read-only == 'false' }}
3940
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0

.github/workflows/build-and-deploy-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ jobs:
4141
webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
4242
status: ${{ job.status }}
4343
build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }}
44-
run-name: ${{ format('{0} | Linux | Java 17', github.ref_name) }}
44+
run-name: ${{ format('{0} | Linux | Java 25', github.ref_name) }}
4545
outputs:
4646
version: ${{ steps.build-and-publish.outputs.version }}

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ jobs:
2525
- version: 25
2626
early-access: true
2727
toolchain: true
28+
exclude:
29+
- os:
30+
name: Linux
31+
java:
32+
version: 17
2833
steps:
2934
- name: Check Out Code
3035
uses: actions/checkout@v4

buildSrc/src/main/java/org/springframework/graphql/build/conventions/JavaConventions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class JavaConventions {
4747
* <p>NOTE: If you update this value, you should also update the value used in
4848
* the {@code javadoc} task in {@code framework-api.gradle}.
4949
*/
50-
private static final JavaLanguageVersion DEFAULT_LANGUAGE_VERSION = JavaLanguageVersion.of(24);
50+
private static final JavaLanguageVersion DEFAULT_LANGUAGE_VERSION = JavaLanguageVersion.of(25);
5151

5252
/**
5353
* The Java version we should use as the baseline for the compiled bytecode

0 commit comments

Comments
 (0)