Skip to content

Commit

Permalink
Gradle 8.10 and use Github Action vars.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpe42 committed Aug 16, 2024
1 parent 4b55c65 commit 96b62bb
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 14 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ jobs:

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

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

- name: Gradle Check
run: ./gradlew -PtargetJava=22 check --stacktrace --no-daemon
run: ./gradlew -PtargetJava=${{ vars.JAVA_VERSION }} check --stacktrace --no-daemon
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@ jobs:

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

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

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

- name: Github Packages
run: ./gradlew -PtargetJava=22 :json-iterator:publish
run: ./gradlew -PtargetJava=${{ vars.JAVA_VERSION }} :json-iterator:publish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

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

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down

0 comments on commit 96b62bb

Please sign in to comment.