From 494edd623e45e66195e8975e23d0946ff94dd65c Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Thu, 14 Mar 2024 12:47:25 +0200 Subject: [PATCH] support monocle builds --- src/main/java/org/openjfx/gradle/JavaFXPlatform.java | 8 ++++++++ .../gradle/metadatarule/JavaFXComponentMetadataRule.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/openjfx/gradle/JavaFXPlatform.java b/src/main/java/org/openjfx/gradle/JavaFXPlatform.java index a424a43..277194b 100644 --- a/src/main/java/org/openjfx/gradle/JavaFXPlatform.java +++ b/src/main/java/org/openjfx/gradle/JavaFXPlatform.java @@ -61,6 +61,10 @@ public String getClassifier() { return classifier; } + public String getJarClassifier() { + return classifier + (isHeadless() ? "-monocle" : ""); + } + public String getOsFamily() { return osFamily; } @@ -111,4 +115,8 @@ public static JavaFXPlatform fromString(String platform) { } return valueOf(platform); } + + private static boolean isHeadless() { + return "true".equals(System.getProperty("java.awt.headless")); + } } diff --git a/src/main/java/org/openjfx/gradle/metadatarule/JavaFXComponentMetadataRule.java b/src/main/java/org/openjfx/gradle/metadatarule/JavaFXComponentMetadataRule.java index f69dc99..210fbc7 100644 --- a/src/main/java/org/openjfx/gradle/metadatarule/JavaFXComponentMetadataRule.java +++ b/src/main/java/org/openjfx/gradle/metadatarule/JavaFXComponentMetadataRule.java @@ -79,7 +79,7 @@ private void addJavaFXPlatformVariant(JavaFXPlatform javaFXPlatform, ComponentMe }); variant.withFiles(files -> { files.removeAllFiles(); - files.addFile(name + "-" + version + "-" + javaFXPlatform.getClassifier() + ".jar"); + files.addFile(name + "-" + version + "-" + javaFXPlatform.getJarClassifier() + ".jar"); }); }); }