Commit Graph

11353 Commits

Author SHA1 Message Date
Allan Renucci 2aed011bc9 Cleanup 2018-01-17 15:19:18 +01:00
jvican 12d2ecfa62 Enable parallel execution of scripted in the plugin
The change to enable batched and parallel execution for scripted was
done only for the scripted-sbt project. This pull request enables it for
scripted-plugin, so that all sbt plugins in 1.x. can benefit from it.

By default, it configures a number of parallel instances of 1 and batch
execution is disabled. Users can change the number of parallel sbt hosts
running scripted tests via the `scriptedParallelInstances` setting.

In some plugins scripted tests', batch execution can cause issues
because the first time `>` commands are executed they assume sbt starts
up. This error can be fixed by doing `reload` before running the `>`
command.

Note that the current scripted plugin does not allow parallel execution
in non-batched mode.
2018-01-17 15:19:18 +01:00
Dale Wijnand c0efc41f2e
Merge pull request #3889 from dwijnand/sbtOn-works-more
Tweak RunFromSourceMain so compile/run/test work
2018-01-17 13:50:46 +00:00
Dale Wijnand 5333d0df08
Merge pull request #3865 from dwijnand/fix-Extracted.append
Deprecates Extracted#append for appendWithSession
2018-01-17 10:01:25 +00:00
eugene yokota 9a6799ac74
Merge pull request #3887 from dwijnand/fix-sbtOn-prompt-echo
Fix sbtOn's prompt & echo
2018-01-16 15:53:51 -05:00
Eugene Yokota ca712acf41 Fix tab completion running `sbt console`
Fixes #3841

This fixes console task that internally uses JLine. When `console` is started from batch mode, the tab is printed as is. This is because JLine is not initialized yet.
Calling `usingTerminal` initializes and restores the terminal afterwards.
2018-01-16 15:41:48 -05:00
Dale Wijnand b2290658ba
Tweak RunFromSourceMain so compile/run/test work
Tested pos/neg compilation of a simple hello world file, running said
file & a simple uTest test suite.

Uses things already downloaded in ~/.ivy2/cache, & shares ~/.sbt/boot
for the compiler-bridge component.
2018-01-16 17:05:38 +00:00
Dale Wijnand c00739ebcd
Fix sbtOn's prompt & echo
This is what it looks like now! 🎉

    > sbtOn /s/t-sbtOn
    [...]
    [info] Running (fork) sbt.RunFromSourceMain /s/t-sbtOn
    Listening for transport dt_socket at address: 5005
    [warn] sbt version mismatch, current: 1.0.3, in build.properties: "1.1.0", use 'reboot' to use the new value.
    [info] Loading settings from idea.sbt,global-plugins.sbt ...
    [info] Loading global plugins from /Users/dnw/.dotfiles/.sbt/1.0/plugins
    [info] Updating ProjectRef(uri("file:/Users/dnw/.sbt/1.0/plugins/"), "global-plugins")...
    [info] Done updating.
    [info] Loading settings from plugins.sbt ...
    [info] Loading project definition from /s/t-sbtOn/project
    [info] Updating ProjectRef(uri("file:/s/t-sbtOn/project/"), "t-sbton-build")...
    [info] Done updating.
    [info] Loading settings from build.sbt ...
    [info] Set current project to t (in build file:/s/t-sbtOn/)
    [info] sbt server started at local:///Users/dnw/.sbt/1.0/server/2c27eaf4c750902a3a41/sock
    > show baseDirectory
    [info] /s/t-sbtOn
    > exit
    [info] shutting down server
    [success] Total time: 34 s, completed 16-Jan-2018 14:37:32
    > Exception in thread "Thread-17" java.io.IOException: Stream closed
    	at java.lang.ProcessBuilder$NullOutputStream.write(ProcessBuilder.java:433)
    	at java.io.OutputStream.write(OutputStream.java:116)
    	at java.io.BufferedOutputStream.flushBuffer(BufferedOutputStream.java:82)
    	at java.io.BufferedOutputStream.flush(BufferedOutputStream.java:140)
    	at java.io.FilterOutputStream.close(FilterOutputStream.java:158)
    	at scala.sys.process.BasicIO$.$anonfun$input$1(BasicIO.scala:200)
    	at scala.sys.process.BasicIO$.$anonfun$input$1$adapted(BasicIO.scala:198)
    	at scala.sys.process.ProcessBuilderImpl$Simple.$anonfun$run$2(ProcessBuilderImpl.scala:75)
    	at scala.sys.process.ProcessImpl$Spawn$$anon$1.run(ProcessImpl.scala:23)

    > show {.}/baseDirectory
    [...]
    [info] ThisBuild / baseDirectory
    [info] 	/d/sbt
