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

Put sbt's derived settings under GlobalScope

This commit is contained in:
Dan Sanduleac 2013-12-18 09:22:53 +00:00 committed by Dan Sanduleac
parent 3161d75a41
commit f485270adf
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/scala/sbt/Defaults.scala
View File

@ -230,11 +230,10 @@ object Defaults extends BuildCommon
javacOptions :== Nil, javacOptions :== Nil,
scalacOptions :== Nil, scalacOptions :== Nil,
scalaVersion := appConfiguration.value.provider.scalaProvider.version, scalaVersion := appConfiguration.value.provider.scalaProvider.version,
crossScalaVersions := Seq(scalaVersion.value) crossScalaVersions := Seq(scalaVersion.value),
)) ++ Seq(
derive(compilersSetting), derive(compilersSetting),
derive(scalaBinaryVersion := binaryScalaVersion(scalaVersion.value)) derive(scalaBinaryVersion := binaryScalaVersion(scalaVersion.value))
) ))
def makeCrossTarget(t: File, sv: String, sbtv: String, plugin: Boolean, cross: Boolean): File = def makeCrossTarget(t: File, sv: String, sbtv: String, plugin: Boolean, cross: Boolean): File =
{ {
val scalaBase = if(cross) t / ("scala-" + sv) else t val scalaBase = if(cross) t / ("scala-" + sv) else t
@ -409,9 +408,9 @@ object Defaults extends BuildCommon
}, },
testOptions := Tests.Listeners(testListeners.value) +: (testOptions in TaskGlobal).value, testOptions := Tests.Listeners(testListeners.value) +: (testOptions in TaskGlobal).value,
testExecution <<= testExecutionTask(key) testExecution <<= testExecutionTask(key)
) ) ++ Seq( ) ) ++ inScope(GlobalScope)(Seq(
derive(testGrouping <<= singleTestGroupDefault) derive(testGrouping <<= singleTestGroupDefault)
) ))
@deprecated("Doesn't provide for closing the underlying resources.", "0.13.1") @deprecated("Doesn't provide for closing the underlying resources.", "0.13.1")
def testLogger(manager: Streams, baseKey: Scoped)(tdef: TestDefinition): Logger = def testLogger(manager: Streams, baseKey: Scoped)(tdef: TestDefinition): Logger =
{ {