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

1177 Commits

Author SHA1 Message Date
Josh Suereth b7ebfa332f Merge pull request #1698 from sbt/wip/bc-regression 
Fix BC issue discovered in #1696.
 2014-10-28 14:35:40 -04:00
Josh Suereth 9c36fa7508 Fix BC issue discovered in #1696. 
Def.derive has a new parameter, so we add an override which delegates down to the new method.
 2014-10-28 10:21:41 -04:00
Eugene Yokota 5d00a9f5cd merged #1662 2014-10-21 12:18:54 -04:00
Josh Suereth ba04f7761d Merge pull request #1663 from sbt/wip/avoid-deprecated 
enable -deprecation for Scala 2.10
 2014-10-12 12:31:08 -04:00
Eugene Yokota a39e105b1f enable -deprecation for Scala 2.10 
Enable -deprecation flag to catch old code being use when we migrate
things.
In this commit I moved error to sys.error.
 2014-10-10 15:42:26 -04:00
Josh Suereth 672479bbf3 Merge pull request #1600 from topping/0.13 
PR for #1589
 2014-09-24 09:11:57 -04:00
Josh Suereth 31550c6e81 Merge pull request #1613 from jedesah/topic/remove-warnings 
Remove compiler warnings
 2014-09-24 09:10:35 -04:00
Josh Suereth bf37f0924d Merge pull request #1590 from jedesah/0.13 
Add developer key
 2014-09-17 10:32:04 -04:00
Jean-Rémi Desjardins a3ba82c645 Merge branch '0.13' of github.com:jedesah/sbt into 0.13 
Conflicts:
	ivy/src/main/scala/sbt/IvyInterface.scala
 2014-09-16 09:29:35 -07:00
Jean-Rémi Desjardins 3ad68524cb Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-16 09:20:21 -07:00
Jean-Remi Desjardins b3ef4d1e59 Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-15 22:24:10 -07:00
Josh Suereth 40f3e72ed9 Merge pull request #1596 from sbt/wip/herald 
minor notes changes for herald
 2014-09-15 12:11:25 -04:00
Brian Topping 46d62074e0 Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-09-15 11:14:13 -04:00
eugene yokota b8c567d2ce Merge pull request #1588 from sbt/wip/bump-sbt-version 
Bump version for next sbt release.
 2014-09-13 15:38:42 -04:00
Josh Suereth 7ea6f79a8d Merge pull request #1591 from cunei/wip-set-every-1430 
Fix for #1430
 2014-09-12 22:54:29 -04:00
Antonio Cunei 77691eac40 Undone the revert on the optimization, and fixed setAll() 
The optimization, and therefore the change in the behavior
of Relation, is now needed by the class Logic, and cannot
be reverted.

This patch (written by Josh) therefore changes the
implementation of setAll() so that _1s is no longer used.
 2014-09-12 20:51:04 +02:00
Jean-Rémi Desjardins a15b093fcf Merge branch 'refs/heads/0.13' into topic/remove-warnings 2014-09-10 23:24:53 -07:00
Jean-Rémi Desjardins f65f30d152 Remove some compiler warnings 2014-09-10 22:55:43 -07:00
Antonio Cunei e0dd2e6a4c This commit reverts part of 322f6de655 
The implementation of Relation should in theory make no difference
whether an element is unmapped, or whether it is mapped to an empty
set. One of the changes in 322f6de655
introduced an optimization to the '+' operation on Relations that,
in theory, should have made no difference to the semantic.

The result of that optimization is that some mappings of the form
"elem -> Set()" are no longer inserted in the forwardMap of the
Relation.

Unfortunately, the change resulted in the breakage of #1430,
causing "set every" to behave incorrectly. There must be, somewhere
in the code, a test on the presence of a key rather than an access
via <relation>.get(), or some other access that bypasses the
supposed semantic equivalence described above. I spent several
hours trying to track down exactly the offending test, without
success.

By undoing the relevant change in 322f6de655, "set every"
works again. That however offers no guarantee that everything else
will keep working correctly; the underlying quirk in the code that
depends on this supposedly inessential detail is also still
lurking in the code, which is less than ideal.
 2014-09-11 02:04:17 +02:00
eugene yokota d00520319e Merge pull request #1535 from sbt/fix/670 
Fixes #670. Exclude http.proxyPassword from update.log
 2014-08-16 17:11:10 -04:00
eugene yokota 6276fb3880 Merge pull request #1534 from havocp/wip/havocp-server-mem 
Set JVM memory options for server applications
 2014-08-16 17:10:47 -04:00
