Commit Graph

6421 Commits

Author SHA1 Message Date
eugene yokota 7dfc86d7a4
Merge pull request #4269 from eed3si9n/wip/switch
Make ++ fail when it doesn't affect any subprojects
2018-07-15 22:33:56 -04:00
Eugene Yokota 1bf6f0d2a0 Make ++ fail when it doesn't affect any subprojects
Fixes #4267
2018-07-15 20:47:59 -04:00
eugene yokota 2d106d92a5
Merge pull request #4265 from eed3si9n/wip/bumpzinc
Zinc 1.2.0-M2
2018-07-14 09:06:09 -04:00
Eugene Yokota 29fa4fb20c Zinc 1.2.0-M2 2018-07-14 03:17:52 -04:00
eugene yokota c02bc2f9d1
Merge pull request #4264 from eed3si9n/wip/javacrossfix
Fixes contains bug
2018-07-14 03:13:05 -04:00
eugene yokota c3cbc7d475
Merge pull request #4263 from eed3si9n/wip/bumpg8
sbt-giter8-resolver 0.11.0
2018-07-14 01:18:03 -04:00
Eugene Yokota 439e67c8c4 Fixes contains bug
Ref https://github.com/scala/bug/issues/10831
Ref https://github.com/sbt/sbt/pull/4139#commitcomment-29633458
2018-07-14 01:05:14 -04:00
Eugene Yokota 5c2c8b262a sbt-giter8-resolver 0.11.0 2018-07-13 17:53:37 -04:00
eugene yokota 18602c521d
Merge pull request #4258 from eed3si9n/wip/scripted
scripted-sbt-redux
2018-07-10 10:03:26 -04:00
Eugene Yokota b3342118f8 Add dependencyOverrides for scripted-plugin
Fixes #4249

This introduces an override rule into the metabuild so scripted-plugin will align with the sbt version.
2018-07-10 03:13:47 -04:00
Eugene Yokota d7dc4b3e29 create scripted-sbt-redux
Fixes #4241
Fixes #4242

This introduces a new subproject named scripted-sbt-redux. The purpose of this new subproject is to workaround the 'sbt.test` package vs `Keys.test` key confusion (#4242) while maintaining the forward compatibility of 0.13.17's sbt cross testing ^^ (#4241).

The new subproject uses `sbt.scriptedtest` package name, and that's the one that will be used by the mothership.

Meanwhile "scripted-sbt" subproject will also be published for compatibility purpose.
2018-07-10 03:13:47 -04:00
eugene yokota 83934ec231
Merge pull request #4257 from xuwei-k/remove-old-scala
simplify build settings. sbt 1.x no longer support old scala versions
2018-07-10 03:05:45 -04:00
xuwei-k f01ff3dd03 simplify build settings. sbt 1.x no longer support old scala versions 2018-07-10 11:51:14 +09:00
eugene yokota de299c0413
Merge pull request #4255 from xuwei-k/remove-project-SiteMap
remove unused project/SiteMap.scala
2018-07-09 15:24:20 -04:00
eugene yokota dfe7e5ff70
Merge pull request #4256 from xuwei-k/correspond-name
correspond file names and class names, packages and directories
2018-07-09 15:23:55 -04:00
xuwei-k b8b9e96bf5 remove unused project/SiteMap.scala
added d6ca66d406
unused since 7f2bd2cc4b
2018-07-09 14:54:24 +09:00
xuwei-k f22809d152 correspond file names and class names, packages and directories 2018-07-09 14:41:44 +09:00
eugene yokota ebc8425f7f
Merge pull request #4254 from xuwei-k/SAM
use SAM type
2018-07-09 00:55:29 -04:00
xuwei-k ae1fdff968 use SAM type 2018-07-09 13:06:34 +09:00
eugene yokota 62954d46ea
Merge pull request #4252 from xuwei-k/java-7-8
use Java 7 and 8 features
2018-07-08 23:06:37 -04:00
eugene yokota cd057209c9
Merge pull request #4253 from xuwei-k/INode-var
use val instead of var
2018-07-08 23:03:43 -04:00
eugene yokota 6c1e29b97f
Merge pull request #4251 from xuwei-k/typo
fix typo
2018-07-08 22:50:47 -04:00
xuwei-k 98eca81b17 use val instead of var 2018-07-08 22:35:31 +09:00
xuwei-k 6936ca024e use Java 7 and 8 features
- diamond operator
- lambda
2018-07-08 22:32:26 +09:00
xuwei-k aa14656753 fix typo 2018-07-08 22:18:57 +09:00
eugene yokota e5af0fe0e9
Merge pull request #4250 from eed3si9n/wip/vscode_output
Prevent Output panel from stealing focus
2018-07-06 08:22:09 -04:00
Eugene Yokota e1cc81fbd6 Prevent Output panel from stealing focus
Fixes https://github.com/sbt/sbt/issues/4247
Ref https://github.com/Microsoft/vscode/issues/31474
2018-07-06 08:16:48 -04:00
eugene yokota e18e9f7c3e
Merge pull request #4246 from retronym/ticket/4244
Defer deprecation warn of last-grep/load-failed until they are used
2018-07-04 00:29:38 -04:00
Jason Zaugg c10ff305de Defer deprecation warn of last-grep/load-failed until they are used 2018-07-04 08:49:26 +10:00
eugene yokota 8692952e91
Merge pull request #4245 from raboof/selectLatestJavaVersion
Select most recent JDK
2018-07-03 12:29:47 -04:00
Arnout Engelen 46693548d7 Add missing copyright header 2018-07-03 15:50:57 +02:00
Arnout Engelen 57e3183b8d Discover jvm installed via Oracle Linux RPM's 2018-07-03 15:29:31 +02:00
Arnout Engelen 7630ed8201 Select most recent jdk
When multiple jdk minor/patch versions are available, select the most
recent one.
2018-07-03 11:06:04 +02:00
eugene yokota 14b320fe21
Merge pull request #4239 from eed3si9n/wip/lm
LM 1.2.0-M3
2018-07-01 04:02:20 -04:00
Eugene Yokota 1aea46d9e4 Import SemanticSelector 2018-07-01 03:13:09 -04:00
Eugene Yokota c0030d594c LM 1.2.0-M3
Fixes https://github.com/sbt/sbt/issues/3773
Ref https://github.com/sbt/librarymanagement/pull/211
Ref https://github.com/sbt/librarymanagement/pull/253
2018-07-01 03:12:44 -04:00
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 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 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