diff --git a/build.gradle b/build.gradle index 6433fd06..1e44c694 100644 --- a/build.gradle +++ b/build.gradle @@ -39,5 +39,5 @@ subprojects { task wrapper(type: Wrapper) { - gradleVersion = '3.4.1' + gradleVersion = '3.5.0' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b5a3db4d..b80bcedc 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 96936931..33e4396b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 05 18:15:59 MSK 2017 +#Fri Jun 16 20:54:50 MSK 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.0-bin.zip diff --git a/numass-control/build.gradle b/numass-control/build.gradle index 6dc67921..59790b86 100644 --- a/numass-control/build.gradle +++ b/numass-control/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.1.2-2' + ext.kotlin_version = '1.1.2-5' repositories { mavenCentral() @@ -29,7 +29,7 @@ dependencies { //graphics compile 'org.controlsfx:controlsfx:8.40.12' - compile "no.tornado:tornadofx:1.7.4" + compile "no.tornado:tornadofx:1.7.5" } task installAll(type: Copy) {