Gradle script update.

This commit is contained in:
Siniša Sovilj
2021-01-14 10:12:14 +01:00
parent 0b4b42180f
commit a0bef1e3b2
6 changed files with 14 additions and 12 deletions

View File

@@ -1,5 +1 @@
kotlin.code.style=official kotlin.code.style=official
systemProp.vaadin.charts.developer.license=c0171602-2326-457a-837d-226c949709f1
systemProp.vaadin.spreadsheet.developer.license=8bf94b9d-b891-47b0-bad3-971445a274a5
vaadin.charts.developer.license=c0171602-2326-457a-837d-226c949709f1
vaadin.spreadsheet.developer.license=8bf94b9d-b891-47b0-bad3-971445a274a5

View File

@@ -2,12 +2,17 @@
* Subproject: "ksdtoolkit-core". * Subproject: "ksdtoolkit-core".
* *
* @author [Siniša Sovilj](mailto:sinisa.sovilj@unipu.hr) * @author [Siniša Sovilj](mailto:sinisa.sovilj@unipu.hr)
* @author [Krešimir Pripužić](mailto:kresimir.pripuzic@fer.hr)
*/ */
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
id("org.jetbrains.kotlin.jvm") id("org.jetbrains.kotlin.jvm")
if (JavaVersion.current().isJava11Compatible) {
id("org.openjfx.javafxplugin") version "0.0.9"
}
} }
tasks.withType<Jar> { tasks.withType<Jar> {
@@ -20,9 +25,7 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-reflect")
testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("org.jetbrains.kotlin:kotlin-test")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit") testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
implementation("org.hamcrest:hamcrest-all:1.3") implementation("org.hamcrest:hamcrest-all:1.3")
implementation("ch.qos.logback:logback-classic:1.2.3") implementation("ch.qos.logback:logback-classic:1.2.3")
@@ -41,6 +44,10 @@ compileTestKotlin.kotlinOptions {
jvmTarget = "1.8" jvmTarget = "1.8"
} }
javafx {
modules("javafx.controls", "javafx.fxml", "javafx.graphics", "javafx.swing")
}
repositories { repositories {
mavenCentral() mavenCentral()
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -1,4 +0,0 @@
vaadin.charts.developer.license=c0171602-2326-457a-837d-226c949709f1
vaadin.spreadsheet.developer.license=8bf94b9d-b891-47b0-bad3-971445a274a5
systemProp.vaadin.charts.developer.license=c0171602-2326-457a-837d-226c949709f1
systemProp.vaadin.spreadsheet.developer.license=8bf94b9d-b891-47b0-bad3-971445a274a5

File diff suppressed because one or more lines are too long

View File

@@ -33,6 +33,9 @@ pluginManagement {
if (requested.id.namespace == "com.google.gms") { if (requested.id.namespace == "com.google.gms") {
useModule("com.google.gms:${requested.id.name}:${requested.version}") useModule("com.google.gms:${requested.id.name}:${requested.version}")
} }
if (requested.id.namespace == "org.openjfx.javafxplugin") {
useModule("org.openjfx.javafx-plugin:${requested.version}")
}
if (requested.id.id.startsWith("org.jetbrains.kotlin")) { if (requested.id.id.startsWith("org.jetbrains.kotlin")) {
useVersion("${kotlinVersion}") useVersion("${kotlinVersion}")
} }