Updates

.travis.yml

@@ -10,10 +10,9 @@ env:
 before_install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
-  - sudo apt-get update -qq
 before_script:
   - ./gradlew --version
-script: ./gradlew -S check test jacocoTestReport
+script: ./gradlew -S build jacocoTestReport
 after_success:
   - ./gradlew coveralls
 

build.gradle

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 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.
@@ -15,15 +15,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 plugins {
     id 'groovy'
     id 'idea'
-    id 'org.kordamp.gradle.project' version '0.9.0'
-    id 'org.openjfx.javafxplugin'   version '0.0.5'
-    id 'org.asciidoctor.convert'    version '1.5.9.2'
-    id 'com.github.kt3k.coveralls'  version '2.8.2'
-    id 'org.jonnyzzz.java9c'        version '0.2.3'
+    id 'codenarc'
+    id 'org.kordamp.gradle.project'      version '0.25.0'
+    id 'org.openjfx.javafxplugin'        version '0.0.5'
+    id 'org.asciidoctor.convert'         version '1.5.9.2'
+    id 'com.github.kt3k.coveralls'       version '2.8.4'
+    id 'org.jonnyzzz.java9c'             version '0.2.3'
+    id 'org.javamodularity.moduleplugin' version '1.5.0'
+    id 'com.google.osdetector'           version '1.6.2'
 }
 
 if (!project.hasProperty('bintrayUsername'))  project.ext.bintrayUsername  = ''
@@ -73,7 +75,7 @@ config {
         }
     }
 
-    license {
+    licensing {
         licenses {
             license {
                 id = 'Apache-2.0'
@@ -189,12 +191,12 @@ asciidoctor {
 
 test {
     testLogging {
-        exceptionFormat "full"
+        exceptionFormat 'full'
     }
 }
 
 jacoco {
-    toolVersion = '0.8.2'
+    toolVersion = '0.8.4'
 }
 
 processResources {
@@ -204,3 +206,8 @@ processResources {
         ])
     }
 }
+
+codenarc {
+    ignoreFailures = true
+    configFile = project.file('config/codenarc/codenarc.groovy')
+}

gradle.properties

@@ -2,7 +2,7 @@ group                  =  org.groovyfx
 archivesBaseName       =  groovyfx
 version                =  11.0.0-SNAPSHOT
 groovyfx_javafxVersion =  11
-groovyfx_groovyVersion =  2.5.4
+groovyfx_groovyVersion =  2.5.7
 groovyfx_junitVersion  =  4.12
-groovyfx_spockVersion  =  1.2-groovy-2.5
-groovyfx_jansiVersion  =  1.17.1
+groovyfx_spockVersion  =  1.3-groovy-2.5
+groovyfx_jansiVersion  =  1.18

gradle/code-quality.gradle

@@ -1,19 +1,20 @@
 /*
- * Copyright 2011-2018 the original author or authors.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2011-2019 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
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://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.
  */
-
 apply plugin: 'codenarc'
 apply plugin: 'com.github.hierynomus.license'
 

gradle/demo.gradle

@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2011-2018 the original author or authors.
+ * Copyright 2011-2019 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.
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import org.javamodularity.moduleplugin.tasks.ModularJavaExec
 
 // ------------- compiling demo source ---------------
 
@@ -33,13 +34,12 @@ sourceSets {
 
 // ---------------- dynamic tasks to run demos ------------------
 
-new File('src/demo/groovy').eachFileMatch(~/.*Demo.groovy/) { file ->
-    def taskName = file.name - '.groovy'
-    task "$taskName"(type: JavaExec) {
+new File('src/demo/groovy/demo').eachFileMatch(~/.*Demo.groovy/) { file ->
+    def demoClassName = file.name - '.groovy'
+    task "run$demoClassName"(type: ModularJavaExec) {
         group = "Demo"
-        description = "Run the $taskName program"
-        main = taskName
-        classpath sourceSets.main.runtimeClasspath + sourceSets.demo.runtimeClasspath
+        description = "Run the $demoClassName program"
+        main = "groovyfx.demo/demo.$demoClassName"
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-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"