luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,384 Commits 29 Branches 314 Tags 73 MiB
Commit Graph

9384 Commits

Author SHA1 Message Date
Dale Wijnand ee90917cc4
Alt scala parser sync workaround 
Apply retronym's suggestion at https://github.com/scala/bug/issues/10605
instead of the workaround merged in https://github.com/sbt/sbt/pull/3743.
 2017-11-28 12:00:38 +00:00
Eugene Yokota ef61a1efa7 Read just the amount of bytes available 2017-11-27 21:37:37 -05:00
Eugene Yokota f785750fc4 IPC Unix domain socket for sbt server 
In addition to TCP, this adds sbt server support for IPC (interprocess communication) using Unix domain socket and Windows named pipe.

The use of Unix domain socket has performance and security benefits.
 2017-11-27 21:37:31 -05:00
Eugene Yokota 0c803214aa IPC Unix Domain Socket and Windows Named Pipe sockets 
The Java socket implementation for IPC is lifted from facebook/nailgun.

af623fdded/
 2017-11-27 21:36:25 -05:00
eugene yokota e6165464ba
Merge pull request #3740 from laughedelic/wip/logmessage 
LSP: improve logMessage notifications
 2017-11-27 20:51:50 -05:00
Dale Wijnand 5b0b9e2ba2
Add node_modules to .gitignore 2017-11-27 16:52:48 +00:00
Dale Wijnand ac5a30142a
Merge pull request #3770 from xuwei-k/specs2-4 
update specs2 4.0.1
 2017-11-26 09:15:28 +00:00
eugene yokota 8e933fcda4
Merge pull request #3768 from eed3si9n/wip/bump_modules 
Bump modules
 2017-11-26 03:49:14 -05:00
Eugene Yokota 1d8d1a1622 Zinc 1.0.5 2017-11-26 02:26:04 -05:00
xuwei-k 6b4093dc15 update specs2 4.0.1 2017-11-26 13:59:50 +09:00
Eugene Yokota f44dcef14d notes 2017-11-25 05:26:51 -05:00
Eugene Yokota 309fdfac31 Bump modules 2017-11-25 00:27:45 -05:00
Dale Wijnand 7e855b8323 Merge branch '1.0.x' into merge-1.0.x-into-1.x 
* 1.0.x: (28 commits)
  Split compiler bridge tests to another subproject
  Implement compiler bridge for 2.13.0-M2
  Add yourkit acknoledgement in the README
  "sbt '++ 2.13.0-M2!' compile" does not work with sbt 1.0.0
  Add header to cached hashing spec
  Add headers to missing files
  Fix #332: Add sbt-header back to the build
  Update sbt-scalafmt to 1.12
  Make classpath hashing more lightweight
  Fix #442: Name hash of value class should include underlying type
  source-dependencies/value-class-underlying: fix test
  Ignore null in generic lambda tparams
  Improve and make scripted parallel
  Fix #436: Remove annoying log4j scripted exception
  Fix #127: Use `unexpanded` name instead of `name`
  Add pending test case for issue/127
  source-dependencies / patMat-scope workaround
  Fixes undercompilation on inheritance on same source
  Add real reproduction case for sbt/zinc#417
  Add trait-trait-212 for Scala 2.12.3
  ...

 Conflicts:
	internal/zinc-apiinfo/src/main/scala/sbt/internal/inc/ClassToAPI.scala
	project/build.properties
	zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala

The ClassToAPI conflict is due to:
* https://github.com/sbt/zinc/pull/393 (a 1.x PR), conflicting with
* https://github.com/sbt/zinc/pull/446 (a 1.0.x PR).

