add MergeStrategy, see #36 #37
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- split out unzipped JARs into different subdirectories under tempDir to keep duplicates - add MergeStrategy, which is (tempDir, Seq[File]) => File - subject all duplicate entries to the merge strategy as obtained from the mergeStrategy setting (which is String => MergeStrategy) - replace previous handling of META-INF/services/* with MergeStrategy.uniqueLines - set default strategy for "reference.conf" to MergeStrategy.append - everything else defaults to MergeStrategy.error - also add pickFirst/pickLast strategies
- add new strategy `mustEqual`, which is pickFirst if the files’ contents do match - make mustEqual the default action
- also change names to "first", "last", "deduplicate", "filterDistinctLines"
|
Everything’s ready from my side, so merge away (unless there are issues, of course). |
|
Merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
keep duplicates
the mergeStrategy setting (which is String => MergeStrategy)
MergeStrategy.uniqueLines