3ca919b0bb
Merged 0.13.5 to remove documents
2014-08-04 10:14:46 -04:00
1b89bbf003
Merge pull request #1473 from sbt/wip/resolve-consolidation2
...
Improved consolidated resolution testing. #1454
2014-07-29 21:29:47 -04:00
e1d79ec27a
Merge pull request #1467 from sbt/wip/eviction-warning
...
Eviction warnings (Fixes #1200 )
2014-07-29 11:08:42 -04:00
a398e7d78f
Implements eviction warning stories. #1200
...
This implements all stories from https://github.com/sbt/sbt/wiki/User-Stories%3A-Conflict-Warning .
When scalaVersion is no longer effective an eviction warning will display.
Scala version was updated by one of library dependencies:
* org.scala-lang:scala-library:2.10.2 -> 2.10.3
When there're suspected incompatibility in directly depended Java libraries,
eviction warnings will display.
There may be incompatibilities among your library dependencies.
Here are some of the libraries that were evicted:
* commons-io:commons-io:1.4 -> 2.4
When there's suspected incompatiblity in directly depended Scala libraries,
eviction warnings will display.
There may be incompatibilities among your library dependencies.
Here are some of the libraries that were evicted:
* com.typesafe.akka:akka-actor_2.10:2.1.4 -> 2.3.4
This also adds 'evicted' task, which displays more detailed eviction warnings.
2014-07-27 12:26:12 -04:00
90d5f1ca02
Merge pull request #1400 from dpratt/0.13
...
Add 'scala-jar' to the list of jar artifacts.
2014-07-03 11:57:12 -04:00
c44ecf514c
Merge pull request #1367 from dansanduleac/issue/1366
...
Don't update classifiers of projectDependencies
2014-07-02 10:09:45 -04:00
6319880a9a
Merge remote-tracking branch 'upstream/0.13' into 0.13
2014-06-09 13:56:16 -05:00
6795421543
Merge pull request #1391 from sbt/wip/1390
...
Improve test failure message for #1390 .
2014-06-06 13:24:11 -04:00
3936b71a5d
Merge pull request #1397 from havocp/wip/havocp-try-harder-for-errors
...
Try harder to get diagnostics on server launch failure
2014-06-06 10:04:41 -04:00
bcf86fcc38
Merge pull request #1396 from skyluc/2.12-support
...
Adds support for Scala 2.12
2014-06-05 16:26:21 -04:00
4ff164484e
Merge pull request #1377 from havocp/wip/havocp-server-launch-errors
...
Read stderr from server for a short time before exiting
2014-06-03 16:03:06 -04:00
69224d7b3a
Merge pull request #1383 from xuwei-k/scripted-parser
...
use custom scriptedParser instead of spaceDelimited parser
2014-06-03 16:01:00 -04:00
63b7078326
Merge pull request #1350 from sbt/wip/fix-release-scripts
...
Fix bug in release script due to typo.
2014-06-02 14:36:33 -04:00
759ead63fc
merge with master
2014-06-02 13:44:07 -04:00
894995c920
Merge pull request #1378 from sbt/wip/fix-default-generated-projects
...
Allow autogenerated projects to have overridden organization.
2014-05-29 14:32:17 -04:00
5581832d0a
Merge pull request #1352 from dansanduleac/issues/1084
...
Don't inject global plugins' classpath into that of builds, and autotrigger build.update if GP.updated
2014-05-29 12:29:45 -04:00
6351ed52b8
Merge pull request #1376 from sbt/wip/fix-doc-generation
...
Merge 0.13.5 into 0.13
2014-05-28 17:16:15 -04:00
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
Eugene Yokota
Josh Suereth
David Pratt
Dan Sanduleac
Dan Sanduleac
Matej Urbas