2018-01-16 14:40:03 +00:00
Dale Wijnand 113656aed1
Remove compile warnings 2018-01-16 11:17:01 +00:00
Dale Wijnand 0885233281
Deprecates Extracted#append for appendWithSession.
.. and appendWithoutSession.
2018-01-15 14:48:58 +00:00
Eugene Yokota e58b303297 1.1.1-SNAPSHOT 2018-01-13 03:27:11 -05:00
Dale Wijnand d1071002be
Merge pull request #3790 from eatkins/cache-watch-service
Cache WatchService in continuous builds
2018-01-12 15:17:51 +00:00
Dale Wijnand c806a556ef
Merge pull request #3872 from dwijnand/whitesource
Add, configure & enforce sbt-whitesource
2018-01-11 17:00:48 +00:00
Dale Wijnand cdba3e6bea
Add, configure & enforce sbt-whitesource 2018-01-11 14:13:21 +00:00
Dale Wijnand 2022713ff5
Merge pull request #144 from dwijnand/whitesource
Add, configure & enforce sbt-whitesource
2018-01-11 14:12:43 +00:00
Dale Wijnand a21d7dec94
Add, configure & enforce sbt-whitesource 2018-01-11 13:57:15 +00:00
Dale Wijnand 6477d6146f
Merge pull request #3866 from dwijnand/mima
update mimaPreviousArtifacts. add sbt 1.1.0
2018-01-10 18:34:02 +00:00
Dale Wijnand 9c94c4ce1a
Merge pull request #3867 from dwijnand/11
Upgrade to sbt 1.1.0
2018-01-10 17:51:29 +00:00
Dale Wijnand 28164ca7e6
Merge pull request #143 from dwijnand/11
Upgrade to sbt 1.1.0
2018-01-10 17:02:38 +00:00
Dale Wijnand cb2042c283
Upgrade to sbt 1.1.0 2018-01-10 16:08:13 +00:00
Dale Wijnand 8e8e0747a8
Upgrade to sbt 1.1.0 2018-01-10 16:04:57 +00:00
Dale Wijnand 03b3d4fa72
Merge pull request #142 from dwijnand/mima
Add version 1.1.2 to mimaPreviousArtifacts
2018-01-10 15:58:43 +00:00
xuwei-k 57caee6152
update mimaPreviousArtifacts. add sbt 1.1.0 2018-01-10 15:46:14 +00:00
Dale Wijnand 8e717bda30
Add version 1.1.2 to mimaPreviousArtifacts 2018-01-10 15:42:04 +00:00
Dale Wijnand a52c3bbd9c
Merge pull request #3864 from xuwei-k/mimaPreviousArtifacts
update mimaPreviousArtifacts. add sbt 1.1.0
2018-01-10 14:27:12 +00:00
Dale Wijnand df74f78300
Merge pull request #141 from sbt/1.1.x
Merge 1.1.x into 1.x
2018-01-10 14:14:57 +00:00
xuwei-k afd214d4b0 update mimaPreviousArtifacts. add sbt 1.1.0 2018-01-10 12:48:07 +09:00
Dale Wijnand 907fc2615b
Merge pull request #3839 from xuwei-k/delete-build-info
delete "buildinfo.BuildInfo" from sbt main
2018-01-09 14:30:07 +00:00
eugene yokota bf9cd40349
Merge pull request #207 from sbt/wip/windows
Fix "was unexpected at this time."
2018-01-08 10:33:12 -05:00
Eugene Yokota 417599b463 Fixing test 2018-01-08 10:17:38 -05:00
Eugene Yokota 3b39ff0554 Use more delayed expansion
Fixes #206

