Skip to content

Commit

Permalink
Update Gradle Wrapper to 7.6 (#693 / #694)
Browse files Browse the repository at this point in the history
This PR updates the Gradle Wrapper from 7.5 to 7.6. Since this comes
with Java 19 support, the `full-featured` matrix is updated
accordingly. In addition, `experimental` now uses Java 20. This
requires disabling Byte Buddy's class file version validation, which
is used by EqualsVerifier, and which also has been updated from 3.10
to 3.11.1.

Closes: #693
PR: #694
  • Loading branch information
beatngu13 authored and nipafx committed Dec 20, 2022
1 parent 17004db commit cc2e431
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
@@ -1,7 +1,7 @@
name: Main build

env:
EXPERIMENTAL_JAVA: 19
EXPERIMENTAL_JAVA: 20

on:
# We want to trigger our builds all the time for the default branch
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
java: [ 11, 17, 18 ]
java: [ 11, 17, 19 ]
junit-version: [ '5.9.0' ]
os: [ubuntu, macos, windows]
name: with Java ${{ matrix.java }}, JUnit ${{ matrix.junit-version }} on ${{ matrix.os }}
Expand Down
6 changes: 5 additions & 1 deletion build.gradle.kts
Expand Up @@ -64,7 +64,7 @@ dependencies {
testImplementation(group = "org.assertj", name = "assertj-core", version = "3.22.0")
testImplementation(group = "org.mockito", name = "mockito-core", version = "4.4.0")
testImplementation(group = "com.google.jimfs", name = "jimfs", version = "1.2")
testImplementation(group = "nl.jqno.equalsverifier", name = "equalsverifier", version = "3.10")
testImplementation(group = "nl.jqno.equalsverifier", name = "equalsverifier", version = "3.11.1")

testRuntimeOnly(group = "org.apache.logging.log4j", name = "log4j-core", version = "2.17.2")
testRuntimeOnly(group = "org.apache.logging.log4j", name = "log4j-jul", version = "2.17.2")
Expand Down Expand Up @@ -257,6 +257,10 @@ tasks {
// set it to "allow" for EnvironmentVariableUtilsTests$With_SecurityManager.
if (JavaVersion.current() >= JavaVersion.VERSION_12)
systemProperty("java.security.manager", "allow")
// Disables Byte Buddy validation for the maximum supported class file version, since we are possibly using a
// Java EA release.
if (experimentalBuild)
systemProperty("net.bytebuddy.experimental", true)
jvmArgs(testJvmArgs)
}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/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 All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down

0 comments on commit cc2e431

Please sign in to comment.