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
87306524a8
Improve error message further.
2014-06-03 13:57:27 -04:00
2c3f40eb02
Improve test failure message for #1390 .
2014-06-02 15:10:17 -04:00
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
f05a16801c
merge with master
2014-06-02 13:44:07 -04:00
f568e710ce
Also publish completions library for 2.11.
2014-06-02 13:42:27 -04:00
05315e2276
Remove old website in favor of new sbt/website project.
2014-06-02 12:56:28 -04:00
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
b4cfd7ab76
Don't update classifiers of projectDependencies
2014-06-02 10:14:01 +01:00
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
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
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
d57f5ac180
put backticks around `yield` in Thread.yield
2014-05-29 12:32:10 -04:00
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
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
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
007a8f2a70
ServerApplication: yield before we check on the dumper thread
2014-05-28 10:07:35 -04:00
c006692fc3
Make GlobalPluginData preserve compatibility wrt .unapply
2014-05-28 14:50:41 +01:00
b382cf464d
build projects' transitiveUpdate to depend on globalPluginUpdate
2014-05-28 14:50:40 +01:00
d970ab3af3
Re-add scripted test
2014-05-28 14:50:40 +01:00
87e9250cb2
Revert "Load global plugins in their own class loader and replace the base loader with that. Fixes #272."
...
This reverts commit 8cb7e23011
2014-05-28 14:50:39 +01:00
2dc910ba0b
Merge pull request #1358 from dansanduleac/issue/1194
...
Resolve ThisProject properly
2014-05-28 09:45:28 -04:00
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
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
4c2d88649e
Fix formatting issues and bump to sbt 0.13.5
2014-05-28 09:12:55 -04:00
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
b69a273f37
Fix import issues to generate sxr/scaladoc.
2014-05-28 08:55:29 -04:00
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
73e8676ea5
0.13.5 release.
2014-05-27 09:35:32 -04:00
af70a895de
Merge pull request #1364 from scalatest/test-result-acc-count
...
Accumulate Test Count
2014-05-23 09:37:46 -04:00
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
ef6019d924
Merge pull request #1360 from gkossakowski/incremental-cleanup
...
Incremental cleanup
2014-05-22 09:43:15 +02:00
129c870a1d
Break Incremental.scala into smaller files.
...
Incremental.scala contained all three strategies of incremental
compilation:
* ant-style
* the default one (before name hashing)
* name hashing
Let's move all those classes into separate files. Also, move common code
into a separate file.
2014-05-21 16:23:55 +02:00
1cbf1aaf28
Merge pull request #1357 from sbt/wip/roll-back-ivy
...
Roll back Ivy to 2.3.0 for 0.13.5 for #1356
2014-05-20 22:43:33 -04:00
0f54be9c96
JDK8 compat issue, MaxPermSize removed since JDK 8
2014-05-21 10:41:23 +08:00
5273aa3a03
Add scripted test to verify ThisProject is resolved properly
2014-05-21 01:16:15 +01:00
5deb103ef6
Fix resolving Select(ThisProject)
2014-05-21 01:16:15 +01:00
7849361c82
Remove stale, commented out code from Incremental.scala
...
The commented out code was sitting here since 2010. It bit-rotted to the
point of not being useful anymore. Let's remove it.
2014-05-20 19:51:28 +02:00
d2f07be79d
Roll back Ivy to 2.3.0 for 0.13.5
2014-05-20 12:09:19 -04:00
d8a8792946
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
4eafda7891
Don't allow generated strings (key names) to be empty
2014-05-20 09:02:10 +01:00
5a0e962d8a
Merge pull request #1349 from paulp/pr/dead-line
...
Remove line of dead code.
2014-05-19 12:33:45 -04:00
398385d00c
Merge pull request #1346 from benjyw/sort_analysis_seqs
...
Ensure sequences in analysis files are read in order.
2014-05-19 10:45:13 -04:00
e88d1436c5
Remove line of dead code.
...
Unmoored expression in constructor does nothing except pack
on a few micros.
2014-05-19 06:17:44 -07:00
00f12c6046
Ensure sequences in analysis files are read in order.
...
For various reasons, we serialize sequences as:
0 -> foo
1 -> bar
...
Until now we were implicitly relying on the sequences being in order.
However external code may end up (due to bugs or otherwise) messing
with the ordering:
1 -> bar
0 -> foo
...
This change ensures that we don't get confused by that. Although
it's best if external code doesn't mess up the ordering, it's still
a good idea to be defensive about this.
Note that the sequences we serialize are short, so the extra sort
is not a performance concern.
2014-05-17 01:04:14 +00:00
da9f29bd04
Merge pull request #1345 from sbt/wip/cross-publish-libs
...
Add the ability to cross publish libraries and create a command to autom...
2014-05-16 17:20:30 -04:00
a1a784bf91
Add the ability to cross publish libraries and create a command to automatically do so.
2014-05-16 16:50:34 -04:00
7f69facd26
Merge pull request #1344 from sbt/wip/merge-0.13.5
...
Wip/merge 0.13.5
2014-05-16 14:14:33 -04:00
7d0b517be2
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
748ff345a4
Merge pull request #1342 from sbt/wip/fix-build-loaders
...
Fix pattern match on buildLoaders.
2014-05-16 09:10:23 -04:00
Josh Suereth
eugene yokota
Dan Sanduleac
xuwei-k
Havoc Pennington
cheeseng
Grzegorz Kossakowski
ZhiFeng Hu
Paul Phillips
Benjy