Skip to content

Commit 96b62bb

Browse files
committed
Gradle 8.10 and use Github Action vars.
1 parent 4b55c65 commit 96b62bb

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

.github/workflows/gradle.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ jobs:
1919

2020
- uses: actions/setup-java@v4
2121
with:
22-
distribution: 'zulu'
23-
java-version: 21
22+
distribution: ${{ vars.JAVA_VENDOR }}
23+
java-version: ${{ vars.GRADLE_JAVA_VERSION }}
2424
java-package: jre
2525
cache: 'gradle'
2626
- run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
2727

2828
- uses: actions/setup-java@v4
2929
with:
30-
distribution: 'zulu'
31-
java-version: 22
30+
distribution: ${{ vars.JAVA_VENDOR }}
31+
java-version: ${{ vars.JAVA_VERSION }}
3232
check-latest: true
3333
- run: printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
3434
- run: java --version
3535

3636
- name: Gradle Check
37-
run: ./gradlew -PtargetJava=22 check --stacktrace --no-daemon
37+
run: ./gradlew -PtargetJava=${{ vars.JAVA_VERSION }} check --stacktrace --no-daemon

.github/workflows/release.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ jobs:
1919

2020
- uses: actions/setup-java@v4
2121
with:
22-
distribution: 'zulu'
23-
java-version: 21
22+
distribution: ${{ vars.JAVA_VENDOR }}
23+
java-version: ${{ vars.GRADLE_JAVA_VERSION }}
2424
java-package: jre
2525
cache: 'gradle'
2626
- run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
2727

2828
- uses: actions/setup-java@v4
2929
with:
30-
distribution: 'zulu'
31-
java-version: 22
30+
distribution: ${{ vars.JAVA_VENDOR }}
31+
java-version: ${{ vars.JAVA_VERSION }}
3232
check-latest: true
3333
- run: printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
3434
- run: java --version
3535

3636
- name: Gradle Check
37-
run: ./gradlew check -PtargetJava=22 --stacktrace
37+
run: ./gradlew check -PtargetJava=${{ vars.JAVA_VERSION }} --stacktrace
3838

3939
- name: Github Packages
40-
run: ./gradlew -PtargetJava=22 :json-iterator:publish
40+
run: ./gradlew -PtargetJava=${{ vars.JAVA_VERSION }} :json-iterator:publish
4141
env:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

gradle/wrapper/gradle-wrapper.jar

121 Bytes
Binary file not shown.

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.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

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

gradlew.bat

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

0 commit comments

Comments
 (0)