upgrade gradle (2.5 -> 3.3); upgrade javafxGradlePlugin (8.7.0 -> 8.8…

….0), oprava verze validatoru (1.5_dev -> 1.5-dev)
NLCR · Apr 3, 2017 · 2fe1029 · 2fe1029
1 parent 9a43c60
commit 2fe1029
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'rzehan'
-version '1.5_dev'
+version '1.5-dev'
 
 System.setProperty("file.encoding", "UTF-8")
 

diff --git a/cliModule/build.gradle b/cliModule/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     //compile 'commons-cli:commons-cli:1.4-SNAPSHOT'
 }
 
-version = '1.5_dev'
+version = '1.5-dev'
 
 //https://www.mkyong.com/gradle/gradle-create-a-jar-file-with-dependencies/
 task fatJar(type: Jar) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/javaFxModule/build.gradle b/javaFxModule/build.gradle
@@ -13,7 +13,7 @@ repositories {
 //https://github.com/FibreFoX/javafx-gradle-plugin
 
 group 'rzehan'
-version '1.5_dev'
+version '1.5-dev'
 
 //sourceCompatibility = 1.8
 
@@ -71,7 +71,7 @@ jfx {
 
     //bundler = 'windows.app'//bundler='ALL'
     appName = 'KomplexniValidatorGUI'
-    nativeReleaseVersion = "1.5_dev"
+    nativeReleaseVersion = "1.5-dev"
 
     //additionalAppResources = ['../sharedModule/src/main/resources/nkp/pspValidator/shared','src/main/resources/config']
     additionalAppResources = '../sharedModule/src/main/resources/nkp/pspValidator/shared'

diff --git a/javaFxModule/version.gradle b/javaFxModule/version.gradle
@@ -1,5 +1,7 @@
 //TODO: presunout
 gradle.ext {
     //javafxGradlePluginVersion = '8.7.1-SNAPSHOT'
-    javafxGradlePluginVersion = '8.7.0'
+    //javafxGradlePluginVersion = '8.7.0'
+    //resi problem s gradlem 3.3 https://github.com/FibreFoX/javafx-gradle-plugin/issues/52
+    javafxGradlePluginVersion = '8.8.0'
 }
diff --git a/sharedModule/src/main/java/nkp/pspValidator/shared/Version.java b/sharedModule/src/main/java/nkp/pspValidator/shared/Version.java
@@ -7,6 +7,6 @@ public class Version {
     /**
      * Version code may contain up to one hyphen separating actual version code from suffix dev/alpha/beta, etc.
      */
-    public static String VERSION_CODE = "1.5_dev";
+    public static String VERSION_CODE = "1.5-dev";
     public static String BUILD_DATE = "3. 4. 2017";
 }