Skip to content
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

Ensures distinct dependencies are only added #26

Merged
merged 1 commit into from
Sep 2, 2013
Merged

Ensures distinct dependencies are only added #26

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: 3 additions & 2 deletions src/main/scala/com/typesafe/sbt/packager/archetypes/JavaApp.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ object JavaAppPackaging {
projectDependencyArtifacts <<= findDependencyProjectArtifacts,
//scriptClasspathOrdering <++= projectDependencyMappings,
scriptClasspathOrdering <++= (Keys.dependencyClasspath in Runtime, projectDependencyArtifacts) map universalDepMappings,
scriptClasspathOrdering <<= (scriptClasspathOrdering) map {_.distinct},
Copy link
Member

Choose a reason for hiding this comment

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

I prefer () for these one-liners :) Yeah... call me weird. In any case, the patch looks great, thanks!

mappings in Universal <++= scriptClasspathOrdering,
scriptClasspath <<= scriptClasspathOrdering map makeRelativeClasspathNames,
scriptClasspath <<= scriptClasspathOrdering map makeRelativeClasspathNames,
bashScriptExtraDefines := Nil,
bashScriptDefines <<= (Keys.mainClass in Compile, scriptClasspath, bashScriptExtraDefines) map { (mainClass, cp, extras) =>
val hasMain =
Expand Down Expand Up @@ -149,7 +150,7 @@ object JavaAppPackaging {
for {
p <- previous
n <- next
} yield (p ++ n).distinct
} yield (p ++ n)
}
allArtifactsTask
}
Expand Down