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

5624 Commits

Author SHA1 Message Date
eugene yokota 07879e26e1 Merge pull request #3385 from eed3si9n/wip/contraband2 
Bump modules, and use LM API
 2017-07-28 18:47:04 -04:00
eugene yokota b38dbc3618 Merge pull request #3380 from eed3si9n/wip/skipinpublish 
implement `skip in publish`
 2017-07-28 18:46:03 -04:00
Eugene Yokota d1a950868f Use LM API for cached update task 
Fixes sbt/sbt#3326
 2017-07-28 17:55:49 -04:00
Eugene Yokota 4d8d5f5df0 IO, Util, LM, Zinc 1.0.0-RC3 2017-07-28 15:45:59 -04:00
Eugene Yokota 0850df67e8 Contraband 0.3.0 2017-07-28 15:40:30 -04:00
Dale Wijnand 716203fefa Merge pull request #3383 from dwijnand/2123 
Upgrade to Scala 2.12.3
 2017-07-28 16:53:37 +01:00
eugene yokota 518a905d35 Merge pull request #3382 from eed3si9n/wip/slf4j 
Log4j 2 SLF4J Binding
 2017-07-28 03:45:40 -04:00
Dale Wijnand 56d7d400b0
Upgrade to Scala 2.12.3 2017-07-28 07:56:08 +01:00
Eugene Yokota 5768ad2468 Log4j 2 SLF4J Binding 
Fixes sbt/sbt#3333
 2017-07-28 01:00:47 -04:00
Eugene Yokota 5e8bbf8d0d implement `skip in publish` 
`skip in publish` when set to `true` will skip publish, publishLocal, and publishM2. (sbt-pgp already skips publishSigned).

Fixes sbt/sbt#3136
 2017-07-27 22:04:42 -04:00
Dale Wijnand 2b35107a02 Merge pull request #3376 from eed3si9n/fport/3370 
[fport] Fix ^^ and don't inject scalaVersion by default
 2017-07-27 07:11:46 +01:00
Eugene Yokota 9a26f7ba1c Fix ^^ and don't inject scalaVersion by default 
This no longer injects scalaVersion at the project level, which was interfering with crossScalaVersions delegation to ThisBuild scope.

Fixes sbt/sbt#3353
 2017-07-26 23:14:37 -04:00
Dale Wijnand 3eb9443856 Merge pull request #3335 from Duhemm/topic/inspect-help 
Show `actual` as potential option of `inspect`
 2017-07-26 16:34:26 +01: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 3a14bd8094 Merge pull request #3367 from eed3si9n/wip/keys 
Unify to camel cased setting key
 2017-07-26 09:07:05 +01:00
eugene yokota 996b760a9e Merge pull request #3365 from sbt/wip/terminalwidth 
InteractionService#terminalWidth
 2017-07-25 05:16:08 -04: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 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 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
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
Martin Duhem d267ec487a Show `actual` as potential option of `inspect` 2017-07-18 12:02:02 +02:00
Dale Wijnand 2d7ec47b13 Merge pull request #3324 from sbt/wip/contraband 
Bump Contraband to latest
 2017-07-17 10:51:29 +01:00
Eugene Yokota 8d159b87a2 Fix test 2017-07-17 02:14:17 -04:00
Eugene Yokota 00a9dd14a4 Bump Contraband to latest 2017-07-17 01:05:30 -04:00
eugene yokota 53b9ce2d71 Merge pull request #3323 from sbt/wip/notes 
notes
 2017-07-17 01:01:25 -04:00
Eugene Yokota 79394da920 notes 2017-07-17 01:00:57 -04:00
eugene yokota e6a70f9864 Merge pull request #3322 from sbt/wip/integration 
Bump all modules to latest
 2017-07-16 23:45:46 -04:00
Eugene Yokota c9fae43595 bump to Util 1.0.0-M28 and Zinc 1.0.0-X20 2017-07-16 22:16:33 -04:00
Eugene Yokota fda31ec5e7 Fixes dependency-management / extra 2017-07-16 20:05:19 -04:00
Eugene Yokota 9ccfbe462c Minor change to tests/serial 2017-07-16 17:53:33 -04:00
Eugene Yokota 2f8d7c2f7a Fixes tests/scala-instance-classloader 2017-07-16 17:50:23 -04:00