Unverified Commit cf8c834f authored by Ryan Schmitt's avatar Ryan Schmitt Committed by GitHub
Browse files

Upgrade to Gradle 8.3 (#2984) 

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
parent cb79a68e

gradle/wrapper/gradle-wrapper.jar

+4.09 KiB (62.2 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradle/wrapper/gradle-wrapper.properties

+3 −1
Original line number Diff line number Diff line 
distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip

networkTimeout=10000

validateDistributionUrl=true

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

gradlew

+23 −8
Original line number Diff line number Diff line
@@ -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/.
@@ -80,13 +80,11 @@ 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##*/}



# 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"'

# 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



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

MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation." 
    fi

else

    JAVACMD=java

    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

    if ! command -v java >/dev/null 2>&1

    then

        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.



Please set the JAVA_HOME variable in your environment to match the

location of your Java installation."

    fi

fi



# Increase the maximum file descriptors if we can.

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
@@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then 
    done

fi





# 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"'



# Collect all arguments for the java command;

#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of

#     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +214,12 @@ set -- \ 
        org.gradle.wrapper.GradleWrapperMain \

        "$@"



# Stop when "xargs" is not available.

if ! command -v xargs >/dev/null 2>&1

then

    die "xargs is not available"

fi



# Use "xargs" to parse quoted args.

#

# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

+9 −6
Original line number Diff line number Diff line
@@ -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%
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome 


set JAVA_EXE=java.exe

%JAVA_EXE% -version >NUL 2>&1

if "%ERRORLEVEL%" == "0" goto execute

if %ERRORLEVEL% equ 0 goto execute



echo.

echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar 


:end

@rem End local scope for the variables with windows NT shell

if "%ERRORLEVEL%"=="0" goto mainEnd

if %ERRORLEVEL% equ 0 goto mainEnd



:fail

rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

rem the _cmd.exe /c_ return code!

if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

exit /b 1

set EXIT_CODE=%ERRORLEVEL%

if %EXIT_CODE% equ 0 set EXIT_CODE=1

if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%

exit /b %EXIT_CODE%



:mainEnd

if "%OS%"=="Windows_NT" endlocal