Commit Graph

11744 Commits

Author SHA1 Message Date
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
Dale Wijnand 7d70f0966c
Merge pull request #199 from thatfulvioguy/use-expr-over-bc
Use expr instead of bc when checking Java versions.
2017-11-16 16:21:28 +00:00
Fulvio Valente 6ad16c2b74 Use expr instead of bc when checking Java versions.
Because expr is in coreutils, we can expect it to be present on systems unlike bc.

Fixes #198
Fixes #192
2017-11-16 15:11:19 +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 efdc7c90ca
Merge pull request #197 from mkurz/debugFix
Ignore debug output when getting runtime jar path
2017-11-16 11:09:17 +00:00
Dale Wijnand 096a0d83b2
Update sbt.build.version in CONTRIBUTING too. 2017-11-16 11:02:18 +00:00
Dale Wijnand 749a1b7f27
Merge pull request #196 from javabrett/add-travis-build-image
Updated README.md to add a Travis build status image, fixed Travis build
2017-11-16 11:01:46 +00: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
Brett Randall 8f276e95e0 Set compatible build properties, sbt version (1.0.3) to fix Travis build. Added required fakeroot package.
Fixed #180.
2017-11-15 11:38:53 -05:00
Matthias Kurz 006a5eee23
Ignore debug output when getting runtime jar path 2017-11-15 11:55:12 +01: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 320d993fa6
Merge pull request #195 from javabrett/refer-jdk-not-jre
Changed references to downloading/installing/updating Java (JRE?) to …
2017-11-13 11:50:02 +00:00
Brett Randall 602b138771
Updated README.md to add a Travis build status image 2017-11-12 16:15:58 -08:00
Brett Randall da02335261 Changed references to downloading/installing/updating Java (JRE?) to refer to JDK.
Updated download URLs. Fixed #115.
2017-11-10 19:48:05 +00: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
Dale Wijnand 30a5038b71
Merge pull request #191 from twm/bd-dep
Add bc dependency in Debian/Ubuntu package
2017-10-30 16:51:08 +00: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
Tom Most eb69920e81 Add bc dependency in Debian/Ubuntu package 2017-10-27 19:49:11 -07: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
Roman Iakovlev 69ae4f3073 Add a check for a change in SBT version before reload
Fixes #1055
2017-10-27 20:38:23 +02:00
eugene yokota af11219637 Merge pull request #3675 from eed3si9n/wip/1.0.3-notes
notes for 1.0.3
2017-10-27 01:59:33 -04:00
Eugene Yokota db79226c22 notes for 1.0.3 2017-10-26 22:39:35 -04:00
eugene yokota 89702ffaa7 Merge pull request #3674 from eed3si9n/wip/1.0.3
Bump modules
2017-10-26 22:03:35 -04:00
Eugene Yokota 84f03b64be Bump modules
Fixes #3519
Fixes #3586
Fixes #3569
Fixes #3573
2017-10-26 21:13:48 -04:00
eugene yokota cb79a4ae08 Merge pull request #3669 from cunei/wip-interim-3583
Interim fix for #3583, for 1.0.3
2017-10-26 18:23:12 -04:00
Roman Iakovlev 5f143434a8 Add new setting to determine if running in CI env
Fixes #3653
2017-10-26 20:59:04 +02:00
Dale Wijnand 7e1a904b95 Merge pull request #3650 from dwijnand/kind-projector
Add and use kind-projector
2017-10-26 09:42:55 +01:00