Commit Graph

17565 Commits

Author SHA1 Message Date
Josh Suereth abac4c1445 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
Josh Suereth 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
Josh Suereth c3abb9fad4 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
Josh Suereth fd32070aab 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
Josh Suereth bb2635a695 Merge pull request #1367 from dansanduleac/issue/1366
Don't update classifiers of projectDependencies
2014-07-02 10:09:45 -04:00
Josh Suereth c44ecf514c Merge pull request #1367 from dansanduleac/issue/1366
Don't update classifiers of projectDependencies
2014-07-02 10:09:45 -04:00
Josh Suereth 02c11c53e4 Merge pull request #1367 from dansanduleac/issue/1366
Don't update classifiers of projectDependencies
2014-07-02 10:09:45 -04:00
Josh Suereth f2e805a0d8 Merge pull request #1367 from dansanduleac/issue/1366
Don't update classifiers of projectDependencies
2014-07-02 10:09:45 -04:00
Josh Suereth 15f5dff96a Merge pull request #1426 from lpiepiora/fix-plugin-command
Fixes #1416: Plugin command doesn't work
2014-07-02 10:01:16 -04:00
Josh Suereth cfe575c39e Merge pull request #1426 from lpiepiora/fix-plugin-command
Fixes #1416: Plugin command doesn't work
2014-07-02 10:01:16 -04:00
Lukasz Piepiora 871ccb0ab9 Fixes #1416: Plugin command doesn't work
Fix `plugin` command not working with plugin names containing `.`
2014-06-29 23:55:23 +02:00
eugene yokota 3dbf0ced7d Merge pull request #1389 from sbt/wip/only-push-scaladoc
Remove nested site generation in favor of just creating Scaladoc/Sxr doc...
2014-06-27 12:07:33 -04:00
eugene yokota 19d8582196 Merge pull request #1401 from xuwei-k/watch
Triggered Execution should be aware of rename or move file
2014-06-27 12:05:59 -04:00
eugene yokota 57ca26fe77 Merge pull request #1401 from xuwei-k/watch
Triggered Execution should be aware of rename or move file
2014-06-27 12:05:59 -04:00
eugene yokota 1fe20338b1 Merge pull request #1409 from vn971/0.13
make it possible to reference a branch of a local git repository
2014-06-24 23:00:45 -04:00
eugene yokota 172e091d9e Merge pull request #1409 from vn971/0.13
make it possible to reference a branch of a local git repository
2014-06-24 23:00:45 -04:00
eugene yokota 2e9dadb5cc Merge pull request #1424 from jaceklaskowski/deprecated-annotation-param-positions
Message and since parameters in @deprecated properly placed
2014-06-24 22:59:55 -04:00
eugene yokota 79cbc5a744 Merge pull request #1424 from jaceklaskowski/deprecated-annotation-param-positions
Message and since parameters in @deprecated properly placed
2014-06-24 22:59:55 -04:00
eugene yokota e0f2d212df Merge pull request #1425 from jaceklaskowski/typo-fixes
Typo fixes + removing unnecessary semicolons
2014-06-24 22:58:59 -04:00
eugene yokota 77384a8a05 Merge pull request #1425 from jaceklaskowski/typo-fixes
Typo fixes + removing unnecessary semicolons
2014-06-24 22:58:59 -04:00
eugene yokota 137805ed01 Merge pull request #1423 from lpiepiora/fix-top-level-auto-plugins
Fix AutoPlugins declared at top-level
2014-06-24 22:52:00 -04:00
Jacek Laskowski d7c7237d2c Typo fixes + removing unnecessary semicolons 2014-06-25 00:08:25 +02:00
Jacek Laskowski ebbb77e200 Typo fixes + removing unnecessary semicolons 2014-06-25 00:08:25 +02:00
Jacek Laskowski d1dbdfc816 Message and since parameters in @deprecated properly placed 2014-06-24 22:35:34 +02:00
Lukasz Piepiora 75a05dfcbf Fix AutoPlugins declared at top-level
Fixes exception occuring when loading auto plugins, which are declared
as top-level classes
2014-06-24 20:52:18 +02:00
eugene yokota 14176967d8 Merge pull request #1411 from jaceklaskowski/deprecated-reversed
Place version and comment correctly in @deprecated
2014-06-23 18:48:42 -04:00
Vasya Novikov 33ee4a30c8 minor change: code style 2014-06-24 02:24:51 +04:00
Josh Suereth b95cd8237a Merge pull request #1419 from jroper/fix-newer
Fixed scripted newer command
2014-06-23 09:15:36 -04:00
Dan Sanduleac f155a43a47 Scripted test for updateClassifiers not picking up inter-project dependency 2014-06-23 08:42:56 +01:00
James Roper 4d29302632 Fixed scripted newer command
The scripted newer command was effectively a noop, it always passed
because it returned false instead of throwing an exception when it
failed.

Implemented specs for most of the scripted file commands as well.
2014-06-23 15:12:34 +10:00
Jacek Laskowski 54bc04dadb Place version and comment correctly in @deprecated 2014-06-18 00:18:05 +02:00
Vasya Novikov 66c9314d20 make it possible to reference a branch of a local git repository
Reasoning on why this change is wanted can be found
on the "sbt-dev" mailing list,
topic "problem with referencing a local git repository"
2014-06-15 02:14:27 +04:00
David Pratt 75403c698d Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-06-09 13:56:16 -05:00
David Pratt 6319880a9a Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-06-09 13:56:16 -05:00
David Pratt 9209dba52a Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-06-09 13:56:16 -05:00
David Pratt 6348c22251 Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-06-09 13:56:16 -05:00
David Pratt 648ab3a8dd Make jar artifact a 0-byte file. 2014-06-09 13:54:20 -05:00
David Pratt 0bb9be34df Make jar artifact a 0-byte file. 2014-06-09 13:54:20 -05:00
xuwei-k dd628d2441 Triggered Execution should be aware of rename or move file 2014-06-09 00:49:45 +09:00
David Pratt f38cd6d8c3 Add a unit test for the 'scala-jar' mapping. 2014-06-07 20:58:31 -05:00
David Pratt 2ceb4f7d72 Add a unit test for the 'scala-jar' mapping. 2014-06-07 20:58:31 -05:00
eugene yokota ba27c2d49d Merge pull request #1391 from sbt/wip/1390
Improve test failure message for #1390.
2014-06-06 13:24:11 -04:00
eugene yokota 6795421543 Merge pull request #1391 from sbt/wip/1390
Improve test failure message for #1390.
2014-06-06 13:24:11 -04:00
eugene yokota 42b85a99d8 Merge pull request #1391 from sbt/wip/1390
Improve test failure message for #1390.
2014-06-06 13:24:11 -04:00
eugene yokota 47b5790c41 Merge pull request #1391 from sbt/wip/1390
Improve test failure message for #1390.
2014-06-06 13:24:11 -04:00
Josh Suereth 2c8a28ebd7 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
Josh Suereth 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
Josh Suereth cd6c5f7b65 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
Josh Suereth 7cefc4bac4 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
David Pratt 1c92e42c44 Add 'scala-jar' to the list of jar artifacts.
The CustomPomParser has a hard-coded list of 'blessed' Maven POM packaging types
that are actually packaged as jar files, but Ivy incorrectly maps the file extension.
This patch allows artifacts published with the 'scala-jar' packaging to be properly
resolved and used in an SBT project.
2014-06-05 18:11:37 -05:00