Commit Graph

3532 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 6348c22251 Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-06-09 13:56:16 -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 2ceb4f7d72 Add a unit test for the 'scala-jar' mapping. 2014-06-07 20:58:31 -05: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 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 0ac485feb7 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
Josh Suereth fbb0e318fd Merge pull request #1396 from skyluc/2.12-support
Adds support for Scala 2.12
2014-06-05 16:26:21 -04:00
eugene yokota e665d1268d Merge pull request #1393 from sbt/wip/fix-release-211-again
One more fix to release script.
2014-06-05 15:34:54 -04:00
Josh Suereth 4311f87d64 Remove flaky test.
Fixes #1390
2014-06-05 12:39:44 -04:00
Havoc Pennington 506d06bf67 Don't delete the server config file if SBT_SERVER_SAVE_TEMPS ne null
This allows people to reproduce failures by running the command line
by hand.

Fixes #1394
2014-06-05 11:18:22 -04:00
Havoc Pennington a72448b793 Flush output every time we write to it in StreamDumper
To try harder to get our errors displayed.
2014-06-05 11:09:59 -04:00
Havoc Pennington 63d9b638c3 Wait 5 seconds instead of 2 seconds to read stderr from launched server 2014-06-05 11:07:37 -04:00
Josh Suereth 273024a238 Add special hook to diagnose travis failing test. 2014-06-04 11:33:02 -04:00
Josh Suereth 4cd5657ac1 Cleanup release settings not existing and credentials check/enforcement craziness. 2014-06-04 11:32:21 -04:00
Josh Suereth 6f28f08b78 One more fix to release script.
* Ensure completion is appropriately cross versioned
* The publish launcher task should not try to publish
  the useless root project.
2014-06-04 08:50:46 -04:00
Luc Bourlier 9c9b75c39a Adds support for Scala 2.12 2014-06-04 10:00:47 +02:00
Josh Suereth e53acb673b 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
Josh Suereth 9bbda53e4f Merge pull request #1383 from xuwei-k/scripted-parser
use custom scriptedParser instead of spaceDelimited parser
2014-06-03 16:01:00 -04:00
Josh Suereth 87306524a8 Improve error message further. 2014-06-03 13:57:27 -04:00
Josh Suereth 2c3f40eb02 Improve test failure message for #1390. 2014-06-02 15:10:17 -04:00
eugene yokota aa28240139 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
Josh Suereth f05a16801c merge with master 2014-06-02 13:44:07 -04:00
Josh Suereth f568e710ce Also publish completions library for 2.11. 2014-06-02 13:42:27 -04:00
Dan Sanduleac b4cfd7ab76 Don't update classifiers of projectDependencies 2014-06-02 10:14:01 +01:00
xuwei-k 45ce437937 use custom scriptedParser instead of spaceDelimited parser
https://github.com/sbt/sbt/blob/v0.13.5/project/Sbt.scala#L179-L192
2014-05-30 21:23:17 +09:00
Josh Suereth e0a96e3d7f Fix bug in release script due to typo.
* Fix collection typo
* Create shared command to setup 2.11 builds
* Alter snapshot detection to allow more flexible milestone versioning.
* Remove cusotm isSnapshot key for new sbt 0.13.2 isSnapshot key.
2014-05-29 22:35:44 -04:00
eugene yokota baf78797d6 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
Havoc Pennington d57f5ac180 put backticks around `yield` in Thread.yield 2014-05-29 12:32:10 -04:00
eugene yokota c5d0c4cd29 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
eugene yokota f65f191ba3 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
Josh Suereth 68a2f57da9 Allow autogenerated projects to have overridden organization.
* Change detection of "default project" to accurately see
  if someone has changed the organization.
* Add a flag to notify downstream consumers that a project
  was autogenerated and not user specified.

Fixes #1315
2014-05-28 12:55:05 -04:00