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

11969 Commits

Author SHA1 Message Date
eugene yokota 051d0e5673 Merge pull request #107 from dwijnand/mima 
Upgrade to mima 0.1.15 & exclude a false positive
 2017-07-26 11:10:59 -04:00
eugene yokota c9f9f5ca3c Merge pull request #3349 from dwijnand/mima 
Add, configure & enable MiMa
 2017-07-26 10:20:49 -04:00
Dale Wijnand c103950b10
Add, configure & enable MiMa 2017-07-26 14:14:04 +01:00
Dale Wijnand 96b9d27c73
Upgrade to mima 0.1.15 & exclude a false positive 2017-07-26 10:52:35 +01:00
Dale Wijnand 3a14bd8094 Merge pull request #3367 from eed3si9n/wip/keys 
Unify to camel cased setting key
 2017-07-26 09:07:05 +01:00
Dale Wijnand cc69023585 Merge pull request #172 from retronym/ticket/170-java-version-sed 
Fix java version detection in bash script
 2017-07-26 09:06:33 +01:00
Dale Wijnand 3104ae0d57 Merge pull request #106 from eed3si9n/wip/stacktrace 
Fix ConsoleAppender to show full stack trace
 2017-07-26 09:01:11 +01:00
Dale Wijnand aefbbae6ec Merge pull request #105 from eed3si9n/wip/success 
Use event logging to send success
 2017-07-26 08:52:33 +01:00
Jason Zaugg c487e3166e Fix java version detection in bash script 
`java -version` can include an extra line of output
if `_JAVA_OPTTIONS` is set.

This commit adds a grep step before sed to harden
against this possibility.

Before:
```
⚡ (export _JAVA_OPTIONS=-Dfoo.bar; java -version 2>&1 | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
Picked up _JAVA_OPTIONS: -Dfoo.bar
```

After:
```
⚡ (export _JAVA_OPTIONS=-Dfoo.bar; java -version 2>&1 | grep ' version "' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
1.8
```
 2017-07-26 14:57:58 +10:00
Eugene Yokota 930489eba3 Fix ConsoleAppender to show full stack trace 
This is modification of crash log event logging that was added in sbt/util#85.

Instead of using the hardcoded 0 as the default value, this introduces `setTrace(..)` to `ConsoleAppender` like `BasicLogger`. Also the default value is set to `Int.MaxValue` that will display the full stack trace.

Fixes sbt/sbt#3343
 2017-07-26 00:03:07 -04:00
Eugene Yokota 5183f7ef81 Use event logging to send success 
Fixes sbt/sbt#3213
 2017-07-25 16:16:21 -04:00
eugene yokota 996b760a9e Merge pull request #3365 from sbt/wip/terminalwidth 
InteractionService#terminalWidth
 2017-07-25 05:16:08 -04:00
Dale Wijnand 4b57f852b1 Merge pull request #104 from eed3si9n/wip/logging 
Filter out color in CosoleAppender only
 2017-07-25 09:06:56 +01:00
Eugene Yokota b27ff9ace7 Unify to camel cased setting key 
Fixes #3146
 2017-07-25 03:06:17 -04:00
Dale Wijnand 57b34f56d2 Merge pull request #3364 from sbt/wip/newfix 
Fix new command
 2017-07-25 07:52:50 +01:00
Eugene Yokota 467617a4b9 Implement withRank 2017-07-25 01:50:53 -04:00
Eugene Yokota d796084ff4 Filter out color in CosoleAppender only 
Fixes sbt/sbt#3348
Ref #101

The new logger, based on log4j separates the concern of the log producer (Logger) and the handlers that takes actions (Appender, e.g for displaying on Console). As such filtering of color should be performed only in the ConsoleAppender.
 2017-07-24 23:54:25 -04:00
Eugene Yokota f6370063f4 Deprecate ansiCodesSupported from the logger 2017-07-24 23:20:05 -04:00
eugene yokota df18d79987 Merge pull request #101 from liff/issue/3336 
Delegate ansiCodesSupported to ConsoleAppender
 2017-07-24 22:57:06 -04:00
Eugene Yokota f96c8b9668 InteractionService#terminalWidth 
Adds `def terminalWidth: Int` to InteractionService to wrap JLine 2 (or 3 in the future).

Fixes #3352
 2017-07-24 22:44:18 -04:00
Eugene Yokota a68372fd52 Fix new command 
This was caused by bad porting of lm API usage.

Fixes #3355
 2017-07-24 22:23:37 -04:00
eugene yokota ac7b1498a9 Merge pull request #3363 from sbt/fport/3329 
[fport] Make scripted support sbt 1.0.0-RC1 or later
 2017-07-24 22:20:36 -04:00
Dale Wijnand 696aacb31f Make scripted support sbt 1.0.0-RC1 or later 
Fixes #3325
 2017-07-24 21:18:13 -04:00
eugene yokota 26954994e2 Merge pull request #3362 from sbt/fport/3356 
[fport] Override current project's scalaVersion on ^^
 2017-07-24 20:16:40 -04:00
