luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,667 Commits 29 Branches 312 Tags 69 MiB
Commit Graph

3667 Commits

Author SHA1 Message Date
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
Josh Suereth 05315e2276 Remove old website in favor of new sbt/website project. 2014-06-02 12:56:28 -04:00
Josh Suereth 7f2bd2cc4b Remove nested site generation in favor of just creating Scaladoc/Sxr docs. 
* Do not delete versioned docs from sbt/website project
* Just sync api/sxr directories
* Remove all build-related information for old sphinx docs.

Replaces #1385
 2014-06-02 12:54:01 -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
Havoc Pennington 007a8f2a70 ServerApplication: yield before we check on the dumper thread 2014-05-28 10:07:35 -04:00
Dan Sanduleac c006692fc3 Make GlobalPluginData preserve compatibility wrt .unapply 2014-05-28 14:50:41 +01:00
Dan Sanduleac b382cf464d build projects' transitiveUpdate to depend on globalPluginUpdate 2014-05-28 14:50:40 +01:00
Dan Sanduleac d970ab3af3 Re-add scripted test 2014-05-28 14:50:40 +01:00
Dan Sanduleac 87e9250cb2 Revert "Load global plugins in their own class loader and replace the base loader with that. Fixes #272." 
This reverts commit 8cb7e23011.

Conflicts:
	main/src/main/scala/sbt/Load.scala
 2014-05-28 14:50:39 +01:00
Josh Suereth 2dc910ba0b Merge pull request #1358 from dansanduleac/issue/1194 
Resolve ThisProject properly
 2014-05-28 09:45:28 -04:00
Josh Suereth 9673d423aa Merge pull request #1359 from ancientrock/jdk8-tip 
JDK8 compat issue, MaxPermSize removed since JDK 8
 2014-05-28 09:44:52 -04:00
Josh Suereth ae02b495e6 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-28 09:37:14 -04:00
Josh Suereth 4c2d88649e Fix formatting issues and bump to sbt 0.13.5 2014-05-28 09:12:55 -04:00
Josh Suereth 89091ca4fc 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
Josh Suereth b69a273f37 Fix import issues to generate sxr/scaladoc. 2014-05-28 08:55:29 -04:00
Havoc Pennington 1e80d811a1 Read stderr from server for a short time before exiting 
Previously we exited immediately without waiting to get any
error output.

This patch also adds the command line and directory to the
exception message on failure, in case the failure is due to
getting one of those wrong, for example.
 2014-05-27 18:36:08 -04:00
Josh Suereth 73e8676ea5 0.13.5 release. 2014-05-27 09:35:32 -04:00
Josh Suereth af70a895de Merge pull request #1364 from scalatest/test-result-acc-count 
Accumulate Test Count
 2014-05-23 09:37:46 -04:00
cheeseng 83af01b88a Changed to combine SuiteResult with same name, instead of replacing with latest one. This solves the test result count problem when a Suite is executed more than 1 time due to being returned as nested suites (sub-task). 2014-05-22 17:28:26 +08:00