Skip to content
This repository has been archived by the owner on Mar 16, 2020. It is now read-only.

Commit

Permalink
Ensure cross-platform compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
Parcly-Taxel committed Sep 17, 2019
1 parent 87f6732 commit 0245ab3
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
18 changes: 12 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -14,18 +13,25 @@ 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"
}

checkstyle {
toolVersion = "8.23"
}

javafx {
version = "12.0.2"
modules = [ 'javafx.controls', 'javafx.fxml' ]
}

shadowJar {
archiveBaseName = "bari"
archiveVersion = "1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/DialogBox.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<fx:root alignment="CENTER_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
prefWidth="400.0" spacing="10.0" type="javafx.scene.layout.HBox"
xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1">
<padding>
<Insets bottom="15.0" left="5.0" right="5.0" top="15.0"/>
</padding>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/MainWindow.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<?import javafx.scene.layout.VBox?>

<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0"
prefWidth="400.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
prefWidth="400.0" xmlns="http://javafx.com/javafx/11" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="bari.MainWindow">
<TextField fx:id="userInput" layoutY="558.0" onAction="#handleUserInput" prefHeight="41.0" prefWidth="324.0"
AnchorPane.bottomAnchor="1.0"/>
Expand Down

0 comments on commit 0245ab3

Please sign in to comment.