Commit Graph

10242 Commits

Author SHA1 Message Date
eugene yokota 0dfab79d8d
Merge pull request #4237 from eed3si9n/wip/help-sbt-new
Fixes `sbt help new` not working as batch command
2018-06-28 02:10:48 -04:00
Eugene Yokota 94277b1ed0 Can't call help from scripted 2018-06-27 23:24:16 -04:00
eugene yokota cf31a11b69
Merge branch '1.x' into help-sbt-new 2018-06-27 22:15:02 -04:00
eugene yokota 2c550b73f1
Merge pull request #4235 from eed3si9n/wip/bump
Util 1.2.0-M2, LM 1.2.0-M2
2018-06-27 22:08:43 -04:00
Eugene Yokota 17e0042bd8 Util 1.2.0-M2, LM 1.2.0-M2 2018-06-27 21:07:03 -04:00
Eugene Yokota 14a31634e7 Code formatting 2018-06-27 21:06:40 -04:00
eugene yokota 773d35dadd
Merge pull request #4231 from steinybot/fix/3432
Add warning for unknown configurations
2018-06-27 20:59:43 -04:00
eugene yokota eb942f8e5f
Merge pull request #4003 from eed3si9n/wip/opt-delegation3
optimize scope delegation
2018-06-27 15:31:21 -04:00
eugene yokota b0e025915a
Merge pull request #4227 from eed3si9n/wip/thin
Implement thin client
2018-06-27 15:27:42 -04:00
eugene yokota a46c07d5f6
Merge pull request #4232 from eed3si9n/wip/run-logging
Fixes the stacktrace of run
2018-06-27 12:58:10 -04:00
eugene yokota cd0142ef51
Merge pull request #4233 from eed3si9n/wip/servertest3
Increase the timeout to 90s
2018-06-27 08:38:05 -04:00
eugene yokota 3811d2a82e
Merge pull request #167 from eed3si9n/wip/run-logging
Fixes the stacktrace trimming
2018-06-27 08:16:07 -04:00
Eugene Yokota 76aa729960 Increase the timeout to 90s
Sometimes 30s is not enough.
2018-06-27 07:44:34 -04:00
Eugene Yokota 306ee82db3 Use MessageOnlyException for "Nonzero exit code" 2018-06-27 07:09:59 -04:00
Eugene Yokota 434e294f28 Fixes the stacktrace trimming
Ref https://github.com/sbt/sbt/issues/4121
Ref https://github.com/sbt/sbt/pull/4232
2018-06-27 06:37:36 -04:00
Eugene Yokota 3b7e6974c3 Fixes stacktrace of backgroun run
Ref https://github.com/sbt/sbt/issues/4121

sbt already has the facility to trim stack traces. This sets the trace level of the background run, which fixes the upper half of the `run` stacktrace.

```
[error] (run-main-0) java.lang.Exception
[error] java.lang.Exception
[error] 	at Hello$.delayedEndpoint$Hello$1(Hello.scala:5)
[error] 	at Hello$delayedInit$body.apply(Hello.scala:1)
[error] 	at scala.Function0.apply$mcV$sp(Function0.scala:34)
[error] 	at scala.Function0.apply$mcV$sp$(Function0.scala:34)
[error] 	at scala.runtime.AbstractFunction0.apply$mcV$sp(AbstractFunction0.scala:12)
[error] 	at scala.App.$anonfun$main$1$adapted(App.scala:76)
[error] 	at scala.collection.immutable.List.foreach(List.scala:389)
[error] 	at scala.App.main(App.scala:76)
[error] 	at scala.App.main$(App.scala:74)
[error] 	at Hello$.main(Hello.scala:1)
[error] 	at Hello.main(Hello.scala)
[error] 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
[error] 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
[error] 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
[error] 	at java.lang.reflect.Method.invoke(Method.java:498)
[error] java.lang.RuntimeException: Nonzero exit code: 1
[error] 	at sbt.Run$.executeTrapExit(Run.scala:127)
[error] 	at sbt.Run.run(Run.scala:77)
[error] 	at sbt.Defaults$.$anonfun$bgRunTask$5(Defaults.scala:1254)
[error] 	at sbt.Defaults$.$anonfun$bgRunTask$5$adapted(Defaults.scala:1249)
[error] 	at sbt.internal.BackgroundThreadPool.$anonfun$run$1(DefaultBackgroundJobService.scala:377)
[error] 	at scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.java:12)
[error] 	at scala.util.Try$.apply(Try.scala:209)
[error] 	at sbt.internal.BackgroundThreadPool$BackgroundRunnable.run(DefaultBackgroundJobService.scala:299)
[error] 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
[error] 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
[error] 	at java.lang.Thread.run(Thread.java:748)
[error] (Compile / run) Nonzero exit code: 1
```

The bottom half requires a similar fix to the foreground log.
2018-06-27 06:26:38 -04:00
Jason Pickens c9aa0c5285 Add warning for unknown project configurations. 2018-06-27 18:25:10 +12:00
eugene yokota 58cb9b2383
Merge pull request #4230 from OlegYch/fix-windows-eol
remove gittatributes, assume core.autocrlf=false
2018-06-26 19:35:56 -04:00
OlegYch f44e4bb1e9 remove gittatributes, assume core.autocrlf=false
scalafmt is configured to use lf, as your editor should be, so there is no point having git tinker with line endings
otherwise on checkout on windows source files get converted to crlf (by git) and on compile they get converted back to lf (by scalafmt)
2018-06-26 17:38:05 +03:00
eugene yokota 7f52cc4bd7
Merge pull request #165 from eed3si9n/wip/houserules
sbt-houserules 0.3.7
2018-06-26 00:43:37 -04:00
Eugene Yokota 76b2ea03cd Fix mima issue 2018-06-25 22:37:22 -04:00
Eugene Yokota f3038167a5 Fork server if it's not running
Fixes https://github.com/sbt/sbt/issues/3508

This forks an instance of sbt in the background when it's not running already.

```
$ time sbt -client compile
Getting org.scala-sbt sbt 1.2.0-SNAPSHOT  (this may take some time)...
:: retrieving :: org.scala-sbt#boot-app
	confs: [default]
	79 artifacts copied, 0 already retrieved (28214kB/130ms)
[info] entering *experimental* thin client - BEEP WHIRR
[info] server was not detected. starting an instance
[info] waiting for the server...
[info] waiting for the server...
[info] server found
> compile
[success] completed
sbt -client compile  9.25s user 2.39s system 33% cpu 34.893 total
$ time sbt -client compile
[info] entering *experimental* thin client - BEEP WHIRR
> compile
[success] completed
sbt -client compile  3.55s user 1.68s system 107% cpu 4.889 total
```
2018-06-25 22:37:22 -04:00
Eugene Yokota 3eb76125e0 implement batch mode 2018-06-25 22:26:13 -04:00
Eugene Yokota 5c202a564b skip debug log 2018-06-25 22:26:13 -04:00
Eugene Yokota 1a1f530985 implement -client option 2018-06-25 22:26:13 -04:00
Eugene Yokota 18c6b04b47 Fix thin client to use LSP
Fixes https://github.com/sbt/sbt/issues/2798
2018-06-25 22:26:13 -04:00
eugene yokota 0c3a458e99
Merge pull request #4226 from driquelme/fix_ctrl_c_forked_test
Fix CTRL-C exception
2018-06-25 22:23:43 -04:00
eugene yokota 9883e44875
Merge pull request #4218 from regadas/patch-1
Add doc task to travis-ci
2018-06-25 22:22:42 -04:00
eugene yokota 5bc72f9d8b
Merge pull request #4217 from eed3si9n/wip/contrib2
Use .sbtopts to increase the RAM
2018-06-25 21:08:53 -04:00
Eugene Yokota f3b8ed2196 Use .sbtopts to increase the RAM 2018-06-25 19:40:15 -04:00
eugene yokota 3e32cf0318
Merge pull request #4229 from eed3si9n/wip/bump
IO 1.2.0-M2
2018-06-25 19:39:07 -04:00
Eugene Yokota 444f0dc8b0 Fixes scripted test 2018-06-25 18:42:06 -04:00
Eugene Yokota 14b9bd6e7a IO 1.2.0-M2
Fixes https://github.com/sbt/sbt/issues/4223
2018-06-25 17:02:32 -04:00
eugene yokota 8d15279892
Merge pull request #4221 from gpoirier/issues/2881
Inspect supports alias
2018-06-25 13:36:31 -04:00
Guillaume Poirier 59465d9e1f Adding minimal support for commands in inspect
There's also a special case for aliases that will try to resolve
the target of the alias to a task key if possible and display the
output of that key if found.

see https://github.com/sbt/sbt/issues/2881
2018-06-22 09:04:56 -04:00
Daniel Riquelme aee10cf036 Fix CTRL-C exception 2018-06-22 05:04:30 -04:00
eugene yokota a34f76bab7
Merge pull request #4220 from regadas/issue/630
Add alternative scripted filenames
2018-06-19 22:03:18 -04:00
eugene yokota 56d41ae661
Merge pull request #4216 from agaro1121/4206-fgRun-feature
Addresses #4206 - Introduces fgRun and fgRunMain
2018-06-19 22:01:10 -04:00
Filipe Regadas 0fb07a861b Add alternative scripted filenames 2018-06-19 14:59:04 -04:00
Filipe Regadas 68d6cd5338
Add doc task to travis-ci 2018-06-19 13:27:50 -04:00
Anthony Garo d62a7465ae Addresses #4206 2018-06-19 11:55:57 -04:00
eugene yokota e313193609
Merge pull request #4215 from eed3si9n/wip/contrib
Use 1.x branch
2018-06-19 10:49:12 -04:00
Eugene Yokota d07e432b4f Use 1.x branch 2018-06-19 10:47:34 -04:00
eugene yokota 5b8272b935
Merge pull request #4214 from eed3si9n/wip/bump
bump modules to 1.2.0-M1
2018-06-18 23:25:22 -04:00
Eugene Yokota ddf0f4f43d bump modules to 1.2.0-M1 2018-06-18 22:39:40 -04:00
eugene yokota 6fbb7f055a
Merge pull request #4211 from eed3si9n/wip/loadplugin
addPluginSbtFile command
2018-06-18 22:35:08 -04:00
eugene yokota c966e01a29
Merge pull request #4213 from eed3si9n/wip/split-server-test
Split server unit test on its own
2018-06-18 10:16:41 -04:00
Eugene Yokota dc73fcfece Split server unit test on its own
Ref https://github.com/sbt/sbt/issues/4186
This is an attempt to fix the flaky server test issue.
2018-06-18 04:43:11 -04:00
eugene yokota 479ea92bd8
Merge pull request #4212 from eed3si9n/wip/open-setplugins
Open up setPlugins to private[sbt]
2018-06-18 04:05:17 -04:00
Eugene Yokota 932f911483 addPluginSbtFile command
Fixes https://github.com/sbt/sbt/issues/1502

This adds `--addPluginSbtFile=<file>` command, which adds the given .sbt file to the plugin build.
Using this mechanism editors or IDEs can start a build with required plugin.

```
$ cat /tmp/extra.sbt
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")

$ sbt --addPluginSbtFile=/tmp/extra.sbt
...
sbt:helloworld> plugins
In file:/xxxx/hellotest/
  ...
  sbtassembly.AssemblyPlugin: enabled in root
```
2018-06-18 01:50:36 -04:00