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

10242 Commits

Author SHA1 Message Date
eugene yokota 3b1d63d0c9 Merge pull request #1312 from sbt/wip/dsl-enable-plugins 
Expand the DSL abilities with Project manipulations
 2014-05-08 14:25:17 -04:00
Josh Suereth dd263341fa Bump travis memory settings. 2014-05-08 07:36:41 -04:00
Josh Suereth f579e90ea0 Add test confirming that multiple.sbt files can contribute to enable/disablePlugin DSL. 2014-05-07 12:51:20 -04:00
Josh Suereth af1c581cbb Rework sbt's loading mechanism to allow `ProjectManipulation` DSL entries to take effect. 
This does the following:

* Fragments loading into two stages:  Discovery + Resolution
* Discovery just looks for .sbt files and Projects, while
  loading/compiling them.
* Resolution is responsible for taking discovered projects and
  loaded sbt files and globbing everything together.  This includes
  feeding the project through various manipulations, applying
  AutoPlugin settings/configurations and ordering all the settings.
* Add a bunch of docs
* Add direct DSL `enablePlugins` and test
* Add direct DSL `disablePlugins` and test.
 2014-05-07 12:35:17 -04:00
Josh Suereth 746583e718 Alter the DSL slightly to use explicit DslEntry types for settings. 
* Create new DSLEntry type for settings so we can categorize what we parse
* Use DSLEntry to help solve the Setting[_] vs. Seq[Setting[_]] implicit fun.
* Hack away any non-Setting[_] DSLEntry for now.
* Add test in build.sbt to make sure the new DSL works.
 2014-05-07 12:35:17 -04:00
eugene yokota 329278b531 Merge pull request #1316 from sbt/wip/fix-broken-build 
This doesn't quite fix the build, but gets closer
 2014-05-07 12:23:09 -04:00
eugene yokota d198ea4099 Merge pull request #1316 from sbt/wip/fix-broken-build 
This doesn't quite fix the build, but gets closer
 2014-05-07 12:23:09 -04:00
Josh Suereth e00325aeec Expand travis with all working unit tests. 2014-05-07 12:00:04 -04:00
Josh Suereth d034561083 Scalariformed project/Sbt.scala 2014-05-07 11:52:49 -04:00
Josh Suereth 9f9de600ee Scalariforming test code 2014-05-07 11:52:23 -04:00
Josh Suereth 244abd3b6f Scalariforming test code 2014-05-07 11:52:23 -04:00
Josh Suereth 39b68a2dfd Bring scala provider test to modern age of scala releases. 2014-05-07 11:48:45 -04:00
Josh Suereth b0018c0a42 Fix travis quote issues. 2014-05-07 11:45:45 -04:00
Josh Suereth 5d5d7a6c05 Add the ability to paginate scripted tests. 
* Modify scripted task parser to allow "pagination" of globs
  e.g.  "*1of3" will create three pages and run page 1.
* Modify travis definition to fragment long-running test groups
  into pages so we stay under the 50 minute limit.
 2014-05-07 11:06:26 -04:00
Josh Suereth 8d3efea45d Merge pull request #1313 from 2m/inspect-sort-keys 
Sort setting key names in the inspect tree view
 2014-05-07 10:26:24 -04:00
Josh Suereth 8e70aa4e93 Add missing scripted tests to configuration. 2014-05-07 09:44:14 -04:00
Martynas Mickevicius f11d3dbce4 Sort setting key names in the inspect tree view. 2014-05-07 14:32:10 +02:00
Josh Suereth 6d2b3b2d08 Merge pull request #1308 from sbt/wip/moreformatting 
some more source getting formatted
 2014-05-03 13:19:53 -04:00
Josh Suereth aa4ee809e5 Merge pull request #1308 from sbt/wip/moreformatting 
some more source getting formatted
 2014-05-03 13:19:53 -04:00
Josh Suereth efaa0f9e45 Merge pull request #1307 from xuwei-k/remove-unnecessary-var 
remove unnecessary var
 2014-05-03 13:19:19 -04:00
Eugene Yokota 40fae635c6 some more source getting formatted 2014-05-02 18:07:05 -04:00
Eugene Yokota 785b0274ee some more source getting formatted 2014-05-02 18:07:05 -04:00
xuwei-k 25b22f951a remove unnecessary var 2014-05-03 06:01:13 +09:00
Josh Suereth 38a0c16eff Merge pull request #1304 from sbt/wip/scalariform 
scalariform
 2014-05-01 19:22:41 -04:00
Josh Suereth b850be856b Merge pull request #1304 from sbt/wip/scalariform 
scalariform
 2014-05-01 19:22:41 -04:00
