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

Merge pull request #1334 from sbt/wip/merge-0.13.5 

Wip/merge 0.13.5
This commit is contained in:
eugene yokota 2014-05-14 09:06:09 -04:00
parent d1b6410c02 81ae2fa582
commit 1d67d42da3
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/EvaluateTask.scala
View File

@ -90,7 +90,7 @@ final object EvaluateTaskConfig {
// Returns the default force garbage collection flag, // Returns the default force garbage collection flag,
// as specified by system properties. // as specified by system properties.
private[sbt] def defaultForceGarbageCollection: Boolean = private[sbt] def defaultForceGarbageCollection: Boolean =
sys.props.get("sbt.task.forcegc").map(java.lang.Boolean.parseBoolean).getOrElse(true) sys.props.get("sbt.task.forcegc").map(java.lang.Boolean.parseBoolean).getOrElse(false)
/** Pulls in the old configuration format. */ /** Pulls in the old configuration format. */
def apply(old: EvaluateConfig): EvaluateTaskConfig = { def apply(old: EvaluateConfig): EvaluateTaskConfig = {
object AdaptedTaskConfig extends EvaluateTaskConfig { object AdaptedTaskConfig extends EvaluateTaskConfig {

2
main/src/main/scala/sbt/Plugins.scala
View File

@ -319,7 +319,7 @@ ${listConflicts(conflicting)}""")
val hasGetterOpt = catching(classOf[ScalaReflectionException]) opt { val hasGetterOpt = catching(classOf[ScalaReflectionException]) opt {
im.symbol.asType.toType.declaration(ru.newTermName("autoImport")) match { im.symbol.asType.toType.declaration(ru.newTermName("autoImport")) match {
case ru.NoSymbol => false case ru.NoSymbol => false
case sym => sym.asTerm.isGetter case sym => sym.asTerm.isGetter || sym.asTerm.isModule
} }
} }
hasGetterOpt getOrElse false hasGetterOpt getOrElse false

2
sbt/src/sbt-test/project/auto-plugins/build.sbt
View File

@ -46,6 +46,8 @@ check := {
same(optInValue, " Q S R", "del in projE in q") same(optInValue, " Q S R", "del in projE in q")
} }
keyTest := "foo"
def same[T](actual: T, expected: T, label: String) { def same[T](actual: T, expected: T, label: String) {
assert(actual == expected, s"Expected '$expected' for `$label`, got '$actual'") assert(actual == expected, s"Expected '$expected' for `$label`, got '$actual'")
} }

4
sbt/src/sbt-test/project/auto-plugins/project/Q.scala
View File

@ -28,6 +28,10 @@ object X extends AutoPlugin {
object D extends AutoPlugin { object D extends AutoPlugin {
override def requires: Plugins = E override def requires: Plugins = E
override def trigger = allRequirements override def trigger = allRequirements
object autoImport {
lazy val keyTest = settingKey[String]("Another demo setting.")
}
} }
object Q extends AutoPlugin object Q extends AutoPlugin

2
src/sphinx/Community/Changes.rst
View File

@ -14,6 +14,8 @@ Changes
- ``testResultLogger`` is now configured. - ``testResultLogger`` is now configured.
- sbt-server hooks for task cancellation. - sbt-server hooks for task cancellation.
- Add ``JUnitXmlReportPlugin`` which generates junit-xml-reports for all tests. - Add ``JUnitXmlReportPlugin`` which generates junit-xml-reports for all tests.
- Fixes auto plugins not detecting ``object autoImport``. (gh-1314)
- Optionally enable forced garbage collection after tasks (``-Dsbt.task.forcegc=true``).
0.13.1 to 0.13.2 0.13.1 to 0.13.2