luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Mark Harrah 2011-07-13 18:08:29 -04:00
parent 0e5533786c
commit ed20823886
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/ConflictWarning.scala
View File

@ -5,7 +5,7 @@ package sbt
final case class ConflictWarning(filter: ModuleFilter, group: ModuleID => String, level: Level.Value, failOnConflict: Boolean)
object ConflictWarning
{
def default: ConflictWarning = ConflictWarning( moduleFilter(organization = GlobFilter("org.scala-tools.sbt") | GlobFilter("org.scala-lang")), (_: ModuleID).organization, Level.Warn, false)
lazy val default: ConflictWarning = ConflictWarning( moduleFilter(organization = GlobFilter("org.scala-tools.sbt") | GlobFilter("org.scala-lang")), (_: ModuleID).organization, Level.Warn, false)
def apply(config: ConflictWarning, report: UpdateReport, log: Logger)
{

6
main/Defaults.scala
View File

@ -51,7 +51,7 @@ object Defaults extends BuildCommon
pollInterval :== 500,
logBuffered :== false,
autoScalaLibrary :== true,
definesClass := FileValueCache(Locate.definesClass _ ).get,
definesClass :== FileValueCache(Locate.definesClass _ ).get,
trapExit :== false,
trapExit in run :== true,
logBuffered in testOnly :== true,
@ -72,7 +72,7 @@ object Defaults extends BuildCommon
javaOptions :== Nil,
sbtPlugin :== false,
crossPaths :== true,
classpathTypes := Set("jar", "bundle"),
classpathTypes :== Set("jar", "bundle"),
aggregate :== Aggregation.Enabled,
maxErrors :== 100,
showTiming :== true,
@ -578,7 +578,7 @@ object Classpaths
publishLocal <<= publishTask(publishLocalConfiguration, deliverLocal)
)
val baseSettings: Seq[Setting[_]] = Seq(
conflictWarning in GlobalScope := ConflictWarning.default,
conflictWarning in GlobalScope :== ConflictWarning.default,
unmanagedBase <<= baseDirectory / "lib",
normalizedName <<= name(StringUtilities.normalize),
organization <<= organization or normalizedName.identity,