From ead3c8e2494ac6e0dfed565b4297efffa9fe87c7 Mon Sep 17 00:00:00 2001 From: lionzxy Date: Mon, 4 Jan 2021 17:21:43 +0200 Subject: [PATCH] Update wrapper and kotlin --- build.gradle | 11 ++++++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 3636870..96969b5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,19 @@ buildscript { - ext.kotlin_version = '1.1.1' + ext.kotlin_version = '1.4.20' repositories { mavenCentral() maven { url "https://plugins.gradle.org/m2/" } + maven { + url "https://jcenter.bintray.com" + } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version" classpath 'gradle.plugin.de.fuerstenau:BuildConfigPlugin:1.1.8' + classpath group: 'de.dynamicfiles.projects.gradle.plugins', name: 'javafx-gradle-plugin', version: '8.8.2' } } @@ -18,7 +22,7 @@ apply plugin: 'java' apply plugin: "kotlin-allopen" apply plugin: 'idea' apply plugin: 'de.fuerstenau.buildconfig' -apply from: "http://dl.bintray.com/content/shemnon/javafx-gradle/8.1.1/javafx.plugin" +apply plugin: 'javafx-gradle-plugin' //apply plugin: 'application' group 'ru.lionzxy.tplauncher' version '1.0-SNAPSHOT' @@ -71,7 +75,8 @@ buildConfig { charset = 'UTF-8' // sets charset of the generated class, } -javafx { +// Wait https://github.com/FibreFoX/javafx-gradle-plugin/issues/147 +jfx { mainClass 'ru.lionzxy.tplauncher.MainApplication' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f771f91..37808c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Mon Aug 12 22:03:53 MSK 2019 -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists