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

5500 Commits

Author SHA1 Message Date
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 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
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
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
Eugene Yokota c72ca77c29 Fixes source-dependencies/trait-member-modified 2017-07-16 17:41:46 -04:00
Eugene Yokota c279995cdd Fixes source-dependencies / transitive-memberRef 2017-07-16 17:38:58 -04:00
Eugene Yokota baadd76544 Fixes project/extra 2017-07-16 17:30:20 -04:00
Eugene Yokota cc090344d9 Fixes project/auto-plugins 2017-07-16 17:22:33 -04:00
Eugene Yokota 96b5c3bb45 Disable compiler-project/macro-config 2017-07-16 17:08:02 -04:00
Eugene Yokota 5432756547 Fixes dependency-management/pom-scope 2017-07-16 17:05:46 -04:00
Eugene Yokota 1903f8c8b9 Fixes dependency-management/exclude-dependencies 2017-07-16 17:01:42 -04:00
Eugene Yokota 24ea928598 Fixes dependency-management/cached-resolution-classifier 2017-07-16 16:56:09 -04:00
Eugene Yokota bf4901f9ef Some helpful changes for update caching 
There's a bug in sbt/util#93
 2017-07-16 16:45:08 -04:00
Eugene Yokota 6a13287dba Merge branch 'wip/cached-update' into wip/integration 2017-07-16 16:12:06 -04:00
Eugene Yokota 2608009214 Fixes dependency-management/make-pom 2017-07-16 15:41:51 -04:00
Eugene Yokota d8929ae135 Fixes dependency-management/pom-advanced 2017-07-16 15:33:35 -04:00
Eugene Yokota 4e380d6055 Fixes dependency-management/cached-resolution-conflicts 2017-07-16 15:29:21 -04:00
Eugene Yokota ae93e6cb47 Mark compiler-project/macro-config pending 2017-07-16 15:21:44 -04:00
Eugene Yokota 170685f4e1 Fixes dependency-management/update-sbt-classifiers 2017-07-16 15:12:47 -04:00
Eugene Yokota 6107242c24 Fixes compiler-project/semantic-errors 2017-07-16 14:43:31 -04:00
Eugene Yokota e1dc83cf08 Fixes compiler-project/macro-config 2017-07-16 14:31:58 -04:00
Eugene Yokota 12ae6e66ff Fixes compiler-project/error-in-invalidated 2017-07-16 14:16:08 -04:00
Eugene Yokota fa67110143 Fixes compiler-project/separate-analysis-per-scala 2017-07-16 14:12:45 -04:00
Eugene Yokota a7bb39d3cb notes 2017-07-16 14:07:59 -04:00
Eugene Yokota 99be5b25f4 Roll back Vector changes in Keys.scala 
Keys should Seq type since it's fairly common to use List in build.sbt, and it would cause annoying build changes.
Fixes actions/cross
 2017-07-16 13:58:51 -04:00
Eugene Yokota b4e4a48208 Fixes actions/external-doc 2017-07-16 10:19:42 -04:00
Eugene Yokota f0ac6ae11c Adjust to upstream changes 2017-07-16 00:51:49 -04:00
Martin Duhem 347914191a Adapt to new library management API 2017-07-15 18:09:40 -04:00