Commit Graph

11744 Commits

Author SHA1 Message Date
Dale Wijnand 701eda668b
typo in CONTRIBUTING 2018-04-25 14:31:32 +01:00
Dale Wijnand 2a12a7aeb9
Fix section headers in CONTRIBUTING 2018-04-25 14:31:32 +01:00
Dale Wijnand f7d6cec030
Drop the references to the contributing guidelines from templates
I believe GitHub does a better job displaying this prominently,
particularly for first time contributors.

We can always bring back the pull request template if we have new content.
2018-04-25 14:31:15 +01:00
Dale Wijnand 2f880c6b8f
Merge support/contrib info into support/issues+prs sections of CONTRIBUTING 2018-04-25 14:13:12 +01:00
Dale Wijnand 8db585d62a
Refer to sbt/website instead of "the website project" in CONTRIBUTING 2018-04-25 14:12:17 +01:00
Dale Wijnand 564bbeab54
Merge pull request #4044 from dwijnand/cleanup/Resolve
Cleanup Resolve
2018-04-24 22:18:39 +01:00
Dale Wijnand 5f3b8c561c
Merge pull request #4064 from dwijnand/cleanup/formatting
Cleanup code formatting
2018-04-24 22:18:24 +01:00
Dale Wijnand a0e27c719c
Cleanup Resolve 2018-04-24 16:30:56 +01:00
Dale Wijnand ebe5540226
Reformat some corner cases 2018-04-24 16:12:18 +01:00
Dale Wijnand 8f4b8abb7b
Run scalafmt & test:scalafmt 2018-04-24 16:12:10 +01:00
Dale Wijnand aac916b119
Improve code clarity with danglingParentheses = true 2018-04-24 16:09:49 +01:00
Dale Wijnand cf1f65612a
Don't align args or params by the opening parens 2018-04-24 16:09:49 +01:00
Dale Wijnand 490f57c779
Upgrade to sbt-scalafmt 1.15 & scalafmt 1.4.0 2018-04-24 16:09:48 +01:00
Dale Wijnand 5bf1be1202
Merge pull request #4115 from dwijnand/cleanup/drop-negate-params-in-scalac-opts
Drop -Ywarn-unused:-params
2018-04-24 13:53:07 +01:00
Dale Wijnand c0756e14d9
Merge pull request #4114 from OlegYch/fix-4112
Remove usage of DynamicVariable and fix memory leak, fixes #4112
2018-04-24 09:53:39 +01:00
Dale Wijnand 065b65a05e
Drop -Ywarn-unused:-params
Previously we'd get in the build logs:

    [error] params cannot be negated, it enables other arguments

and lots of wawrnings.

Now we just get lots of warnings without the non-fatal error message.
2018-04-24 07:29:49 +01:00
eugene yokota 3ff2cc006f
Merge pull request #227 from spangaer/master
Java version detection broken on windows
2018-04-23 17:10:15 -04:00
eugene yokota ed452f0057
Merge branch 'master' into master 2018-04-23 16:14:58 -04:00
OlegYch eeeb4c9ff2 Remove usage of DynamicVariable and fix memory leak, fixes https://github.com/sbt/sbt/issues/4112 2018-04-23 20:46:08 +03:00
Ethan Atkins 754385125a Use new EventMonitor in executeContinuously
In https://github.com/sbt/io/pull/142, I add a new api for watching for
source file events. This commit updates sbt to use the new EventMonitor
based api. The EventMonitor has an anti-entropy parameter, so that
multiple events on the same file in a short window of time do not
trigger a build. I add a key to tune it.

The implementation of executeContinuously is pretty similar. The main
changes are that shouldTerminate now blocks (EventMonitor spins up a
thread to check the termination condition) and that the
EventMonitor.watch method only returns a Boolean. This is because
the event monitor contains mutable state. It does, however, have a
state() method that returns an immutable snapshot of the state.
2018-04-23 10:02:29 -07:00
Ethan Atkins 8c6f71a180 Bump io
My next commit replaces the implementation of
Watched.executeContinuously using apis that are available only in a
pending io pull request (https://github.com/sbt/io/pull/142).
2018-04-23 10:02:29 -07:00
Dale Wijnand a2af3bff15
Merge pull request #4098 from eatkins/filter
Exclude directories instead of including files
2018-04-23 08:15:11 +01:00
Dale Wijnand cd7eb95728
Merge pull request #4093 from laughedelic/unexpected-responses
WIP: Fix unexpected responses from the server
2018-04-23 08:02:30 +01:00
Dale Wijnand c525dd1b0a
Merge pull request #228 from jessicah/patch-1
sbt.bat: JAVACMD is not quoted in version check
2018-04-23 06:46:47 +01:00
Dale Wijnand 187c50c78d
Merge pull request #4106 from dwijnand/overload-varargs-sorta
Switch inThisBuild (+friends) to use varargs SettingsDefinition
2018-04-20 16:11:29 +01:00
Jessica Hamilton 6ffec60e4b
sbt.bat: JAVACMD is not quoted in version check
This fixes a failed version check for a path containing spaces.
2018-04-20 11:07:23 +12:00
Dale Wijnand ccf938c786
Switch to varargs inThisBuild (+friends) 2018-04-19 22:34:52 +01:00
Dale Wijnand f459b218c4
Switch inThisBuild (+friends) to use varargs SettingsDefinition 2018-04-19 22:34:32 +01:00
Dale Wijnand dfff1ed928
Merge pull request #4032 from eed3si9n/wip/servertest
improve server testing
2018-04-18 07:12:53 +02:00
Eugene Yokota 1ec07c1867 Recover sbtOn 2018-04-17 23:26:29 +02:00
Ethan Atkins 2bb717dbf9 Exclude directories instead of including files
The existing filter caused SourceModificationWatch.watch to ignore
deleted files because !file.exists implies !file.isFile. The intention
of the filter was to exclude directories that had a name ending in
".scala".
2018-04-13 11:36:40 -07:00
Alexey Alekhin a1e3146c08
Don't use initialize request id for the internal collectAnalyses call 2018-04-12 19:47:32 +02:00
Johannes Rudolph 3b1207e9c2
Merge pull request #151 from leifwickland/patch-1
Fix minor typo
2018-04-11 17:09:47 +02:00
Dale Wijnand a8c1239e32
Merge pull request #4058 from retronym/topic/quietly-cancel
Avoid printing RejectedExectionExeption stack trace after cancellation
2018-04-11 12:00:03 +01:00
Dale Wijnand 2e2c3f6e89
Merge pull request #4087 from hvesalai/patch-2
Update to Jline 2.14.6
2018-04-11 11:55:56 +01:00
Eugene Yokota 190dc23f70 Fixes linter that detects missing .value
Fixes #4079

#3216 introduced a linter that checks against missing `.value`, but the tree only checked for `Ident`. This doesn't work because in reality the symbols of build.sbt are transformed to `$somehash.npmInstallTask` where `somehash` is the wrapper object we create. Similarly for the built-in keys, they are presented as `sbt.Keys.compile`.

With this change unused task will fail to load the build with the following message:

```
/sbt-4079/build.sbt:26: error: The key `compile` is not being invoked inside the task definition.

Problem: Keys missing `.value` are not initialized and their dependency is not registered.

Solution: Replace `compile` by `compile.value` or remove it if unused.

  compile
  ^
/sbt-4079/build.sbt:27: error: The key `npmInstallTask` is not being invoked inside the task definition.

Problem: Keys missing `.value` are not initialized and their dependency is not registered.

Solution: Replace `npmInstallTask` by `npmInstallTask.value` or remove it if unused.

  npmInstallTask
  ^
```
2018-04-11 01:31:38 -04:00
Heikki Vesalainen e5a37cad42
Update to Jline 2.14.6
This version of Jline fixes three things for Emacs users:
- ANSI colors are now enabled for Emacs.
- Terminal echo is now disabled for Emacs.
- History is enabled for all dump terminals.
2018-04-11 00:10:56 +03:00
Leif Wickland 6f4dfaa45e
Fix minor typo. 2018-04-10 10:22:48 -06:00
Jean-Luc Deprez d70c78d02b
- Java version detection broken, when path to JDK contains spaces.
Allways outputs:
    sbt requires at least version 6+, you have
    version 0

- the quoted version word for findstr doesn't seem to work in the for-command statement, quotes not needed for a single word.
2018-04-10 16:12:28 +02:00
Dale Wijnand 54a6262f7f
Merge pull request #4041 from dwijnand/Scoped.equals
Give Scoped a default equals/hashCode implementation
2018-04-10 06:10:55 +01:00
eugene yokota 7ae83cc755
Merge pull request #4085 from eed3si9n/wip/bumpzinc
Zinc 1.1.5
2018-04-09 13:37:50 -04:00
Eugene Yokota b9eb7764f3 Zinc 1.1.5 2018-04-09 12:37:42 -04:00
Dale Wijnand 4fc45e0155
Merge pull request #4056 from BennyHill/fix/3042
Introduce CompositeProject
2018-04-09 11:30:17 +01:00
Dale Wijnand 98e2b0b5d3
Merge pull request #4082 from eed3si9n/wip/repl
Re-fixing console and JLine
2018-04-09 11:23:58 +01:00
Dale Wijnand 6718803ee6
Merge pull request #4080 from naferx/add-lastGrep
Add lastGrep command
2018-04-09 07:19:17 +01:00
Eugene Yokota 8ed796fb25 Re-fixing console and JLine
Fixes #3482 take 2

I thought I tested #4054 using a local build, but when I ran 1.1.3, `console` did not display anything that I typed.
Switching to `usingTerminal` which calls `terminal.restore` similar to what I had in 1.1.1 fixes `console`.
2018-04-09 00:11:17 -04:00
eugene yokota 4d7149a7f3
Merge pull request #4078 from retronym/bump/houserules
Upgrade to latest sbt-houserules
2018-04-08 14:33:04 -04:00
eugene yokota 435a1c47f5
Merge pull request #159 from retronym/bump/houserules
Upgrade to latest sbt-houserules
2018-04-08 14:32:02 -04:00
Nafer Sanabria 3e201cee4d Add lastGrep command 2018-04-08 10:56:25 -05:00
Jason Zaugg f2d3cfea3f Upgrade to latest sbt-houserules 2018-04-08 14:37:51 +10:00