Skip to content

Commit f53f50a

Browse files
committed
bump jdk and gradle.
1 parent be124b2 commit f53f50a

File tree

4 files changed

+16
-23
lines changed

4 files changed

+16
-23
lines changed

.github/workflows/gradle.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ jobs:
4040
run: |
4141
printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
4242
java --version
43-
./gradlew -PtargetJava=${{ vars.JAVA_VERSION }} check --stacktrace --no-daemon
43+
./gradlew --stacktrace --no-daemon -PtargetJava=${{ vars.JAVA_VERSION }} check

.github/workflows/release.yml

+13-20
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,29 @@ jobs:
1717
- uses: actions/checkout@v4
1818
- uses: gradle/actions/wrapper-validation@v3
1919

20-
- uses: actions/setup-java@v4
20+
- uses: oracle-actions/setup-java@v1
2121
if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
2222
with:
23-
distribution: ${{ vars.JAVA_VENDOR }}
24-
java-version: ${{ vars.GRADLE_JAVA_VERSION }}
25-
java-package: jre
26-
cache: 'gradle'
23+
website: jdk.java.net
24+
release: ${{ vars.GRADLE_JAVA_VERSION }}
2725

28-
- run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
26+
- run: |
27+
printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
28+
java --version
2929
if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
3030
31-
- uses: actions/setup-java@v4
31+
- uses: oracle-actions/setup-java@v1
3232
with:
33-
distribution: ${{ vars.JAVA_VENDOR }}
34-
java-version: ${{ vars.JAVA_VERSION }}
35-
check-latest: true
33+
website: jdk.java.net
34+
release: ${{ vars.JAVA_VERSION }}
3635

3736
- run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
3837
if: ${{ vars.GRADLE_JAVA_VERSION == vars.JAVA_VERSION }}
3938

40-
- run: printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
41-
42-
- run: java --version
43-
44-
- name: Gradle Check
45-
run: ./gradlew check -PtargetJava=${{ vars.JAVA_VERSION }} --stacktrace
46-
env:
47-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
4939
- name: Github Packages
50-
run: ./gradlew -PtargetJava=${{ vars.JAVA_VERSION }} :json-iterator:publish
40+
run: |
41+
printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
42+
java --version
43+
./gradlew --stacktrace -PtargetJava=${{ vars.JAVA_VERSION }} check :json-iterator:publish
5144
env:
5245
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

systems.comodal.json_iterator/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ext {
1414

1515
java {
1616
toolchain {
17-
languageVersion = JavaLanguageVersion.of(project.findProperty('targetJava') as Integer ?: 22)
17+
languageVersion = JavaLanguageVersion.of(project.findProperty('targetJava') as Integer ?: 23)
1818
}
1919
}
2020

0 commit comments

Comments
 (0)