When I use unzipped sbt.bat it seems to runs ok, but using the msi installer version, this variable seems to expand and causes:

```
\sbt\bin\java9-rt-export.jar was unexpected at this time.
```
2018-01-08 10:06:04 -05:00
Dale Wijnand a0b27d29b7
Merge pull request #3854 from sbt/1.1.x
1.1.x
2018-01-08 11:16:26 +00:00
xuwei-k 7ff88a3e51 delete buildinfo.BuildInfo from sbt main
sbt-buildinfo plugin have `buildInfoScopedSettings(Compile)` in default.
I think it is unnecessary. or we should set "buildinfoPackage in Compile" and "buildinfoObject in Compile"

https://github.com/sbt/sbt-buildinfo/blob/v0.7.0/src/main/scala/sbtbuildinfo/BuildInfoPlugin.scala#L11
2018-01-08 14:50:42 +09:00
eugene yokota 852d4ea37c
Merge pull request #3852 from eed3si9n/wip/notes
Zinc 1.1.0
2018-01-06 01:45:02 -05:00
Eugene Yokota 5a695b9761 launchconfig 2018-01-05 22:47:58 -05:00
eugene yokota a8b7b5a060
Merge pull request #205 from philwalk/cygfix
remove invisible carriage-return appended to java_version under cygwin
2018-01-05 17:14:43 -05:00
Phil 13f2bafdf8 remove invisible carriage-return appended to java_version under cygwin 2018-01-05 14:36:17 -07:00
eugene yokota f66161a14f line up Scala version and JLine 2018-01-05 15:55:14 -05:00
Eugene Yokota 47d66eef0f Zinc 1.1.0 2018-01-05 14:07:04 -05:00
Eugene Yokota bd5cbc4fb3 notes 2018-01-05 14:06:46 -05:00
Dale Wijnand 7acc3c1fb9
Merge pull request #204 from sbt/version-memory
Set both Xms & Xmx when running java -version
2018-01-04 11:28:32 +00:00
Dale Wijnand 901e5794b8
Set both Xms & Xmx when running java -version
See the comments in #203.

My choice of minimum memory is basically arbitrary.
2018-01-04 10:18:18 +00:00
eugene yokota 412709ce50
Merge pull request #203 from marcospereira/fix-java-version-detection
Remove -Xmx512M flag when detecting java version
2018-01-04 03:30:25 -05:00
Dale Wijnand f2f44c738c
Merge pull request #3836 from dwijnand/projectToLocalProject
Introduce projectToLocalProject to replace projectToRef
2018-01-03 16:36:34 +00:00
Marcos Pereira f9295a6715
Remove -Xmx512M flag when detecting java version
The flag can cause problems when there is another configuration
adding -Xms with a value bigger than 512M. The `java -version`
command will fail and no java version will be detected, causing
a failure in `checkJava`.
2018-01-02 18:15:07 -02:00
eugene yokota 8ac280e094
Merge pull request #3835 from cunei/wip-disable-fork-parallel
Keep "tests/fork-parallel" disabled, but add an explanation
2018-01-02 15:09:36 -05:00
Dale Wijnand 365f5b6e78
Merge pull request #140 from xuwei-k/java9
add Java 9 test
2018-01-02 16:44:39 +00:00
Dale Wijnand 4752084f91
Introduce projectToLocalProject to replace projectToRef
Fixes #3757
2018-01-02 16:07:29 +00:00
Johannes Rudolph 5e3bbdb8c2
README: sbt 0.13 is only supported starting from 0.13.10
Fixes #148.
2018-01-02 13:55:48 +01:00
xuwei-k 966f3ebaad add Java 9 test 2017-12-23 20:07:14 +09:00