luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,804 Commits 29 Branches 312 Tags 69 MiB
Commit Graph

4804 Commits

Author SHA1 Message Date
eugene yokota fd36a20183 Merge pull request #2907 from eed3si9n/topic/logging 
Split log output per channel
 2017-01-14 08:34:44 -05:00
eugene yokota abaece6c96 Merge pull request #2913 from eed3si9n/fport/2653 
[fport] dependsOn can now be used inside a .sbt file for a subproject
 2017-01-14 08:19:42 -05:00
eugene yokota 3ce06e15c5 Merge pull request #2911 from eed3si9n/fport/cached-resolution-configurations 
[fport] Adds back dependency-management /cached-resolution-configurations
 2017-01-14 07:45:20 -05:00
Anatoly Fayngelerin 6dc2cf4210 dependsOn can now be used inside a .sbt file for a subproject 2017-01-14 07:18:10 -05:00
Eugene Yokota 622823fa36 Adds back dependency-management /cached-resolution-configurations 
Ref #2573 #2574, #2513, #2435
 2017-01-14 05:52:05 -05:00
Eugene Yokota 2b6253cc4a Fix scripted project/extra 2017-01-14 03:00:07 -05:00
Eugene Yokota 0365d7cb11 Uncomment publishEvent 2017-01-14 02:30:59 -05:00
Eugene Yokota 9a33550c79 Fix the scripted actions/set 2017-01-14 02:26:23 -05:00
Eugene Yokota b34e182d21 Bump util, lm, and zinc 2017-01-14 00:57:46 -05:00
Eugene Yokota 8c9dfda089 Split log output per channel 
LogManager implementation is modified to use ManagedLogger, which can swap out backing Appenders without re-creating the log instance.

The State was also changed to track `currentCommand: Option[Exec]`. `Exec` knows the origin of the command invocation, and using that we can now send the network-originated events only to the network clients.

Combined together, this implements log splitting between the sbt clients (channels).
 2017-01-13 03:00:02 -05:00
Dale Wijnand c1648ac0a5 Merge pull request #2859 from eed3si9n/wip/protocol 
Start lightweight client
 2017-01-12 15:43:32 +00:00
Eugene Yokota 66301dbaf1 Adjust from rebasing 2017-01-06 11:35:08 -05:00
Eugene Yokota a2df1a4b53 Formatting fix 2017-01-06 11:27:41 -05:00
Eugene Yokota a0dde10f8a Use NonFatal 2017-01-06 11:27:41 -05:00
Eugene Yokota 9ee69e5dd4 Fix test 2017-01-06 11:27:41 -05:00
Eugene Yokota 892e25d23f Introduce execId that gets sent back 
Now the client can put an id on each exec.
This can then be tracked and/or be used to block the user input.
 2017-01-06 11:27:41 -05:00
Eugene Yokota 1bf50e10c8 Use Exec in State 2017-01-06 11:27:41 -05:00
Eugene Yokota d96ef58605 Unifying towards using events 2017-01-06 11:27:06 -05:00
Eugene Yokota 46d8f952e4 Refactor to make NetworkChannel per client connection 2017-01-06 11:27:06 -05:00
Eugene Yokota d618f91c6d Replace var with AtomicReference 2017-01-06 11:27:06 -05:00
Eugene Yokota fa7253ece3 Start lightweight client 
This is the beginning of a lightweight client, which talks to the
server over Contraband-generated JSON API. Given that the server is
started on port 5173:

```
$ cd /tmp/bogus
$ sbt client localhost:5173
> compile
StatusEvent(Processing, Vector(compile, server))
StatusEvent(Ready, Vector())
StatusEvent(Processing, Vector(, server))
StatusEvent(Ready, Vector())
```
 2017-01-06 11:27:06 -05:00
Eugene Yokota 272e733b87 Update to Contraband 2017-01-06 11:27:06 -05:00
eugene yokota 274c8ec65f Merge pull request #2892 from dwijnand/upgrades 
-sbinary/+sjson-new, -datatype/+contraband & upgrades
 2017-01-05 18:22:51 -05:00
Dale Wijnand 7fcfec8b8e
-sbinary/+sjson-new, -datatype/+contraband & upgrades 
* start to replace sbinary with sjson-new
* upgrade from sbt/datatype to sbt/contraband
* upgrade and migrate to new sbt modules APIs
 2017-01-05 21:59:00 +00:00
