luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,847 Commits 22 Branches 333 Tags 97 MiB
Commit Graph

17847 Commits

Author SHA1 Message Date
Josh Suereth 626e5455d5 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 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
Josh Suereth 357a46280a 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 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 4768d52759 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
eugene yokota 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
eugene yokota 55eb00ae9c 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
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 4e6ce490a0 merge with master 2014-06-02 13:44:07 -04:00
Josh Suereth 759ead63fc merge with master 2014-06-02 13:44:07 -04:00
Josh Suereth a1841798b0 merge with master 2014-06-02 13:44:07 -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 ff9c7d253b 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
eugene yokota 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
eugene yokota 5a64061032 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
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 0ffa703c2c 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 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
eugene yokota ffd9d39f0d 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 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 d9b1f7165f 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
eugene yokota 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
eugene yokota 7408c51288 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
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 449e757249 Fix formatting issues and bump to sbt 0.13.5 2014-05-28 09:12:55 -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 639faf4623 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 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
Josh Suereth fd44df9ec8 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 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 1f68d3f6fd Fix import issues to generate sxr/scaladoc. 2014-05-28 08:55:29 -04:00
Josh Suereth b69a273f37 Fix import issues to generate sxr/scaladoc. 2014-05-28 08:55:29 -04:00