upgrade to javafx 12

build.gradle

@@ -1,37 +1,39 @@
-group 'ninja.javafx'
+plugins {
-version '0.9.1-SNAPSHOT'
+    id 'idea'
-
+    id 'java'
-apply plugin: 'java'
+    id 'groovy'
-apply plugin: 'groovy'
+    id 'application'
-apply plugin: 'application'
+    id 'org.openjfx.javafxplugin' version '0.0.7'
-apply plugin: 'idea'
+}
-
-sourceCompatibility = 1.8
-mainClassName = 'ninja.javafx.smartcsv.fx.SmartCSV'
 
 repositories {
     mavenCentral()
     jcenter()
 }
 
+javafx {
+    version = "12"
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
+}
+
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3'
-    compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.5.0'
+    compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.5.7'
-    compile group: 'org.springframework', name:'spring-context', version: '5.0.7.RELEASE'
+    compile group: 'org.springframework', name:'spring-context', version: '5.1.8.RELEASE'
     compile group: 'net.sf.supercsv', name: 'super-csv', version: '2.4.0'
     compile group: 'commons-validator', name: 'commons-validator', version: '1.6'
-    compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '9.1.2'
+    compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '11.0'
-    compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.7.0-9.1.2'
+    compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.7.0-11'
-    compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '2.0.26-9.1.2'
+    compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '1.7.22-11'
-    compile group: 'de.jensd', name: 'fontawesomefx-materialicons', version: '2.2.0-9.1.2'
+    compile group: 'de.jensd', name: 'fontawesomefx-materialicons', version: '2.2.0-11'
-    compile group: 'org.controlsfx', name: 'controlsfx', version: '9.0.0'
+    compile group: 'org.controlsfx', name: 'controlsfx', version: '11.0.0'
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
     compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
     compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
-    compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.9.0'
+    compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.1'
 }
 
-task wrapper(type: Wrapper) {
+group 'ninja.javafx'
-    gradleVersion = '3.1' //version required
+version '0.9.1-SNAPSHOT'
-}
+mainClassName = 'ninja.javafx.smartcsv.fx.SmartCSV'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Jul 08 13:55:23 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -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
+# Escape application args
-function splitJvmOpts() {
+save () {
-    JVM_OPTS=("$@")
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+APP_ARGS=$(save "$@")
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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" "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @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