add MergeStrategy, see #36 #37

Merged
merged 3 commits into from Apr 23, 2012

Conversation

Projects
None yet
2 participants
@rkuhn

rkuhn commented Apr 21, 2012

  • 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

rkuhn added some commits Apr 21, 2012

add MergeStrategy, see #36
- 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
rename append->concat, add mustEqual and tests
- add new strategy `mustEqual`, which is pickFirst if the files’
  contents do match
- make mustEqual the default action
improve logging and document merge strategies
- also change names to "first", "last", "deduplicate",
  "filterDistinctLines"
@rkuhn

This comment has been minimized.

Show comment
Hide comment
@rkuhn

rkuhn Apr 23, 2012

Everything’s ready from my side, so merge away (unless there are issues, of course).

rkuhn commented Apr 23, 2012

Everything’s ready from my side, so merge away (unless there are issues, of course).

eed3si9n added a commit that referenced this pull request Apr 23, 2012

@eed3si9n eed3si9n merged commit 633d447 into sbt:master Apr 23, 2012

@eed3si9n

This comment has been minimized.

Show comment
Hide comment
@eed3si9n

eed3si9n Apr 23, 2012

Member

Merged.

Member

eed3si9n commented Apr 23, 2012

Merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment