From 8b21a8921e565302ef59671202770d6dbbed699f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= Date: Mon, 22 Jan 2024 01:15:55 +0100 Subject: [PATCH] Prevent the default variants to be used as fallback --- .../metadatarule/JavaFXComponentMetadataRule.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/org/openjfx/gradle/metadatarule/JavaFXComponentMetadataRule.java b/src/main/java/org/openjfx/gradle/metadatarule/JavaFXComponentMetadataRule.java index f69dc99..5ff3bb9 100644 --- a/src/main/java/org/openjfx/gradle/metadatarule/JavaFXComponentMetadataRule.java +++ b/src/main/java/org/openjfx/gradle/metadatarule/JavaFXComponentMetadataRule.java @@ -62,6 +62,19 @@ public void execute(ComponentMetadataContext context) { addJavaFXPlatformVariant(javaFXPlatform, details, "Compile", "compile"); addJavaFXPlatformVariant(javaFXPlatform, details, "Runtime", "runtime"); } + + // prevent the default variant with empty jars to be resolved if a not-configured variant is requested + preventDefaultVariantsAsFallback(details, "compile"); + preventDefaultVariantsAsFallback(details, "runtime"); + } + + private void preventDefaultVariantsAsFallback(ComponentMetadataDetails details, String variantName) { + details.withVariant(variantName, variant -> { + variant.attributes(attributes -> { + attributes.attribute(OPERATING_SYSTEM_ATTRIBUTE, getObjects().named(OperatingSystemFamily.class, "none")); + attributes.attribute(ARCHITECTURE_ATTRIBUTE, getObjects().named(MachineArchitecture.class, "none")); + }); + }); } private void addJavaFXPlatformVariant(JavaFXPlatform javaFXPlatform, ComponentMetadataDetails details, String nameSuffix, String baseVariant) {