Commit Graph

6239 Commits

Author SHA1 Message Date
eugene yokota ca67035677
Merge pull request #4135 from eed3si9n/wip/vscode_fix
Fix VS Code extension startup
2018-05-02 11:22:06 -04:00
Dale Wijnand 464a55be3a
Merge pull request #4137 from eed3si9n/wip/servertest2
Uncomment server customization in test
2018-05-02 16:19:45 +01:00
Eugene Yokota a2f70342df Uncomment server customization 2018-05-02 01:09:30 -04:00
Eugene Yokota 136dcb16d9 Fix VS Code extension startup
The change contributed in https://github.com/sbt/sbt/pull/4130 to start sbt within VS Code looked ok at first, but when I published the extension and started using it, I realized that it's a bit broken.
Basically there's no cleanup logic (that I could find), so simply closing VS Code would leave `project/target/active.json` behind, which lets VS Code extension to attempt connection, and it fails because there's no server running. To workaround this, I'll attempt to connect to the socket to confirm sbt server is up.
2018-04-30 22:50:23 -04:00
eugene yokota 36c3215320
Merge pull request #4131 from eed3si9n/wip/merge-1.1.x
Merge 1.1.x
2018-04-30 16:51:34 -04:00
Eugene Yokota 70d8275e59 Merge branch '1.1.x' into wip/merge-1.1.x 2018-04-29 14:34:22 -04:00
Eugene Yokota 28e90ea09b Merge branch '1.1.x' into wip/merge-1.1.x 2018-04-29 14:31:30 -04:00
eugene yokota df0a3c2dc5
Merge pull request #4130 from eed3si9n/wip/vscode
start sbt in VS Code terminal window
2018-04-29 13:23:49 -04:00
Robert Walker 4086f6c85b start sbt in VS Code terminal window 2018-04-28 19:50:40 -04:00
Eugene Yokota e726964809 Bump npm modules for VS Code extension 2018-04-27 19:59:56 -04:00
eugene yokota 851ce6ed83
Merge pull request #4090 from eed3si9n/wip/unused-task
Fixes linter that detects missing .value
2018-04-26 12:25:09 -04:00
eugene yokota 812da7abe9
Merge pull request #4124 from eed3si9n/wip/remove-deprecated
Remove deprecated commands -, --, and ---
2018-04-26 12:24:32 -04:00
Dale Wijnand 3a4bc8dc0b
Dropped deprecated "compat" commands & strings
Fixes #4089
2018-04-26 14:04:05 +01:00
Eugene Yokota d90f273420 Remove deprecated commands -, --, and ---
86ae3c8c59 deprecated -, --, and ---.
This removes the deprecated commands.
2018-04-26 05:02:21 -04:00
Eugene Yokota 06d7be0365 handle X / y 2018-04-26 04:44:12 -04:00
Dale Wijnand bf8df381f5
Merge pull request #4123 from eed3si9n/wip/repl
Re-fix console and JLine bug
2018-04-26 07:00:21 +01:00
Eugene Yokota a798c4adff Re-fix console and JLine bug
Fixes #3482 take 3

There are two bugs related REPL and JLine.
1. JLine getting disabled (up arrow not working) on the second run of `console` task.
2. Typed characters not showing up even on the `console` task.

The first issue was fixed by #4054 which added `t.init`. When I noticed the second problem, I fixed it in #4082 (adds `t.restore`) but undid the first fix. This attempts to fix both the issues.
2018-04-25 16:55:26 -04:00
Eugene Yokota 334789c919 1.1.5-SNAPSHOT 2018-04-25 16:15:19 -04:00
eugene yokota cab740dbdf
Merge pull request #4122 from dwijnand/contributing-publishing-nightlies
Document nightlies in CONTRIBUTING
2018-04-25 14:22:40 -04:00
Dale Wijnand c2c46a60fe
Document nightlies in CONTRIBUTING 2018-04-25 19:19:25 +01:00
eugene yokota 1f7bf0dc82
Merge pull request #4120 from dwijnand/contributing-sbtOn
Document sbtOn in CONTRIBUTING.md
2018-04-25 13:23:16 -04:00
eugene yokota 72556b28c7
Merge pull request #4119 from dwijnand/cleanup/contributing
Cleanup CONTRIBUTING.md
2018-04-25 13:22:21 -04:00
Dale Wijnand 952858e68b
Restore references to CONTRIBUTING, with checkbox 2018-04-25 17:08:41 +01:00
Dale Wijnand 8f76c48e63
Document sbtOn in CONTRIBUTING.md 2018-04-25 15:08:29 +01:00
Dale Wijnand 932ee5dc6a
Split support into SUPPORT.md
See https://help.github.com/articles/adding-support-resources-to-your-project/
2018-04-25 14:55:09 +01:00
Dale Wijnand 702ff1f516
Tweak Publishing VS Code Extensions 2018-04-25 14:51:19 +01:00
Dale Wijnand 2a4406717c
Move PROFILING out of CONTRIBUTING 2018-04-25 14:50:17 +01:00
Dale Wijnand 76a621b996
Not all PRs need notes 2018-04-25 14:50:17 +01:00
Dale Wijnand d7f66b0c00
Shuffle a part of issue reporting in CONTRIBUTING 2018-04-25 14:31:32 +01:00
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
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
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 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
Dale Wijnand ccf938c786
Switch to varargs inThisBuild (+friends) 2018-04-19 22:34:52 +01:00