From 265e3f7f70606c8f87f0561357dc638fccf60967 Mon Sep 17 00:00:00 2001 From: Andreas Billmann Date: Mon, 1 Jun 2020 22:27:42 +0200 Subject: [PATCH] update the gradle version and the kotlin version --- build.gradle | 22 ++++++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index fcbea61..796ed30 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,5 @@ -group 'ninja.javafx' -version '1.1-SNAPSHOT' - buildscript { - ext.kotlin_version = '1.0.4' + ext.kotlin_version = '1.3.72' repositories { mavenCentral() @@ -12,18 +9,27 @@ buildscript { } } -apply plugin: 'kotlin' -apply plugin: 'application' - -mainClassName = 'ninja.javafx.smartcsv.fx.converter.ConverterFX' +plugins { + id "org.jetbrains.kotlin.jvm" version "$kotlin_version" + id 'application' + id 'org.openjfx.javafxplugin' version '0.0.8' +} repositories { mavenCentral() jcenter() } +javafx { + modules = [ 'javafx.controls', 'javafx.fxml' ] +} + dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile 'com.beust:klaxon:0.24' compile 'no.tornado:tornadofx:1.5.6' } + +group 'ninja.javafx' +version '1.1-SNAPSHOT' +mainClassName = 'ninja.javafx.smartcsv.fx.converter.ConverterFX' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1bf27dd..063165b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip