Permalink
Browse files

Upgrade to gradle 3.4.1

* task wrapper needs not be defined any more
  (to upgrade, use "./gradlew wrapper --gradle-version x.y.z")
* << (leftShift) is deprecated since gradle 3.0. Replaced with doLast
  • Loading branch information...
tschulte committed Mar 4, 2017
1 parent 07a43e7 commit a9d9ca771bf1d623e4a0b1bf490107e7f5cb2750
Showing with 82 additions and 81 deletions.
  1. +1 −5 build.gradle
  2. +30 −27 controlsfx/build.gradle
  3. BIN gradle/wrapper/gradle-wrapper.jar
  4. +6 −6 gradle/wrapper/gradle-wrapper.properties
  5. +41 −33 gradlew
  6. +4 −10 gradlew.bat
@@ -42,11 +42,7 @@ subprojects {
}
}

task wrapper(type: Wrapper) {
gradleVersion = '2.0'
}

compileJava {
compileJava {
options.encoding = "UTF-8"
}

@@ -31,40 +31,43 @@ sourceSets {
}


task downloadTranslations << {
task downloadTranslations {
description = "Download translations from Transifex"

if (transifex_username.equals("") || transifex_password.equals("")) {
logger.warn "----------------------------------------------------------"
logger.warn "Cannot determine Transifex Username/Password."
logger.warn "If you want to build ControlsFX with its translations then"
logger.warn "you need to create a Transifex account and set"
logger.warn "transifex.username & transifex.password properties in your"
logger.warn "gradle.properties file."
logger.warn "----------------------------------------------------------"
} else {
javaexec {
main = 'impl.build.transifex.Transifex'
classpath = sourceSets.main.runtimeClasspath
systemProperty 'transifex.username', transifex_username
systemProperty 'transifex.password', transifex_password
doLast {
if (transifex_username.equals("") || transifex_password.equals("")) {
logger.warn "----------------------------------------------------------"
logger.warn "Cannot determine Transifex Username/Password."
logger.warn "If you want to build ControlsFX with its translations then"
logger.warn "you need to create a Transifex account and set"
logger.warn "transifex.username & transifex.password properties in your"
logger.warn "gradle.properties file."
logger.warn "----------------------------------------------------------"
} else {
javaexec {
main = 'impl.build.transifex.Transifex'
classpath = sourceSets.main.runtimeClasspath
systemProperty 'transifex.username', transifex_username
systemProperty 'transifex.password', transifex_password
}
}
}
}

processResources.finalizedBy(downloadTranslations)

task compileCSS << {
ant.delete (includeEmptyDirs: 'true') {
fileset(dir: file("build/resources/main"), includes: "**/*.bss")
}
javaexec {
main = "com.sun.javafx.tools.packager.Main"
classpath = files("${System.properties['java.home']}/../lib/ant-javafx.jar")
args = [ "-createbss",
"-srcdir", "src/main/resources",
"-outdir", "build/resources/main"
]
task compileCSS {
doLast {
ant.delete(includeEmptyDirs: 'true') {
fileset(dir: file("build/resources/main"), includes: "**/*.bss")
}
javaexec {
main = "com.sun.javafx.tools.packager.Main"
classpath = files("${System.properties['java.home']}/../lib/ant-javafx.jar")
args = ["-createbss",
"-srcdir", "src/main/resources",
"-outdir", "build/resources/main"
]
}
}
}

BIN +7.33 KB (120%) gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
@@ -1,6 +1,6 @@
#Wed Jun 19 21:19:07 EDT 2013
zipStoreBase=GRADLE_USER_HOME
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-2.0-bin.zip
#Sat Mar 04 23:55:21 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
74 gradlew 100644 → 100755
@@ -1,17 +1,35 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$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=""

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

@@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
esac
fi

# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
# Escape application args
save ( ) {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
exec "$JAVACMD" "$@"
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

@@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail

:init
@rem Get command-line arguments, handling Windowz variants
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args

:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*
goto execute

:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$

:execute
@rem Setup the command line

0 comments on commit a9d9ca7

Please sign in to comment.