The build.properties conflict is due to different PRs bumping
sbt.version from 1.0.0 to 1.0.2 to 1.0.3. (#413, #418, #453).

The MixedAnalyzingCompiler conflict is due to:
* https://github.com/sbt/zinc/pull/427 (a 1.x PR), conflicting with
* https://github.com/sbt/zinc/pull/452 (a 1.0.x PR).
 2017-11-23 12:30:03 +00:00
Dale Wijnand c517517927
Merge pull request #3754 from Duhemm/remove-useless-files 
Remove 2 useless files in protocol
 2017-11-23 12:22:15 +00:00
Dale Wijnand 97a2fe8c1c
Merge pull request #3762 from xuwei-k/fix-screpl 
fix #3591. "Not a valid key: console-quick"
 2017-11-23 09:58:36 +00:00
Dale Wijnand d45f817b71
Merge pull request #3763 from xuwei-k/Completions-strict 
make strict some methods in Completions
 2017-11-23 09:56:04 +00:00
xuwei-k b8086e0768 make strict some methods in Completions 2017-11-23 15:21:02 +09:00
xuwei-k 8ee413778a fix #3591. "Not a valid key: console-quick" 2017-11-23 14:56:52 +09:00
Eugene Yokota 282b0f7f51 Split compiler bridge tests to another subproject 
Splitting compiler bridge tests to another subproject because while the bridge itself can be compiled with just compiler-interface, util-interface, and Scala Compiler as dependencies, the testing introduces more (such as IO). This creates problem for new Scala versions where IO or test libraries do not exist yet (e.g. Scala 2.13.0-M2).

This also removes the Mima test due to the lack of 2.13 bridge for Zinc 1.0.0.
Compiler bridge just needs to compile itself against the interface and Scala compiler, so there's no need to run Mima test.
 2017-11-21 11:52:03 -05:00
Martin Duhem 238540d34a
Remove 2 useless files in protocol 
They have been moved to Contraband since, but never removed.
 2017-11-21 10:46:57 +01:00
Dale Wijnand 17762947e4
Merge pull request #3744 from cunei/wip-port-zinc-pr-441 
Port of sbt/zinc#441 to sbt/sbt 1.0.x
 2017-11-16 16:29:15 +00:00
Antonio Cunei 43a976d42c Port of sbt/zinc#441 to sbt/sbt 1.0.x 2017-11-16 15:15:21 +01:00
Dale Wijnand 8fe38d4a5a
Merge pull request #3743 from cunei/wip-flakyTests1 
Workaround for scala/bug#10605
 2017-11-16 10:58:53 +00:00
Antonio Cunei a050b73a46 Workaround for scala/bug#10605 
templateStats() is not thread-safe in 2.12.x (at least up to 2.12.4)
 2017-11-15 05:27:31 +01:00
Alexey Alekhin 8fe1934ea0 Tweaked MessageType.fromLevelString conversion 2017-11-14 21:53:57 +01:00
Alexey Alekhin 0c0e0ce912 Log StringEvents and MessageEvents to the LSP client 2017-11-14 21:53:29 +01:00
Alexey Alekhin 6b6047b55c Publish ExecStatusEvent taking into account its channel name 2017-11-14 21:53:15 +01:00
Dale Wijnand bf4f4a5d87
Merge pull request #132 from leonardehrenfried/disable-location 
Disable ivy log4j caller location calculation
 2017-11-09 08:46:27 +00:00
Leonard Ehrenfried c1966b688d
Also upgrade versions in .travis.yml 2017-11-08 21:36:11 +01:00
Leonard Ehrenfried 3cc56ad0ba
Add performance test 2017-11-08 21:36:11 +01:00
Leonard Ehrenfried 48f9cf3be6
Disable calculation of log4j caller location information 2017-11-08 21:36:11 +01:00
Leonard Ehrenfried c0c186580a
Upgrade scala and dependency versions 2017-11-08 21:36:11 +01:00
Dale Wijnand c3f9cf800e
Merge pull request #3719 from eed3si9n/wip/launcher 
Bump launcher to 1.0.2
 2017-11-08 10:28:52 +00:00
Dale Wijnand f380de79f4
Merge pull request #3720 from eed3si9n/wip/3680 
Improve testQuick performance, restoring caching of stamps
 2017-11-08 08:50:26 +00:00
OlegYch 6e29a1aa15 Improve testQuick performance, restoring caching of stamps 2017-11-07 22:56:05 -05:00
Eugene Yokota afe9757da0 Bump launcher to 1.0.2 
Fixes #3676
 2017-11-07 22:54:05 -05:00
Dale Wijnand 8b1cab04c6
Merge pull request #3699 from saniyatech/fix-3693 
Removes reference to version 0.14.0 from a warning message
 2017-11-07 08:27:21 +00:00
eugene yokota ee4dcee7cf
Merge pull request #3717 from cunei/wip-3655 
Do not always use Level.Debug while creating a backgroundLog
 2017-11-06 13:08:21 -05:00
Antonio Cunei 1ca266d0f8 Do not always use Level.Debug while creating a backgroundLog 
The creation of a backgroundLog was always using Debug as the
logging level for console and backing. This commit sets the
levels to those used by the caller. Fixes #3655
 2017-11-06 15:33:05 +01:00
Saniya Tech b5e05e1fc1
Merge branch '1.x' into fix-3693 2017-11-04 09:52:35 -04:00
Dale Wijnand 9232a8fbc8
Merge pull request #3671 from miklos-martin/1.x 
Add nameOption to the Command trait
 2017-11-03 08:33:52 +00:00
Miklos Martin 1f89e3dc02 move nameOption to the trait 2017-11-03 06:39:53 +01:00
Miklos Martin 951c78a4d7 better naming + value class 2017-11-03 06:39:53 +01:00
Miklos Martin 79e75f02e5 add newline 2017-11-03 06:39:53 +01:00
Miklos Martin 8dacb72f9d Fixes #3297 and #3531 
Add commandName as an extension method in Command
 2017-11-03 06:39:53 +01:00
Saniya Tech 8757a4c6ac Removes reference to version 0.14.0 from a warning message 2017-10-31 17:09:20 -04:00
eugene yokota 12c2e9b8e7
Merge pull request #3689 from OlegYch/fix-npm 
Don't fail loading the build if npm is missing or we are on Windows
 2017-10-30 18:12:46 -04:00
OlegYch f761dab63e Don't fail loading the build if npm is missing or we are on Windows 2017-10-29 16:37:53 +03:00
Dale Wijnand bb6d8d62ec
Merge pull request #3672 from RomanIakovlev/1.x 
Add new setting to determine if running in CI env
 2017-10-28 00:28:44 +01:00
Dale Wijnand 4527029584
Merge pull request #3673 from RomanIakovlev/sbt_1055 
Add a check for a change in SBT version before reload
 2017-10-28 00:24:44 +01:00