Updated build infrastructure: works on jdk-11, maven publication fixed

build.gradle

@@ -13,7 +13,7 @@ plugins {
 //    id "com.github.hierynomus.license" version "0.13.1"
     id 'maven-publish'
     id 'net.nemerosa.versioning' version '2.4.0'
-    id 'com.jfrog.bintray' version '1.7.3'
+    id 'com.jfrog.bintray' version '1.8.4'
     id 'com.github.ben-manes.versions' version '0.13.0'
 
     // jigsaw:
@@ -23,12 +23,11 @@ plugins {
 apply plugin: 'java'
 apply from: 'gradle/publishing.gradle'
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.2.1'
-    distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
+wrapper {
+    gradleVersion = '5.4'
 }
 
-sourceCompatibility = '1.9'
+sourceCompatibility = '1.11'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 gradle.projectsEvaluated {
@@ -124,7 +123,7 @@ task executableJar(type: Jar) {
     classifier = 'executable'
 
     from configurations.runtime.asFileTree.files.collect { zipTree(it) }
-    
+
     from files(sourceSets.main.output)
 
     manifest {
@@ -164,12 +163,12 @@ artifacts {
 //    exclude '**/*.svg'
 //}
 
- task run(type: JavaExec) {
-     classpath = sourceSets.main.runtimeClasspath
+task run(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
 
-     main = mainClass
+    main = mainClass
 
-     // arguments to pass to the application
- //    args 'appArg1'
-     // jvmArgs 'arg1'
- }
+    // arguments to pass to the application
+    //    args 'appArg1'
+    // jvmArgs 'arg1'
+}

gradle/project-info.gradle

@@ -3,7 +3,7 @@
 // -----------------------------------------------------------------------------
 ext.publishing.artifactId =  project.name.toLowerCase()
 ext.publishing.groupId    =  'eu.mihosoft.freerouting'
-ext.publishing.versionId  =  '1.3.0'
+ext.publishing.versionId  =  '1.4.0'
 
 ext.publishing.developerName         = 'Michael Hoffer'
 ext.publishing.developerAlias        = 'miho'

gradle/publishing.gradle

@@ -86,7 +86,9 @@ publishing {
             from components.java
             artifact sourcesJar
             artifact javadocJar
-            artifact executableJar
+            afterEvaluate {
+                artifact executableJar
+            }
 
             pom.withXml {
                 def root = asNode()

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
+#Sat May 11 13:12:49 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip

src/main/java/eu/mihosoft/freerouting/gui/MainApplication.java

@@ -397,5 +397,5 @@ public class MainApplication extends javax.swing.JFrame
     /**
      * Change this string when creating a new version
      */
-    static final String VERSION_NUMBER_STRING = "v1.3.0 (JDK9 version by mihosoft.eu)";
+    static final String VERSION_NUMBER_STRING = "v1.4.0 (JDK11 version by mihosoft.eu)";
 }

src/main/java/module-info.java

@@ -1,5 +1,5 @@
 //module eu.mihosoft.freerouting {
-//    requires java.desktop;
-//    requires java.logging;
-//    requires eu.mihosoft.freerouting.deps.jh;
+//   requires java.desktop;
+//   requires java.logging;
+//   requires eu.mihosoft.freerouting.deps.jh;
 //}