Update gradle and add jfx plugin (#637)

* Update gradle and add jfx plugin

* Update CI configs

* Update travis-ci scripts for new build directory

Author: AustinShalit

.travis-scripts/before-deploy.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-ls -R ui/build/distributions | awk '
+ls -R ui/build/jfx/native | awk '
 /:$/&&f{s=$0;f=0}
 /:$/&&!f{sub(/:$/,"");s=$0;f=1;next}
 NF&&f{ print s"/"$0 }'

.travis.yml

@@ -27,7 +27,7 @@ before_install:
 
 # Only do an assemble when we aren't building a pull request
 install:
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew :ui:assemble --stacktrace || ./gradlew --stacktrace '
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./gradlew :ui:jfxNative --stacktrace || ./gradlew --stacktrace '
 
 script:
   - ./gradlew checkstyleMain checkstyleTest pmdMain jacocoTestReport jacocoRootReport test --stacktrace -Pheadless=true -PlogTests
@@ -56,7 +56,7 @@ deploy:
   api_key:
     secure: bdjiFXG3VBcM1iyxeputsWA9vHxgLNcxRB1i0REDNAnIEvDWpAdVr1jPBejeiOEw9s+k6EItATvQ2I7Xp5iKnYaXn0NuHzM3OSY8WNVCc+gBTaQwkijPBqi/vEXaO502CscW+H2U26QZGS/jJiUuieeErtzCNcWmCv8SRc5NFOVYdSlhAmp+aPeu2YwuweiMZNVquYM2hx7murghOYSF5hQTKq4/zrziENVi78XZS8rJFmxwOGqNj1GBLul2F9poIPjzDbPVJLeXTJEY+N3aYGJ4GyZYf6p8ynDO/v043/GuOAyNfkgSwhCcTQlmLG/mm6P9CUMoDQR9klh2eDswgrIP4rGLwILg3035nqHqwgTIKVXfspni3P/65siS6lXV0M5flEkRysMBr1GQhaIEUM32ArreMzAtC2Vn2CviKG0TwLmxyd/7W3JdoX4KrHAcKBwbqFDImWw43S6N63oTUEw6GjrI+CndwgF9RNgr5SAyS28LFXViOJe7JlGVUNU33kMNpEJxzVREzkJsO8aicaZTrvDniFOfg2WhrAyhjxmh4/IOHDE6qgtxw+2+TUzMlwdzdxb90BeXg2XfMichmKfQYQFEmZntCZcoHHDG5jbCTyAvFuOv6tdPjpr69QjiEJhEbohw8CEwoGhy1kxxQcCDCfABrOTivJ39Ui8MC6k=
   file_glob: true
-  file: "ui/build/distributions/*.{deb,pkg,dmg}"
+  file: "ui/build/jfx/native/*.{deb,pkg,dmg}"
   skip_cleanup: true
   on:
     repo: WPIRoboticsProjects/GRIP

appveyor.yml

@@ -2,7 +2,7 @@ install:
   - choco install -y InnoSetup
 
 build_script:
-  - gradlew.bat :ui:assemble --stacktrace
+  - gradlew.bat :ui:jfxNative --stacktrace
 
 # to run your custom scripts instead of automatic tests
 test_script:
@@ -12,7 +12,7 @@ platform:
   - x64
 
 artifacts:
-  - path: ui\build\distributions\*.exe
+  - path: ui\build\jfx\native\*.exe
 
 
 deploy:

build.gradle

@@ -7,6 +7,7 @@ buildscript {
     }
 
     dependencies {
+        classpath group: 'de.dynamicfiles.projects.gradle.plugins', name: 'javafx-gradle-plugin', version: '8.5.1'
         classpath 'com.netflix.nebula:gradle-aggregate-javadocs-plugin:2.2.+'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.8'
     }
@@ -318,7 +319,7 @@ project(":ui") {
     apply plugin: 'idea'
     apply plugin: 'jacoco'
     apply plugin: 'application'
-    apply from: 'http://dl.bintray.com/shemnon/javafx-gradle/8.1.1/javafx.plugin'
+    apply plugin: 'javafx-gradle-plugin'
 
     configurations {
         ideProvider
@@ -356,20 +357,16 @@ project(":ui") {
     }
 
 
-    javafx {
-        profiles {
-            linux {
-                category = 'Development'
-                bundleArguments = [
-                        // for DEB bundles
-                        'email': '[email protected]', // This is the email used for the deb maintainer field.
-                ]
-            }
-        }
-        appID = 'GRIP'
-        appName = 'GRIP'
+    jfx {
         mainClass = "edu.wpi.grip.ui.Main"
-        version = getVersionSimple()
+        preLoader = "edu.wpi.grip.preloader.GripPreloader"
+
+        identifier = "GRIP"
+        appName = "GRIP"
+        vendor = "Worcester Polytechnic Institute"
+        nativeReleaseVersion = "${getVersionSimple()}-${arch}"
+
+        jfxMainAppJarName = "${jfx.appName}-${jfx.nativeReleaseVersion}.jar"
 
         // This prevents the JIT from eating stack traces that get thrown a lot
         // This is slower but means we actually get the stack traces instead of
@@ -378,19 +375,12 @@ project(":ui") {
         // See: https://plumbr.eu/blog/java/on-a-quest-for-missing-stacktraces
         jvmArgs = ["-XX:-OmitStackTraceInFastThrow"]
 
-        systemProperties = ['javafx.preloader':'edu.wpi.grip.preloader.GripPreloader']
-    }
-    mainClassName = javafx.mainClass
-
-    // The JavaFX plugin does not provide a way to change the installer artifact's name without changing the appName or appID,
-    // so instead, we simply rename the artifact to append the architecture (x86 or x64)
-    jfxDeploy.doLast {
-        def filet = fileTree(dir: 'build/distributions', include: "${javafx.appName}-${getVersionSimple()}.*")
-        filet.each { File f ->
-            def f2 = new File(f.getParentFile(), "${f.getName().replace("${getVersionSimple()}", "${getVersionSimple()}-${arch}")}")
-            f.renameTo(f2)
-        }
+        // This was a workaround introduced by the plugin dev.  For some reason the build fails
+        // when the workaround is enabled in Java 1.8.0_101.  If you are building with a version
+        // less than _101 you may need to set this to false.
+        skipNativeLauncherWorkaround124 = true
     }
+    mainClassName = jfx.mainClass
 }
 
 /*
@@ -417,5 +407,5 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.13'
+    gradleVersion = '2.14.1'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Thu May 12 15:14:42 EDT 2016
+#Sun Jul 24 01:01:23 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# 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,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# 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
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,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

gradlew

@@ -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