From ed208238865284fadd23dda574d342ba433ed83a Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 13 Jul 2011 18:08:29 -0400 Subject: [PATCH] cleanup --- ivy/ConflictWarning.scala | 2 +- main/Defaults.scala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ivy/ConflictWarning.scala b/ivy/ConflictWarning.scala index 5d642f04f..f61f0f51f 100644 --- a/ivy/ConflictWarning.scala +++ b/ivy/ConflictWarning.scala @@ -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) { diff --git a/main/Defaults.scala b/main/Defaults.scala index 6fa13cab6..4c227ffb3 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -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,