Eugene Yokota 2c4e78f414 Override current project's scalaVersion on ^^ 
Both the default settings and ^^ together sets the correct scalaVersion based on `sbtVersion in pluginCrossBuild`, but frequently people set up `scalaVersion` on sbt plugin's subproject, which disables the feature.
This change appends the scalaVersionSetting on ^^ so scalaVersion gets switched to 2.12.2 on ^^ 1.0.0-RC2 etc.

Fixes #3205
 2017-07-24 18:45:37 -04:00
eugene yokota 82a8ca87e1 Merge pull request #3358 from sbt/wip/linereader 
Keep ConsoleChannel open
 2017-07-24 13:47:07 -04:00
Dale Wijnand 2bb2cfd10e Merge pull request #103 from dwijnand/mima 
Add, configure & enable MiMa
 2017-07-24 15:56:10 +01:00
Dale Wijnand 80e8abc22d Merge pull request #169 from dragos/patch-1 
Read last line of config files without EOL
 2017-07-24 15:29:34 +01:00
Dale Wijnand d6803f0645 Merge pull request #3351 from Duhemm/wip/fix-3299 
Allow `.value` on SettingKey inside ifs & lambdas
 2017-07-24 07:42:58 +01:00
Eugene Yokota a58b1ebce0 Keep ConsoleChannel open 
Fixes #3282

For now, don't try to shutdown ConsoleChannel while the network is processing the command in the background.
 2017-07-22 03:35:42 -04:00
Eugene Yokota 7b2b7d696b Don't wrap InputStream for Windows 
Ref #3282

We used to wrap InputStream so it will inject Thread.sleep, which then allows the thread to be cancelled, emulating a non-blocking readLine. This trick doesn't seem to work for Windows.
For non-Cygwin, actually just removing the wrapping does the job, but I couldn't get it to work for Cygwin.

To test, run some command via network, and then type `show name` into the terminal. On Cygwin, it will not respond.
 2017-07-22 03:34:10 -04:00
eugene yokota acb0b696ce Merge pull request #3354 from xuwei-k/lightbend 
s/Typesafe subscriptions/Lightbend subscriptions
 2017-07-21 19:07:49 -04:00
xuwei-k ba37d568f8 s/Typesafe subscriptions/Lightbend subscriptions 2017-07-22 07:14:42 +09:00
Martin Duhem 9dfe1a8406
Allow `.value` on SettingKey inside ifs & lambdas 
Calling `.value` on a SettingKey doesn't trigger any execution and
doesn't have any side effect, so we can safely allow calls to `.value`
inside conditionals and lambdas.

Fixes #3299
 2017-07-21 16:26:45 +02:00
Dale Wijnand da9084b2d8
Add, configure & enable MiMa 2017-07-21 09:26:35 +01:00
eugene yokota 4f42e2aa50 Merge pull request #3346 from dwijnand/imports 
Add missing aliases in Imports
 2017-07-20 11:37:04 -04:00
eugene yokota 1b68c909c6 Merge pull request #3345 from dwijnand/rm-Seq2Vector 
Un-implicit & deprecated Seq2Vector
 2017-07-20 11:18:58 -04:00
Dale Wijnand f821ddb6de
Add missing aliases in Imports 
Fixes #3341
 2017-07-20 11:37:05 +01:00
Dale Wijnand be1b4897e9
Un-implicit & deprecated Seq2Vector 2017-07-20 11:29:55 +01:00
Dale Wijnand a068736836 Merge pull request #3342 from sbt/wip/sbt1 
sbt 1.0.0-RC2
 2017-07-20 10:36:48 +01:00
Eugene Yokota b2220fe9d4
sbt 1.0.0-RC2 2017-07-20 06:56:37 +01:00
Dale Wijnand 7d91a25608 Merge pull request #102 from eed3si9n/wip/sbt1 
sbt 1.0.0-RC2
 2017-07-20 06:44:00 +01:00
Eugene Yokota 855638243a sbt 1.0.0-RC2 2017-07-19 21:36:11 -04:00
Olli Helenius a38d3d6c69 Delegate ansiCodesSupported to ConsoleAppender 
Fixes sbt/sbt#3336.
 2017-07-18 19:57:57 +03:00
Martin Duhem d267ec487a Show `actual` as potential option of `inspect` 2017-07-18 12:02:02 +02:00
Dale Wijnand 7b02a40b5e Merge pull request #100 from Duhemm/re-fix-consoleappender 
Re-fix ConsoleAppender
 2017-07-17 16:09:48 +01:00
Martin Duhem ddcc909195 Re-fix ConsoleAppender 
It turns out that calling `print` on `ConsoleOut` doesn't flush the
output. Remove `writeLine` and let `write` directly use `println`.
 2017-07-17 14:36:03 +02:00
Dale Wijnand 81277cbf62 Merge pull request #99 from dwijnand/prereset 
Add a RESET at the front of the appendLog line
 2017-07-17 10:55:39 +01:00
Dale Wijnand 2d7ec47b13 Merge pull request #3324 from sbt/wip/contraband 
Bump Contraband to latest
 2017-07-17 10:51:29 +01:00
Dale Wijnand c07e4c740c Merge pull request #98 from Duhemm/fix-consoleappender 
Fix logger printing too many newlines
 2017-07-17 10:45:42 +01:00