luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,155 Commits 29 Branches 314 Tags 72 MiB
Commit Graph

6155 Commits

Author SHA1 Message Date
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
eugene yokota 4c480f613d
Merge pull request #4047 from eed3si9n/wip/merge-1.1.x 
merge 1.1.x
 2018-03-28 09:10:46 -04:00
Dale Wijnand 25988d2256
Cleanup test/ParseKey 2018-03-28 09:04:12 +01:00
Dale Wijnand 2e86eed151
Split BuildSettingsInstances out of SlashSyntaxSpec.scala 2018-03-27 16:32:34 +01:00
Eugene Yokota c2837c7714 Merge branch 'wip/bumpsbt' into wip/merge-1.1.x 2018-03-27 10:16:10 -04:00
Dale Wijnand 165aac858e
Merge pull request #4040 from dwijnand/dedup/SlashSyntaxSpec 
Dedup keys in SlashSyntaxSpec
 2018-03-27 14:54:59 +01:00
Eugene Yokota 1b77b35333 bump to 1.1.3-SNAPSHOT 2018-03-27 06:53:05 -04:00
Eugene Yokota f607b6c73f sbt 1.1.2 2018-03-27 06:52:32 -04:00
Dale Wijnand 35decb6ee5
Deprecate Scope.transformTaskName 2018-03-27 09:59:07 +01:00
Dale Wijnand d19329666a
Re-use Scoped.scoped* methods 2018-03-27 09:24:12 +01:00
Dale Wijnand 3c66f39744
Allow SlashSyntaxSpec to be Scalafmt formatted 
Previously:

    [warn] /d/sbt/main-settings/src/test/scala/sbt/SlashSyntaxSpec.scala:44: error: illegal start of simple expression
    [warn] )
    [warn]     ^
 2018-03-27 09:22:07 +01:00
Dale Wijnand 42b61a4f8e
Dedup keys in SlashSyntaxSpec 2018-03-27 09:22:06 +01:00
Dale Wijnand 51ff72872b
De-generalise expectValue in SlashSyntaxSpec 2018-03-27 09:22:06 +01:00
Dale Wijnand 006527d246
Re-order SlashSyntaxSpec arbitraries 2018-03-27 09:22:06 +01:00
Dale Wijnand b0f9fe77b6
Merge pull request #4036 from eed3si9n/wip/fix-startup-log 
Fixes -error not suppressing startup logs
 2018-03-26 15:28:50 +01:00
eugene yokota cd40d1ac77
Merge pull request #4031 from eed3si9n/wip/bump 
bump modules
 2018-03-26 10:26:25 -04:00
Eugene Yokota 25ab94d96a Fixes -error not suppressing startup logs 
Fixes #3849

This brings back the 0.13 logic:

```scala
  def setGlobalLogLevel(s: State, level: Level.Value): State = {
    s.globalLogging.full match {
      case a: AbstractLogger => a.setLevel(level)
      case _                 => ()
    }
    s.put(BasicKeys.explicitGlobalLogLevels, true).put(Keys.logLevel.key, level)
  }
```
 2018-03-25 14:56:00 -04:00
Dale Wijnand 131c2a7a68
Merge pull request #4033 from eed3si9n/wip/new-mess 
Fixes new command leaving behind target directory
 2018-03-24 22:57:41 +00:00
Eugene Yokota b111b05d5f Fixes new command leaving target directory 
Fixes #2835

This fixes `new` command creating `target` directory by moving the `target` to a staging directory in the command itself.
 2018-03-24 13:45:35 -04:00
Eugene Yokota 9d2d81645b bump modules 2018-03-24 11:02:40 +09:00