Skip to content

Commit

Permalink
Update wrapper and kotlin
Browse files Browse the repository at this point in the history
  • Loading branch information
LionZXY committed Jan 4, 2021
1 parent b2dcbe7 commit ead3c8e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
}

Expand All @@ -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'
Expand Down Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit ead3c8e

Please sign in to comment.