Changeset 72081a8


Ignore:
Timestamp:
Oct 31, 2017 6:12:50 AM (3 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
041f547
Parents:
7b221fa
Message:

Upgrade Gradle & wrapper to 4.3

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • gradle/wrapper/gradle-wrapper.properties

    r7b221fa r72081a8  
    33zipStoreBase=GRADLE_USER_HOME
    44zipStorePath=wrapper/dists
    5 distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
     5distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
  • gradlew

    r7b221fa r72081a8  
    1 #!/usr/bin/env bash
     1#!/usr/bin/env sh
    22
    33##############################################################################
     
    66##
    77##############################################################################
    8 
    9 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
    10 DEFAULT_JVM_OPTS=""
    11 
    12 APP_NAME="Gradle"
    13 APP_BASE_NAME=`basename "$0"`
    14 
    15 # Use the maximum available, or set MAX_FD != -1 to use that value.
    16 MAX_FD="maximum"
    17 
    18 warn ( ) {
    19     echo "$*"
    20 }
    21 
    22 die ( ) {
    23     echo
    24     echo "$*"
    25     echo
    26     exit 1
    27 }
    28 
    29 # OS specific support (must be 'true' or 'false').
    30 cygwin=false
    31 msys=false
    32 darwin=false
    33 case "`uname`" in
    34   CYGWIN* )
    35     cygwin=true
    36     ;;
    37   Darwin* )
    38     darwin=true
    39     ;;
    40   MINGW* )
    41     msys=true
    42     ;;
    43 esac
    44 
    45 # For Cygwin, ensure paths are in UNIX format before anything is touched.
    46 if $cygwin ; then
    47     [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
    48 fi
    498
    509# Attempt to set APP_HOME
     
    6221done
    6322SAVED="`pwd`"
    64 cd "`dirname \"$PRG\"`/" >&-
     23cd "`dirname \"$PRG\"`/" >/dev/null
    6524APP_HOME="`pwd -P`"
    66 cd "$SAVED" >&-
     25cd "$SAVED" >/dev/null
     26
     27APP_NAME="Gradle"
     28APP_BASE_NAME=`basename "$0"`
     29
     30# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
     31DEFAULT_JVM_OPTS=""
     32
     33# Use the maximum available, or set MAX_FD != -1 to use that value.
     34MAX_FD="maximum"
     35
     36warn () {
     37    echo "$*"
     38}
     39
     40die () {
     41    echo
     42    echo "$*"
     43    echo
     44    exit 1
     45}
     46
     47# OS specific support (must be 'true' or 'false').
     48cygwin=false
     49msys=false
     50darwin=false
     51nonstop=false
     52case "`uname`" in
     53  CYGWIN* )
     54    cygwin=true
     55    ;;
     56  Darwin* )
     57    darwin=true
     58    ;;
     59  MINGW* )
     60    msys=true
     61    ;;
     62  NONSTOP* )
     63    nonstop=true
     64    ;;
     65esac
    6766
    6867CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
     
    9190
    9291# Increase the maximum file descriptors if we can.
    93 if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
     92if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
    9493    MAX_FD_LIMIT=`ulimit -H -n`
    9594    if [ $? -eq 0 ] ; then
     
    115114    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    116115    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     116    JAVACMD=`cygpath --unix "$JAVACMD"`
    117117
    118118    # We build the pattern for arguments to be converted via cygpath
     
    155155fi
    156156
    157 # Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
    158 function splitJvmOpts() {
    159     JVM_OPTS=("$@")
     157# Escape application args
     158save () {
     159    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     160    echo " "
    160161}
    161 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
    162 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
     162APP_ARGS=$(save "$@")
    163163
    164 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
     164# Collect all arguments for the java command, following the shell quoting and substitution rules
     165eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
     166
     167# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
     168if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
     169  cd "$(dirname "$0")"
     170fi
     171
     172exec "$JAVACMD" "$@"
  • gradlew.bat

    r7b221fa r72081a8  
    99if "%OS%"=="Windows_NT" setlocal
    1010
    11 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
    12 set DEFAULT_JVM_OPTS=
    13 
    1411set DIRNAME=%~dp0
    1512if "%DIRNAME%" == "" set DIRNAME=.
    1613set APP_BASE_NAME=%~n0
    1714set APP_HOME=%DIRNAME%
     15
     16@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
     17set DEFAULT_JVM_OPTS=
    1818
    1919@rem Find java.exe
     
    4747
    4848:init
    49 @rem Get command-line arguments, handling Windowz variants
     49@rem Get command-line arguments, handling Windows variants
    5050
    5151if not "%OS%" == "Windows_NT" goto win9xME_args
    52 if "%@eval[2+2]" == "4" goto 4NT_args
    5352
    5453:win9xME_args
     
    6160
    6261set CMD_LINE_ARGS=%*
    63 goto execute
    64 
    65 :4NT_args
    66 @rem Get arguments from the 4NT Shell from JP Software
    67 set CMD_LINE_ARGS=%$
    6862
    6963:execute
Note: See TracChangeset for help on using the changeset viewer.