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

Merge pull request #1841 from sbt/wip/merge-notes 

Merging notes
This commit is contained in:
eugene yokota 2015-02-03 17:00:09 -05:00
parent 15170271a1 b201bbab8c
commit 3dd57e2bc0
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.sbt
View File

@ -468,8 +468,7 @@ def otherRootSettings = Seq(
Scripted.scriptedPrescripted := { f =>
val inj = f / "project" / "maven.sbt"
if (!inj.exists) {
IO.write(inj, """libraryDependencies += Defaults.sbtPluginExtra("org.scala-sbt" % "sbt-maven-resolver" % sbtVersion.value,
|sbtBinaryVersion.value, scalaBinaryVersion.value)""".stripMargin)
IO.write(inj, "addMavenResolverPlugin")
// sLog.value.info(s"""Injected project/maven.sbt to $f""")
}
}

2
util/collection/src/main/scala/sbt/Settings.scala
View File

@ -31,7 +31,7 @@ private final class Settings0[Scope](val data: Map[Scope, AttributeMap], val del
def set[T](scope: Scope, key: AttributeKey[T], value: T): Settings[Scope] =
{
val map = data getOrElse(scope, AttributeMap.empty)
val map = data getOrElse (scope, AttributeMap.empty)
val newData = data.updated(scope, map.put(key, value))
new Settings0(newData, delegates)
}