diff --git a/build.gradle b/build.gradle index 7fef88ea99..31f8eb04d2 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,6 @@ plugins { id "application" id "checkstyle" id "com.github.johnrengelman.shadow" version "5.1.0" - id 'org.openjfx.javafxplugin' version '0.0.8' } group "bari" @@ -14,6 +13,18 @@ repositories { } dependencies { + implementation group: "org.openjfx", name: "javafx-base", version: "11", classifier: "win" + implementation group: "org.openjfx", name: "javafx-base", version: "11", classifier: "mac" + implementation group: "org.openjfx", name: "javafx-base", version: "11", classifier: "linux" + implementation group: "org.openjfx", name: "javafx-controls", version: "11", classifier: "win" + implementation group: "org.openjfx", name: "javafx-controls", version: "11", classifier: "mac" + implementation group: "org.openjfx", name: "javafx-controls", version: "11", classifier: "linux" + implementation group: "org.openjfx", name: "javafx-fxml", version: "11", classifier: "win" + implementation group: "org.openjfx", name: "javafx-fxml", version: "11", classifier: "mac" + implementation group: "org.openjfx", name: "javafx-fxml", version: "11", classifier: "linux" + implementation group: "org.openjfx", name: "javafx-graphics", version: "11", classifier: "win" + implementation group: "org.openjfx", name: "javafx-graphics", version: "11", classifier: "mac" + implementation group: "org.openjfx", name: "javafx-graphics", version: "11", classifier: "linux" testImplementation "org.junit.jupiter:junit-jupiter:5.5.1" } @@ -21,11 +32,6 @@ checkstyle { toolVersion = "8.23" } -javafx { - version = "12.0.2" - modules = [ 'javafx.controls', 'javafx.fxml' ] -} - shadowJar { archiveBaseName = "bari" archiveVersion = "1.0.0" diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml index 94b7b345ec..35927cab33 100644 --- a/src/main/resources/view/DialogBox.fxml +++ b/src/main/resources/view/DialogBox.fxml @@ -7,7 +7,7 @@ + xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1"> diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml index 55694255e5..900e7051a8 100644 --- a/src/main/resources/view/MainWindow.fxml +++ b/src/main/resources/view/MainWindow.fxml @@ -7,7 +7,7 @@