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

Merge pull request #2746 from dwijnand/scalas-silent 

Silent startup for scalas
This commit is contained in:
eugene yokota 2016-09-15 21:40:21 -04:00 committed by GitHub
parent a572af00b7 d945925d0e
commit 79b0fbbc56
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/src/main/scala/sbt/Main.scala
View File

@ -34,10 +34,13 @@ final class xMain extends xsbti.AppMain {
} }
final class ScriptMain extends xsbti.AppMain { final class ScriptMain extends xsbti.AppMain {
def run(configuration: xsbti.AppConfiguration): xsbti.MainResult = def run(configuration: xsbti.AppConfiguration): xsbti.MainResult =
runManaged(initialState(configuration, {
BuiltinCommands.ScriptCommands, import BasicCommandStrings.runEarly
Script.Name :: Nil) runManaged(initialState(configuration,
) BuiltinCommands.ScriptCommands,
runEarly(Level.Error.toString) :: Script.Name :: Nil)
)
}
} }
final class ConsoleMain extends xsbti.AppMain { final class ConsoleMain extends xsbti.AppMain {
def run(configuration: xsbti.AppConfiguration): xsbti.MainResult = def run(configuration: xsbti.AppConfiguration): xsbti.MainResult =

4
notes/0.13.13.markdown
View File

@ -16,7 +16,7 @@
- Adds the ability to call `aggregateProjects(..)` for the current project inside a build sbt file. [#2682][2682] by [@xuwei-k][@xuwei-k] - Adds the ability to call `aggregateProjects(..)` for the current project inside a build sbt file. [#2682][2682] by [@xuwei-k][@xuwei-k]
- Adds `.jvmopts` support to the launcher script. [sbt/sbt-launcher-package#111][111] by [@fommil][@fommil] - Adds `.jvmopts` support to the launcher script. [sbt/sbt-launcher-package#111][111] by [@fommil][@fommil]
- Adds `.java-version` support to the Windows launcher script. [sbt/sbt-launcher-package#111][111] by [@fommil][@fommil] - Adds `.java-version` support to the Windows launcher script. [sbt/sbt-launcher-package#111][111] by [@fommil][@fommil]
- The startup log level is dropped to `-error` in script mode using `scalas`. [#840][840]/[#2746][2746] by [@eed3si9n][@eed3si9n]
### Bug fixes ### Bug fixes
@ -98,6 +98,7 @@ For `<+=` and `<++=`, use `+= { x.value }` and `++= { x.value }`.
[g8]: http://www.foundweekends.org/giter8/ [g8]: http://www.foundweekends.org/giter8/
[eed3si9n/hello.g8]: https://github.com/eed3si9n/hello.g8 [eed3si9n/hello.g8]: https://github.com/eed3si9n/hello.g8
[840]: https://github.com/sbt/sbt/issues/840
[1041]: https://github.com/sbt/sbt/issues/1041 [1041]: https://github.com/sbt/sbt/issues/1041
[1431]: https://github.com/sbt/sbt/issues/1431 [1431]: https://github.com/sbt/sbt/issues/1431
[2442]: https://github.com/sbt/sbt/issues/2442 [2442]: https://github.com/sbt/sbt/issues/2442
@ -114,6 +115,7 @@ For `<+=` and `<++=`, use `+= { x.value }` and `++= { x.value }`.
[2731]: https://github.com/sbt/sbt/pull/2731 [2731]: https://github.com/sbt/sbt/pull/2731
[2738]: https://github.com/sbt/sbt/issues/2738 [2738]: https://github.com/sbt/sbt/issues/2738
[2742]: https://github.com/sbt/sbt/pull/2742 [2742]: https://github.com/sbt/sbt/pull/2742
[2746]: https://github.com/sbt/sbt/pull/2746
[110]: https://github.com/sbt/sbt-launcher-package/pull/110 [110]: https://github.com/sbt/sbt-launcher-package/pull/110
[111]: https://github.com/sbt/sbt-launcher-package/pull/111 [111]: https://github.com/sbt/sbt-launcher-package/pull/111
[sbt-ivy-22]: https://github.com/sbt/ivy/pull/22 [sbt-ivy-22]: https://github.com/sbt/ivy/pull/22