Skip to content

Commit 240060e

Browse files
committed
Prevent the default variants to be used as fallback
1 parent bdf717a commit 240060e

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

src/main/java/org/openjfx/gradle/metadatarule/JavaFXComponentMetadataRule.java

+13
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,19 @@ public void execute(ComponentMetadataContext context) {
6262
addJavaFXPlatformVariant(javaFXPlatform, details, "Compile", "compile");
6363
addJavaFXPlatformVariant(javaFXPlatform, details, "Runtime", "runtime");
6464
}
65+
66+
// prevent the default variant with empty jars to be resolved if a not-configured variant is requested
67+
preventDefaultVariantsAsFallback(details, "compile");
68+
preventDefaultVariantsAsFallback(details, "runtime");
69+
}
70+
71+
private void preventDefaultVariantsAsFallback(ComponentMetadataDetails details, String variantName) {
72+
details.withVariant(variantName, variant -> {
73+
variant.attributes(attributes -> {
74+
attributes.attribute(OPERATING_SYSTEM_ATTRIBUTE, getObjects().named(OperatingSystemFamily.class, "<none>"));
75+
attributes.attribute(ARCHITECTURE_ATTRIBUTE, getObjects().named(MachineArchitecture.class, "<none>"));
76+
});
77+
});
6578
}
6679

6780
private void addJavaFXPlatformVariant(JavaFXPlatform javaFXPlatform, ComponentMetadataDetails details, String nameSuffix, String baseVariant) {

0 commit comments

Comments
 (0)