From 3c4955cee64c8cfadf4b6330edf0f9b990535c1d Mon Sep 17 00:00:00 2001 From: Lennart ten Wolde Date: Mon, 10 Apr 2023 22:33:23 +0200 Subject: [PATCH] chore: update build files --- build.gradle | 1 - conveyor.conf | 7 ++++++- src/main/java/module-info.java | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 4bb3473..4b88dae 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,6 @@ repositories { dependencies { implementation 'org.jfxtras:jmetro:11.6.16' implementation 'org.controlsfx:controlsfx:11.1.0' - implementation 'org.eclipse.fx:org.eclipse.fx.drift:1.0.0' implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion") implementation "org.lwjgl:lwjgl" diff --git a/conveyor.conf b/conveyor.conf index 0f7ce6b..ae24a6b 100644 --- a/conveyor.conf +++ b/conveyor.conf @@ -8,6 +8,10 @@ app { display-name = "Oraksi" rdns-name = "com.lenis0012.oraksi" + machines = [ + "windows.amd64" + ] + // Windows gets square icons, macOS and Linux icons with rounded corners. icons = { label = "Ok" @@ -31,9 +35,10 @@ app { // Required options because module is converted to jar (https://github.com/hydraulic-software/conveyor/issues/55) options += "--enable-native-access=ALL-UNNAMED" options += "--add-opens=javafx.graphics/javafx.scene=ALL-UNNAMED" + modules = [javafx.base, javafx.controls, javafx.fxml] } } -; app.windows.console = true +app.windows.console = true conveyor.compatibility-level = 8 diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index df7bb57..a52020f 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -10,9 +10,9 @@ module oraksi { requires org.lwjgl.glfw; requires org.lwjgl.opengl; - requires org.lwjgl.natives; - requires org.lwjgl.glfw.natives; - requires org.lwjgl.opengl.natives; +// requires org.lwjgl.natives; +// requires org.lwjgl.glfw.natives; +// requires org.lwjgl.opengl.natives; opens com.lenis0012.oraksi to javafx.fxml; opens com.lenis0012.oraksi.lwjgl to javafx.fxml;