Josh Suereth 68e7c9a2b6 Merge pull request #1304 from sbt/wip/scalariform 
scalariform
 2014-05-01 19:22:41 -04:00
Eugene Yokota 2b526e6aa7 added scalariform 2014-05-01 12:50:07 -04:00
Eugene Yokota 9fe27afe37 added scalariform 2014-05-01 12:50:07 -04:00
Eugene Yokota 4258189951 added scalariform 2014-05-01 12:50:07 -04:00
Eugene Yokota adb41611cf added scalariform 2014-05-01 12:50:07 -04:00
Eugene Yokota b730c00b75 sbt 0.13.2 2014-05-01 12:05:52 -04:00
eugene yokota 5c630eb8aa Merge pull request #1036 from dansanduleac/derivedSettings 
Allow derived settings to replace previously-defined but non-default settings
 2014-05-01 11:53:42 -04:00
eugene yokota c3af4b7450 Merge pull request #1036 from dansanduleac/derivedSettings 
Allow derived settings to replace previously-defined but non-default settings
 2014-05-01 11:53:42 -04:00
Josh Suereth 04e32b7859 Merge pull request #1303 from sbt/wip/merge-0.13.2 
Merge 0.13.2
 2014-05-01 10:51:50 -04:00
Jarek Sacha e69a0bc79e Added links to `imagej` and `install4j` plugins 2014-05-01 09:55:59 -04:00
rschatz 13322a2d0d added npt as new Utility Plugin 2014-05-01 09:55:53 -04:00
Josh Suereth 26b7a5cea1 removing last type in python conf. 2014-05-01 09:55:46 -04:00
Josh Suereth 2adbe0e1e8 Fix for new location of MSI files. 2014-05-01 09:55:32 -04:00
Josh Suereth 1508c967a9 Fix native package location for bintray distribution. 2014-05-01 09:55:26 -04:00
Dan Sanduleac 1e9dee900a Add 2 derived settings tests: 
1) non-default derived settings, if they produce anything, the settings
   they produce must supersede previous assignents (in the settings seq)
   to the same key.

2) even if a derived setting is scoped at a higher scope (e.g.
   ThisBuild) the settings it produces are scoped at the intersection of
   that (the defining) scope and the scope of the triggering dependency.

2 is particularly nice as it enables this behaviour:
    derive(b in ThisBuild := a.value + 1)
    a in project1 := 0
    // a could be defined in all projects
    ==>
    Now (b in project1).value == (a in project1).value + 1 == 1
    and similarly in all other projects
    all with a single derived setting
 2014-05-01 03:11:22 +01:00
Dan Sanduleac 96c7864088 Add 2 derived settings tests: 
1) non-default derived settings, if they produce anything, the settings
   they produce must supersede previous assignents (in the settings seq)
   to the same key.

2) even if a derived setting is scoped at a higher scope (e.g.
   ThisBuild) the settings it produces are scoped at the intersection of
   that (the defining) scope and the scope of the triggering dependency.

2 is particularly nice as it enables this behaviour:
    derive(b in ThisBuild := a.value + 1)
    a in project1 := 0
    // a could be defined in all projects
    ==>
    Now (b in project1).value == (a in project1).value + 1 == 1
    and similarly in all other projects
    all with a single derived setting
 2014-05-01 03:11:22 +01:00
Dan Sanduleac eb93fdd7a6 Improve SettingsExample to allow orthogonal scopes (like projects/tasks) at a certain nestIndex 2014-05-01 03:09:50 +01:00
Dan Sanduleac 0489fa817b Improve SettingsExample to allow orthogonal scopes (like projects/tasks) at a certain nestIndex 2014-05-01 03:09:50 +01:00
Dan Sanduleac 767e2487d0 Couple of fixes 2014-05-01 01:35:48 +01:00
Dan Sanduleac 512494cd04 Couple of fixes 2014-05-01 01:35:48 +01:00
Dan Sanduleac 962f0bad76 Optimise scope intersection for GlobalScope 2014-05-01 01:35:48 +01:00
Dan Sanduleac 0377a40cf8 Optimise scope intersection for GlobalScope 2014-05-01 01:35:48 +01:00
Dan Sanduleac decd323b64 Decouple DefaultSetting from Setting/DerivedSetting; BuildCommon.derive() produces default settings by default 2014-05-01 01:35:48 +01:00
Dan Sanduleac f485270adf Put sbt's derived settings under GlobalScope 2014-05-01 01:35:48 +01:00
Dan Sanduleac 6f5242d812 Derive settings only under the scope of the DerivedSetting 2014-05-01 01:35:48 +01:00