eugene yokota 6cc4c18405 Merge pull request #1533 from sbt/fix/1530 
Fixes #1530. Fixes NPE by using IO.listFiles
 2014-08-16 14:42:11 -04:00
Eugene Yokota f6c43b917d Fixes #1530. Fixes NPE by using IO.listFiles 2014-08-15 03:52:54 -04:00
Grzegorz Kossakowski 994b672d7c Merge pull request #1531 from gkossakowski/positions-crash 
Set currentRun and currentUnit in Eval
 2014-08-14 15:52:01 +02:00
eugene yokota 7e4c0b84d1 Merge pull request #1512 from sbt/wip/fix-1506 
Fix unknown host exception in junit xml listener.
 2014-08-12 14:55:20 -04:00
eugene yokota 5ea3abe5ca Merge pull request #1521 from sbt/wip/fix-flaky-settings-test 
Fixes flaky no-such-element exception from bad generation of random test...
 2014-08-12 11:12:44 -04:00
eugene yokota 07b74c6187 Merge pull request #1516 from sbt/wip/fix-1455 
Allow root plugins to be disabled.
 2014-08-12 11:12:18 -04:00
Josh Suereth b35e4b746d Merge pull request #1520 from sbt/fix/1514 
Fixes #1514, #321. Fixes -SNAPSHOT issue by re-implemeting ChainResolver
 2014-08-12 10:04:10 -04:00
Josh Suereth dbc8b2643f Ok, this is actually the flaky issue with the test. 
We use the ch key for testing, so it can't be part of the autogenerated set.
 2014-08-11 16:13:26 -04:00
Josh Suereth 515ec1f2e2 Fixes flaky no-such-element exception from bad generation of random tests. 2014-08-11 14:54:33 -04:00
Josh Suereth d1aa2089fe Merge pull request #1491 from sbt/fix/528 
Unresolved dependency warning includes source position. Fixes #528
 2014-08-11 07:51:33 -04:00
eugene yokota 474d710ddb Merge pull request #1498 from sbt/wip/fix-broken-cross 
Fix broken cross versioning semantics using +
 2014-08-04 17:38:34 -04:00
eugene yokota 7d560293d8 Merge pull request #1497 from sbt/wip/0.13.5-merge 
0.13.5 merge
 2014-08-04 11:51:11 -04:00
Eugene Yokota 3ca919b0bb Merged 0.13.5 to remove documents 2014-08-04 10:14:46 -04:00
eugene yokota 1b89bbf003 Merge pull request #1473 from sbt/wip/resolve-consolidation2 
Improved consolidated resolution testing. #1454
 2014-07-29 21:29:47 -04:00
Josh Suereth e1d79ec27a Merge pull request #1467 from sbt/wip/eviction-warning 
Eviction warnings (Fixes #1200)
 2014-07-29 11:08:42 -04:00
Eugene Yokota a398e7d78f Implements eviction warning stories. #1200 
This implements all stories from https://github.com/sbt/sbt/wiki/User-Stories%3A-Conflict-Warning.
When scalaVersion is no longer effective an eviction warning will display.

    Scala version was updated by one of library dependencies:
        * org.scala-lang:scala-library:2.10.2 -> 2.10.3

When there're suspected incompatibility in directly depended Java libraries,
eviction warnings will display.

   There may be incompatibilities among your library dependencies.
   Here are some of the libraries that were evicted:
      * commons-io:commons-io:1.4 -> 2.4

When there's suspected incompatiblity in directly depended Scala libraries,
eviction warnings will display.

  There may be incompatibilities among your library dependencies.
  Here are some of the libraries that were evicted:
      * com.typesafe.akka:akka-actor_2.10:2.1.4 -> 2.3.4

This also adds 'evicted' task, which displays more detailed eviction warnings.
 2014-07-27 12:26: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 c44ecf514c Merge pull request #1367 from dansanduleac/issue/1366 
Don't update classifiers of projectDependencies
 2014-07-02 10:09:45 -04:00
David Pratt 6319880a9a Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-06-09 13:56:16 -05: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
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 bcf86fcc38 Merge pull request #1396 from skyluc/2.12-support 
Adds support for Scala 2.12
 2014-06-05 16:26:21 -04:00
Josh Suereth 4ff164484e 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 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
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
Josh Suereth 759ead63fc merge with master 2014-06-02 13:44:07 -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 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 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