87697c315d
Merge remote-tracking branch 'origin/0.13.5' into wip/fix-doc-generation
...
Conflicts:
project/Sbt.scala
2014-05-28 09:09:51 -04:00
3d087c97e9
Merge pull request #1353 from dansanduleac/bugfix/failing-derived-settings-tests
...
SettingsTest: Don't allow generated strings (key names) to be empty
2014-05-20 08:32:53 -04:00
4119bcf936
Don't allow generated strings (key names) to be empty
2014-05-20 09:02:10 +01:00
f1179a3793
Merge pull request #1344 from sbt/wip/merge-0.13.5
...
Wip/merge 0.13.5
2014-05-16 14:14:33 -04:00
6a4f917117
Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5
...
Conflicts:
main/src/main/scala/sbt/Load.scala
2014-05-16 14:04:51 -04:00
07c6a5700c
Merge pull request #1336 from sbt/wip/compile-with-2.11
...
Bump expected 2.11 module versions so we can compile with 2.11
2014-05-15 09:13:36 -04:00
629a8ca6eb
Bump expected 2.11 module versions so we can compile with 2.11
...
Add scala 2.11 test/build verification.
* Add 2.11 build configuratoin to travis ci
* Create command which runs `safe` unit tests
* Create command to test the scala 2.11 build
* Update scalacheck to 1.11.4
* Update specs2 to 2.3.11
* Fix various 2.11/deprecation removals
and other changes.
Fix eval test failure in scala 2.11 with XML not existing.
2014-05-14 19:08:05 -04:00
06d633af79
Merge pull request #1334 from sbt/wip/merge-0.13.5
...
Wip/merge 0.13.5
2014-05-14 09:06:09 -04:00
369425e8ea
Merge remote-tracking branch 'origin/0.13.5' into wip/merge-0.13.5
...
Conflicts:
main/src/main/scala/sbt/EvaluateTask.scala
2014-05-13 19:31:44 -04:00
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
9f9de600ee
Scalariforming test code
2014-05-07 11:52:23 -04:00
6d2b3b2d08
Merge pull request #1308 from sbt/wip/moreformatting
...
some more source getting formatted
2014-05-03 13:19:53 -04:00
40fae635c6
some more source getting formatted
2014-05-02 18:07:05 -04:00
b850be856b
Merge pull request #1304 from sbt/wip/scalariform
...
scalariform
2014-05-01 19:22:41 -04:00
4258189951
added scalariform
2014-05-01 12:50:07 -04:00
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
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
eb93fdd7a6
Improve SettingsExample to allow orthogonal scopes (like projects/tasks) at a certain nestIndex
2014-05-01 03:09:50 +01:00
767e2487d0
Couple of fixes
2014-05-01 01:35:48 +01:00
962f0bad76
Optimise scope intersection for GlobalScope
2014-05-01 01:35:48 +01:00
decd323b64
Decouple DefaultSetting from Setting/DerivedSetting; BuildCommon.derive() produces default settings by default
2014-05-01 01:35:48 +01:00
6f5242d812
Derive settings only under the scope of the DerivedSetting
2014-05-01 01:35:48 +01:00
431c61775c
Derived settings to replace their DerivedSetting, not go at the beginning
2014-05-01 01:35:48 +01:00
89d2aa291c
DerivedSetting not a DefaultSetting anymore
2014-05-01 01:35:48 +01:00
a0509c084d
Merge pull request #1270 from oscarvarto/spanishTranslation
...
Initial Spanish translation of documentation
2014-04-28 11:25:58 -04:00
dc97171a08
Merge pull request #1285 from jaceklaskowski/docs-changes-alone
...
Docs changes alone
2014-04-25 07:56:56 -04:00
cd9232f0ab
Merge pull request #1286 from jaceklaskowski/reload-detailed-help
...
Detailed help for the reload command (following project's)
2014-04-25 07:55:23 -04:00
a76c337711
Merge pull request #1236 from urbas/0.13
...
Implemented the fileParser and added DynamicExamples.
2014-04-25 07:54:31 -04:00
0ed9eb17aa
Reintroduced the `examples` method. Reintroduced and deprecated the `checkMatches` method.
2014-04-18 16:44:26 +01:00
150236900a
Merge remote-tracking branch 'remotesbt/0.13' into 0.13
2014-04-18 13:48:19 +01:00
80836a3bf2
Merge pull request #1255 from sbt/wip/remove-depreated-evaluate-task-call
...
Remove deprecated EvaluateTask usage for new, easier to update variant.
2014-04-16 14:33:10 -04:00
5079b9760f
Merge pull request #1263 from sbt/wip/docs-and-cleanups
...
addPlugins => enablePlugins
2014-04-16 13:59:40 -04:00
cbfd3f1c08
Added tests for FileExamples. Improved the file-searching in FileExamples.
2014-04-16 08:36:27 +01:00
0de2ef488d
Merge pull request #1250 from gkossakowski/namehashing-cleanup
...
Move NameHashing from incremental to api subproject.
2014-04-16 00:18:27 +02:00
bde16510cb
Merge pull request #1262 from sbt/topic/readme
...
Update CONTRIBUTING.md and README
2014-04-14 12:26:29 -04:00
a6da7640c4
Update CONTRIBUTING.md
2014-04-14 12:16:06 -04:00
757fe4228d
Improved the description of ParserWithExamples tests.
2014-04-14 08:24:02 +01:00
9469c11e62
Merge pull request #1254 from gkossakowski/classFileManager-logging
...
Add debug logging in ClassfileManager
2014-04-13 16:05:18 +02:00
f6aaf9ad67
Created unit tests for ParserWithExamples and FixedSetExampleSource.
2014-04-12 20:16:58 +01:00
709f7aca77
Merge pull request #1253 from sbt/wip/fix-1247
...
FIx configuration ordering issues in sbt 0.13.5
2014-04-10 10:21:49 -07:00
d70552d0c1
Merge pull request #1226 from sbt/wip/bump-to-latest-ivy
...
Bump to our own release of ivy 2.4.x
2014-04-10 10:15:26 -07:00
4645f9da4c
Merge pull request #1242 from sbt/wip/cancel-task-hooks
...
Add task cancellation hooks into the build definition.
2014-04-08 23:32:46 -07:00
53867bbb9d
Merge pull request #1243 from gkossakowski/clarify-compilations
...
Clarify the role and uses cases of Analysis.compilations.
2014-04-08 21:27:08 -04:00
05b536dabd
Merge pull request #1238 from Duhemm/issue-1237
...
Handle macros that have themselves as original tree (Fix #1237 )
2014-04-09 01:40:29 +02:00
d8ef5af533
Now using ExampleSource in collection-based completion parsers. Removed the Examples parser. Renamed DynamicExamples to ParserWithExamples.
2014-04-08 21:31:04 +01:00
6f80efade2
Documented the DynamicExamples and FixedSetExamples classes.
2014-04-08 20:40:51 +01:00
28f96e593d
Merge pull request #1241 from jaceklaskowski/follow-deprecation
...
Follow deprecation
2014-04-08 11:11:40 -04:00
35aad2b95b
Part #1 of cancel-task-hooks - Hooks EvaluateTask.
...
* Create a new EvaluateTaskConfig which gives us a bit more freedom
over changign config options to EvaluateTask in the future.
* Create adapted from old EvaluateTask to new EvaluateTask
* Add hooks into signals class to register/remote a signal listener
directly, rather than in an "arm" block.
* Create TaskEvaluationCancelHandler to control the strategy of
who/whom can cancel (sbt-server vs. sbt-terminal).
* Create a null-object for the "can't cancel" scenario so the
code path is exactly the same.
This commit does not wire settings into the build yet, nor does it
fix the config extractio methods.
2014-04-07 16:42:08 -04:00
bfdcf99866
Merge branch '0.13' into follow-deprecation
2014-04-07 22:20:55 +02:00
0023f73aae
Merge pull request #1232 from sbt/wip/fix-1156
...
Ensure that if artifact is published, we overwrite default checksums.
2014-04-07 08:36:16 -07:00
Josh Suereth
Dan Sanduleac
eugene yokota
Dan Sanduleac
Matej Urbas
Grzegorz Kossakowski
Jacek Laskowski