Skip to content

Prevent the default variants to be used as fallback #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent the default variants to be used as fallback #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/java/org/openjfx/gradle/metadatarule/JavaFXComponentMetadataRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down