Skip to content

Commit 26de9f5

Browse files
committed
Merge branch '3.0.x'
Closes gh-1003
2 parents ea873fb + 234c290 commit 26de9f5

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/actions/build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ inputs:
2323
java-version:
2424
description: 'Java version to compile and test with'
2525
required: false
26-
default: '24'
26+
default: '25'
2727
publish:
2828
description: 'Whether to publish artifacts ready for deployment to Artifactory'
2929
required: false

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

Lines changed: 2 additions & 2 deletions
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: '24'
26+
default: '25'
2727
runs:
2828
using: composite
2929
steps:
@@ -33,7 +33,7 @@ runs:
3333
distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || (inputs.java-distribution || 'liberica') }}
3434
java-version: |
3535
${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
36-
${{ inputs.java-toolchain == 'true' && '24' || '' }}
36+
${{ inputs.java-toolchain == 'true' && '25' || '' }}
3737
- name: Set Up Gradle With Read/Write Cache
3838
if: ${{ inputs.cache-read-only == 'false' }}
3939
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: ./.github/actions/send-notification
4141
with:
4242
build-scan-url: ${{ steps.build-and-publish.outputs.build-scan-url }}
43-
run-name: ${{ format('{0} | Linux | Java 24', github.ref_name) }}
43+
run-name: ${{ format('{0} | Linux | Java 25', github.ref_name) }}
4444
status: ${{ job.status }}
4545
webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
4646
outputs:

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
toolchain: true
2626
- version: 21
2727
toolchain: true
28-
- version: 24
28+
- version: 25
2929
toolchain: false
3030
exclude:
3131
- os:
3232
name: Linux
3333
java:
34-
version: 24
34+
version: 25
3535
steps:
3636
- name: Prepare Windows runner
3737
if: ${{ runner.os == 'Windows' }}

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Enable auto-env through the sdkman_auto_env config
22
# Add key=value pairs of SDKs to use below
3-
java=24.0.2-librca
3+
java=25-librca

0 commit comments

Comments
 (0)