Commit Graph

5729 Commits

Author SHA1 Message Date
eugene yokota d5e1de08aa Merge pull request #3662 from dwijnand/scalafmt
Scalafmt 1.3, sbt-scalafmt 1.14
2017-10-25 00:19:47 -04:00
Dale Wijnand 81c5eaec33 Merge pull request #3633 from dwijnand/misc-2017-10-12
Misc 2017-10-12
2017-10-24 20:37:20 +01:00
Dale Wijnand e0d8079083
Scalafmt 1.3, sbt-scalafmt 1.14 2017-10-24 12:23:37 +01:00
Eugene Yokota bcd21ba9b6 Merge branch 'wip/3648' into 1.x 2017-10-20 23:58:39 -05:00
eugene yokota 294a12fbf1 Merge pull request #3654 from scalacenter/json-locks
Add vscode-sbt-scala json locks
2017-10-20 17:19:45 -05:00
jvican 41a058c9b9
Add vscode-sbt-scala json locks
This is what gets generated after `compile`.
2017-10-20 20:05:16 +02:00
Simon Schäfer ebac491501 Disable patvars warnings
There are simply too many unused pattern vars and I don't want to fix
them right now. And watching all of the warnings everywhere is annoying.
2017-10-19 13:07:24 +02:00
Simon Schäfer 93e08b7ee7 Fix warnings about unused pattern vars in various projects 2017-10-19 13:07:24 +02:00
Simon Schäfer 187a861194 Fix unused pattern match vals in run project 2017-10-19 13:07:24 +02:00
Simon Schäfer ede94cb34c Fix unused pattern vals warnings in main-command project 2017-10-19 13:07:24 +02:00
Simon Schäfer 0454b873bf Fix warnings in protocol project
There were warnings about catch all exception handlers.
2017-10-19 13:07:24 +02:00
Simon Schäfer dc5411836a Fix warnings in util-copmlete project
There were warnings because of
- unused pattern match values
- deprecations
- unused methods (`def unary_-` and `def -`)
2017-10-19 13:07:24 +02:00
Simon Schäfer 38f550deef Fix warnings in util-collection project
There were warnings because of
- unused pattern match values
- deprecations
- a Xlint bug in scalac
2017-10-19 13:07:24 +02:00
Simon Schäfer 30d59d356d Disable warnings for unused params and implicits
There are many warnings because unused parameter are everywhere.
2017-10-19 13:07:24 +02:00
Dale Wijnand 4ce4fb72bd Merge pull request #3635 from PanAeon/escape-sbt-file-imports
Escape imports from sbt files
2017-10-13 16:17:21 +01:00
PanAeon 64241e0d3a Fixes #3464. Escape imports from sbt files, so if user creates a backquoted definition then task evalution will not fail. 2017-10-13 11:04:15 +01:00
Dale Wijnand 86be5359e7
Initial scaladoc Initialize/Keyed/KeyedInitialize 2017-10-12 20:31:25 +01:00
Dale Wijnand 10397926aa
Make sure of EvaluateTask in Extracted obvious 2017-10-12 15:36:05 +01:00
eugene yokota fa33b6e422 Merge pull request #3632 from dwijnand/trailing-println
Kill trailing println
2017-10-11 13:38:09 -04:00
Dale Wijnand d8e52bb5d4
Kill trailing println 2017-10-11 15:29:15 +01:00
eugene yokota fd20d3039a Merge pull request #3629 from sbt/1.0.x
Merge 1.0.x
2017-10-10 12:32:10 -04:00
eugene yokota 8c04b267bf Merge branch '1.x' into 1.0.x 2017-10-10 10:57:05 -04:00
Dale Wijnand 85af599b52 Merge pull request #3626 from eed3si9n/bport/3597
[1.0.x] Add system property to revert to old polling fs watcher
2017-10-10 11:36:13 +01:00
Michael Stringer b9a4d32916 Add system property to revert to old polling fs watcher
This adds a sbt.watch.mode system property that if set to 'polling' will
use PollingWatchService instead of WatchServiceAdapter (nio).

On macOS this will default to 'polling' and on all others 'nio'.

This is a temporary workaround for users affected by #3527
2017-10-10 01:17:42 -04:00
eugene yokota 8da85e9380 Merge pull request #3597 from sbt/workaround/3527
Add system property to revert to old polling fs watcher
2017-10-10 01:14:03 -04:00
Michael Stringer a3c34c6c0a
Add system property to revert to old polling fs watcher
This adds a sbt.watch.mode system property that if set to 'polling' will
use PollingWatchService instead of WatchServiceAdapter (nio).

On macOS this will default to 'polling' and on all others 'nio'.

This is a temporary workaround for users affected by #3527
2017-10-09 18:01:33 +01:00
Dale Wijnand 9ca909fe50 Merge pull request #3622 from dwijnand/slash-less-keys
Remove some duplication when only Scoped is required
2017-10-09 07:06:18 +01:00
Dale Wijnand 668ace98ee
Remove some duplication when only Scoped is required 2017-10-08 19:07:38 +01:00
eugene yokota 84dafd0bc0 Merge pull request #3620 from eed3si9n/wip/previous4
Remove thunk for slash syntax
2017-10-07 14:25:08 -04:00
eugene yokota 626cf634dc Merge pull request #4 from dwijnand/wip/previous4
Fix some minor errors
2017-10-07 13:44:27 -04:00
Dale Wijnand 5e0b080f51
Fix some minor errors 2017-10-07 18:42:26 +01:00
eugene yokota d9ab8659af Merge pull request #3 from dwijnand/wip/previous4
Add slash syntax for AttrKey that parity with "in" syntax
2017-10-07 13:24:57 -04:00
Dale Wijnand ef4828cfc2
Add slash syntax for AttrKey that parity with "in" syntax 2017-10-07 13:12:17 +01:00
Dale Wijnand d19c350687
Correct name of WithoutScope properties 2017-10-07 13:12:16 +01:00
Dale Wijnand 8af3110c00
Add .previous tests to SlashSyntaxTest 2017-10-07 13:12:16 +01:00
Dale Wijnand fb28c201c8
Make scoped keys more frequent 2017-10-07 13:12:16 +01:00
Dale Wijnand 74ac7d9e07
Drop redudant label in expectValue 2017-10-07 13:12:15 +01:00
Dale Wijnand 025075efd0
Dedup, cleanup & cover all key types 2017-10-07 13:12:15 +01:00
Dale Wijnand 165dc794ca
Extract gen{Input,Setting,Task}Key 2017-10-07 13:12:15 +01:00
Dale Wijnand 18d615701f
Remove WithScope wrapping 2017-10-07 13:12:15 +01:00
Dale Wijnand 0bcd7c3b6d
Remove boilerplate around sbtSlashSyntaxRichConfiguration 2017-10-07 12:08:32 +01:00
Dale Wijnand e5898111fe
Replace CanScope with Scoped.ScopingSetting 2017-10-07 12:07:19 +01:00
Eugene Yokota 2a6385fd94 Remove thunk for slash syntax
Ref #3606, #3611, and #3613

This removes unnecessary thunk for slash syntax.
The semantics using this approach is strictly better than the previous `in (ref, config, task)`. By removing the thunk, we retain `(a / b) / c == a / b / c`.

See the following example:

```scala
scala> import sbt._, Keys._
scala> val t: TaskKey[Unit] = (test in Test)
t: sbt.TaskKey[Unit] = TaskKey(This / Select(ConfigKey(test)) / This / test)

scala> ThisBuild / t
ThisBuild / t
res1: sbt.TaskKey[Unit] = TaskKey(Select(ThisBuild) / Select(ConfigKey(test)) / This / test)

scala> ThisBuild / t / name
ThisBuild / t / name
res2: sbt.SettingKey[String] = SettingKey(Select(ThisBuild) / Select(ConfigKey(test)) / Select(test) / name)
```

so far so good? Now look at this:

```
scala> scala> name in (ThisBuild, t)
name in (ThisBuild, t)
res3: sbt.SettingKey[String] = SettingKey(Select(ThisBuild) / This / Select(test) / name)
```

`Test` configuration knowledge is lost! For `in (..)` maybe it was ok because mostly we don't use unscoped keys, but that's the difference between `in (..)` and `/`.

Fixes #3605
2017-10-06 15:47:46 -04:00
eugene yokota 48a990b34f Merge pull request #3617 from dwijnand/slash-check
Add SlashSyntaxSpec to validate syntax parity
2017-10-06 13:24:20 -04:00
Dale Wijnand 5b03379693
Extract withScope 2017-10-06 17:41:06 +01:00
Dale Wijnand 9b526f54bf
Rarely include custom scopes in key generators 2017-10-06 15:41:28 +01:00
Dale Wijnand db87e4c871
Add SlashSyntaxSpec to validate syntax parity 2017-10-06 15:07:18 +01:00
Dale Wijnand 97ddc1ffb7
Copy the non-runtime parts of project/unified to SlashSyntaxTest 2017-10-06 15:07:17 +01:00
Dale Wijnand f22843f91c
Move SlashSyntax to the settings component 2017-10-06 09:52:34 +01:00
Dale Wijnand b546eb215e Merge pull request #3615 from cunei/wip-npm
Print npm output, handle exit code in case of errors
2017-10-06 08:41:31 +01:00