Dale Wijnand 50df95953e
Add missing "d" task testing in actions/depends-on 2017-01-05 14:40:39 +00:00
Eugene Yokota 104c5f53b3
Adding sleep in scripted test to make sure timestamp bumps [fport] 
Fixes #2546. Ref #958
scripted compiler-project/error-in-invalidated has been failing
frequently on Travis CI. It seems like incremental compiler is not
catching the change in source occasionally for `changes/A2.scala`.

Forward-port of #2565
 2017-01-05 14:40:39 +00:00
eugene yokota d9cc0c2f0b Merge pull request #2844 from dwijnand/reunite 
Add props to define source dependencies on io/util/lm/zinc
 2016-12-11 21:59:57 -05:00
Dale Wijnand 337d1130e5
Make sure publishLocalBin has a default implementation 2016-12-11 12:13:11 +00:00
Dale Wijnand 43821667bf
Upgrade scalariform version 2016-12-11 12:13:11 +00:00
Dale Wijnand 6a46c62524
Ugh Scalariform, ruining my formatting, wonderful 2016-12-11 12:08:28 +00:00
Dale Wijnand 5945e3e477
Bump to sbt 0.13.13 2016-12-11 12:08:28 +00:00
Dale Wijnand b917011082
Add props to define source dependencies on io/util/lm/zinc 
Use either:

* -Dsbtio.path / -Dsbtutil.path / -Dsbtlm.path / -Dsbtzinc.path on the
  command line, or

* -Dsbtio.path= / sbtutil.path= / sbtlm.path / -Dsbtzinc.path in
  project/local.properties
 2016-12-11 12:08:28 +00:00
Dale Wijnand cb2e17a347
Cleanup Dependencies 2016-12-11 12:08:28 +00:00
eugene yokota 8a9ce1bf13 Merge pull request #2858 from ashleymercer/1.0.x 
JUnitXmlTestsListener now correctly flags ignored, skipped and pending tests
 2016-12-02 13:54:28 -05:00
Ashley Mercer f92a0ab8a5 JUnitXmlTestsListener now correctly flags ignored, skipped and pending tests 
Fixes #2198 Ref #2854

Generated Junit-style XML reports now include a count of ignored,
skipped and pending tests; and individual tests are correctly flagged
with the <skipped/> element.
 2016-12-01 10:45:13 +00:00
eugene yokota 94c67d9d7a Merge pull request #2833 from dwijnand/fport-floaty-commmits 
[1.0] Foward port floaty commits
 2016-11-16 11:56:26 -05:00
Dale Wijnand 1fa63b64e0
Tweak launchconfig config [fport] 
Forward port of e94147456c.
 2016-11-16 14:42:15 +00:00
Dale Wijnand 08a42eed6d
Cross publishing to 2.12 [fport] 
Forward port of 462ee042ad.
 2016-11-16 14:41:18 +00:00
eugene yokota 4765990995 Merge pull request #2737 from eed3si9n/topic/server_reboot 
[sbt 1.0] server reboot
 2016-10-27 15:26:23 -04:00
Eugene Yokota 18233ace05 Using sbt-datatype + sjson-new for JSON serialization 2016-10-27 09:27:41 -04:00
Eugene Yokota e7456b5653 Use the new FullReader 2016-10-27 09:20:06 -04:00
Eugene Yokota a94107e673 Handle closed socket 2016-10-27 02:42:12 -04:00
Eugene Yokota fe1a24cf7c Adjust to 1.0.x 2016-10-27 02:42:12 -04:00
Eugene Yokota 75deb4e55d Change "command_exec" to just "exec" 2016-10-27 02:42:12 -04:00
Eugene Yokota 5e0b087daa Use logger 2016-10-27 02:42:12 -04:00
Eugene Yokota a89fcb37ca Exec and CommandExchange refactoring 2016-10-27 02:42:12 -04:00
Eugene Yokota 3359163636 Adds serverPort attribute key 2016-10-27 02:42:12 -04:00
Eugene Yokota ebf4715dd1 Refactor to CommandExchange and CommandChannel 2016-10-27 02:42:12 -04:00
Eugene Yokota 48d3b01e6b Move files around 2016-10-27 02:42:12 -04:00
Eugene Yokota 19b079caf2 Change type to command_exec 2016-10-27 02:42:12 -04:00