Skip to content

use default flavor if there is no product flavor #344

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

Merged
merged 1 commit into from
Nov 8, 2021
Merged

use default flavor if there is no product flavor #344

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
5 changes: 1 addition & 4 deletions source/src/main/groovy/com/kezong/fataar/FlavorArtifact.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,8 @@ class FlavorArtifact {
}
}

if (variant.productFlavors.isEmpty()) {
return false
}
// 2. find missingStrategies
ProductFlavor flavor = variant.productFlavors.first()
ProductFlavor flavor = variant.productFlavors.isEmpty() ? variant.mergedFlavor : variant.productFlavors.first()
flavor.missingDimensionStrategies.find { entry ->
String toDimension = entry.getKey()
String toFlavor = entry.getValue().getFallbacks().first()
Copy link
Contributor Author

@Legion2 Legion2 Sep 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kezong should't we first try the requested value and then try all the fallbacks?

Suggested change
String toFlavor = entry.getValue().getFallbacks().first()
String toFlavor = entry.getValue().requested

Because the semantic of missingDimensionStrategy is as follows:
missingDimensionStrategy 'dimension', 'requested', 'fallback1', 'fallback2' ...

getFallbacks().first() would select fallback1 and skipping requested and ignoring the other fallbacks.

As a result missingDimensionStrategy 'dimension', 'requested' causes an exception, because it has not fallbacks.

Expand Down