Update build

.gitignore

@@ -1,5 +1,4 @@
 .gradle
-.sass-cache
 *.iml
 *.ipr
 *.iws

README.adoc

@@ -33,7 +33,7 @@ repositories {
 }
 
 dependencies {
-    compile '{project-group}:bootstrapfx-core:{project-version}'
+    compile '{project-group}:{project-name}-core:{project-version}'
 }
 ----
 
@@ -44,7 +44,7 @@ dependencies {
 <dependencies>
     <dependency>
         <groupId>{project-group}</groupId>
-        <artifactId>bootstrapfx-core</artifactId>
+        <artifactId>{project-name}-core</artifactId>
         <version>{project-version}</version>
     </dependency>
 </dependencies>
@@ -92,14 +92,14 @@ public class Sampler extends Application {
 
 === Java 9+
 
-BootstrapFX can be used in a modular fashion when running in Java9+. It's module name is `org.kordamp.bootstrapfx.core`.
+BootstrapFX can be used in a modular fashion when running in Java9+. It's module name is `{project-group}.core`.
 
 == Building
 
 You must meet the following requirements:
 
  * JDK8u60 as a minimum
- * Gradle 5.2
+ * Gradle 6+
 
 You may used the included gradle wrapper script if you don't have `gradle` installed.
 
@@ -132,17 +132,17 @@ to use the gradle wrapper if available or your global gradle command. This is an
  . Make a full build by invoking the following command
 [source]
 ----
-$ ./gradlew build
+$ gm build
 ----
  . Run the sampler application by invoking the following command
 [source]
 ----
-$ ./gradlew :sampler:run
+$ gm :sampler:run
 ----
  . Run the sampler application with link:https://www.jpro.one/[JPro] by invoking the following command
 [source]
 ----
-$ ./gradlew :sampler-jpro:jproRun
+$ gm :sampler-jpro:jproRun
 ----
 
 == Supported CSS Classes

build.gradle

@@ -21,10 +21,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-plugins {
-    id 'org.kordamp.gradle.kordamp-parentpom' version '1.9.1'
-    id 'org.kordamp.gradle.source-xref'       version '0.30.3' apply false
-}
 
 config {
     info {
@@ -45,14 +41,14 @@ config {
         }
     }
 
-    //docs {
+    docs {
         javadoc {
             options {
                 addBooleanOption('javafx', true)
                 links('http://docs.oracle.com/javase/8/javafx/api/')
             }
         }
-    //}
+    }
 }
 
 allprojects {
@@ -64,33 +60,4 @@ allprojects {
         }
         exclude '**/*.scss'
     }
-}
-
-subprojects { subproj ->
-    apply plugin: 'java-library'
-
-    configurations.all {
-        resolutionStrategy.force 'com.typesafe.play:twirl-api_2.12:1.3.15',
-           'commons-codec:commons-codec:1.10',
-           'org.apache.commons:commons-lang3:3.6',
-           'org.scala-lang:scala-library:2.12.6',
-           'org.scala-lang:scala-reflect:2.12.6',
-           'org.scala-lang.modules:scala-parser-combinators_2.12:1.1.1',
-           'com.fasterxml.jackson.core:jackson-core:2.8.11',
-           'com.fasterxml.jackson.core:jackson-annotations:2.8.11',
-           'com.fasterxml.jackson.core:jackson-databind:2.8.11.1',
-           'junit:junit:4.12',
-           'com.google.code.findbugs:jsr305:3.0.2',
-           'org.seleniumhq.selenium:selenium-api:3.5.3',
-           'org.seleniumhq.selenium:selenium-support:3.5.3',
-           'org.seleniumhq.selenium:selenium-remote-driver:3.5.3',
-           'com.google.guava:guava:23.0',
-           'com.typesafe.akka:akka-actor_2.12:2.5.17',
-           'com.typesafe.akka:akka-stream_2.12:2.5.17',
-           'com.typesafe:config:1.3.3',
-           'org.slf4j:slf4j-api:1.7.25',
-           'org.slf4j:jul-to-slf4j:1.7.25',
-           'org.bouncycastle:bcprov-jdk15on:1.60',
-           'org.jruby:jruby-complete:9.2.0.0'
-    }
-}
+}

gradle.properties

@@ -1,7 +1,7 @@
 #
 # SPDX-License-Identifier: MIT
 #
-# Copyright (c) 2015-2019 Andres Almiray.
+# Copyright (c) 2015-2020 Andres Almiray.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,14 @@
 # THE SOFTWARE.
 #
 
-version              = 0.3.0-SNAPSHOT
-group                = org.kordamp.bootstrapfx
-sourceCompatibility  = 1.8
-targetCompatibility  = 1.8
+version                 = 0.3.0-SNAPSHOT
+group                   = org.kordamp.bootstrapfx
+sourceCompatibility     = 1.8
+targetCompatibility     = 1.8
+
+kordampPluginVersion    = 0.40.0
+kordampBuildVersion     = 1.5.0
+
+org.gradle.daemon       = true
+org.gradle.caching      = true
+org.gradle.parallel     = false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ 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='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+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" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @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="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell