Commit Graph

6174 Commits

Author SHA1 Message Date
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 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
Dale Wijnand f459b218c4
Switch inThisBuild (+friends) to use varargs SettingsDefinition 2018-04-19 22:34:32 +01: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
Dale Wijnand 4fc45e0155
Merge pull request #4056 from BennyHill/fix/3042
Introduce CompositeProject
2018-04-09 11:30:17 +01:00
Dale Wijnand 6718803ee6
Merge pull request #4080 from naferx/add-lastGrep
Add lastGrep command
2018-04-09 07:19:17 +01:00
Nafer Sanabria 3e201cee4d Add lastGrep command 2018-04-08 10:56:25 -05:00
Alistair Johnson b0ad1a44c0 Remove projects parameter from CompositeProject.expand 2018-04-07 15:56:31 +02:00
Alistair Johnson 6cce4f6fd9 Remove duplicate Projects 2018-04-07 01:26:40 +02:00
Alistair Johnson 68c005e4b5 Ensure precedence of top level Projects over ComponentProjects 2018-04-07 01:04:45 +02:00
Alistair Johnson 03fc4ac686 Ensure unique project Id in composite projects 2018-04-04 21:01:05 +02:00
Alistair Johnson 77b536b25f Merge branch '1.x' of https://github.com/BennyHill/sbt into fix/3042
Conflicts:
	main/src/main/scala/sbt/internal/BuildDef.scala
	main/src/main/scala/sbt/internal/EvaluateConfigurations.scala
2018-04-04 18:30:56 +02:00
Dale Wijnand 3692db9068
Give Scoped a default equals/hashCode implementation 2018-04-04 15:04:53 +01:00
Dale Wijnand 218621b745
Merge pull request #4061 from eed3si9n/wip/perf
document profiling tools
2018-04-04 14:22:44 +01:00
Eugene Yokota 56ffac22b7 document profiling tools 2018-04-04 01:29:56 -04:00
eugene yokota eff17f4517
Merge pull request #4060 from dwijnand/cleanup/unused-tparam
Remove unused type param in Scaladoc
2018-04-03 19:10:05 -04:00
Dale Wijnand 120ab65134
Remove unused type param in Scaladoc 2018-04-03 17:15:27 +01:00
Dale Wijnand dfbb67e7d6
Merge pull request #4023 from dwijnand/reintroduce-Command.process
Re-introduce Command.process
2018-04-03 14:57:29 +01:00
Alistair Johnson 25bbc5f488 Add shadow tests for CompositeProjects 2018-04-02 20:46:07 +02:00
Alistair Johnson cbb953279c Intial implementation of CompositeProject 2018-03-31 20:28:09 +02:00
eugene yokota 06c934235d
Merge pull request #4050 from hvesalai/tmp/update-jline-fix-emacs
Update to Jline 2.14.6
2018-03-28 17:32:57 -04:00
Heikki Vesalainen b4c7dc50ac
Merge branch '1.x' into tmp/update-jline-fix-emacs 2018-03-28 18:49:18 +03:00
Dale Wijnand 289077a405
Re-introduce Command.process
This was an unnecessary removal in
e83564a6b7.
2018-03-28 16:37:07 +01:00
Dale Wijnand 26c267e29e
Merge pull request #4043 from dwijnand/cleanup/ParseKey
Cleanup test/ParseKey
2018-03-28 16:10:03 +01:00
Dale Wijnand af3eec7c31
Merge pull request #4045 from dwijnand/Deprecate-Scope.transformTaskName
Deprecate Scope.transformTaskName
2018-03-28 16:09:39 +01:00
Heikki Vesalainen e30c0fbd1e 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-03-28 14:31:21 +00:00
eugene yokota 02acf9380e
Merge pull request #4042 from dwijnand/Reuse-Scoped.scoped-methods
Re-use Scoped.scoped* methods
2018-03-28 09:41:09 -04:00
eugene yokota fa56cf394b
Merge pull request #4046 from eed3si9n/wip/bumpsbt
bump to 1.1.3-SNAPSHOT
2018-03-28 09:11:19 -04:00