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

3820 Commits

Author SHA1 Message Date
Josh Suereth c8f2f04dde Merge pull request #1713 from sbt/fix/1710 
Fixes cached resolution mutual eviction (drops slf4j)
 2014-11-03 11:56:51 -05:00
Eugene Yokota 398e15ab63 Fixes #1710. Fixed cached resolution mutual eviction 
When stitching the minigraphs together only exclude the artifacts that
were evicted in *all* graphs, instead of some graphs.
Consider the following scenario:
- Y1 evicts slf4j-api 1.6.6 and picks 1.7.5
- Y2 evicts slf4j-api 1.7.5 and picks 1.6.6
At the root level, we need to use our own judgement and pick 1.7.5.
 2014-11-01 20:50:41 -04:00
Eugene Yokota 97163f0951 rename scripted tests 2014-11-01 20:50:24 -04:00
Josh Suereth 9aacec8918 Bump RC version for release. 2014-10-29 20:13:25 -04:00
Josh Suereth 8ba4f051e0 Merge pull request #1700 from sbt/fix/1699 
Fixes #1699. ignore transitive force during cached resolution
 2014-10-28 22:49:21 -04:00
Eugene Yokota 9482509b32 added comments 2014-10-28 22:31:20 -04:00
Eugene Yokota 6b4ec33ea0 modify test that test transitive force 
This test relies on force having effect transitively for cached
resolution.
 2014-10-28 16:27:55 -04:00
Josh Suereth da880abe51 Merge pull request #1698 from sbt/wip/bc-regression 
Fix BC issue discovered in #1696.
 2014-10-28 14:35:40 -04:00
Eugene Yokota a54777d4f2 Fixes #1699. ignore transitive force during cached resolution 
When Ivy translates pom to ivy.xml, it adds force=“true”.
So when both non-Maven dependencies and Maven dependencies are mixed, Maven dependencies always wins, which is the case for scala-library dependency added by the user.
 2014-10-28 14:28:33 -04:00
eugene yokota ed0f3c9c95 Merge pull request #1694 from sbt/wip/mainClassBreakage 
Fix the run logic so the mainClass setting is actually used when set.
 2014-10-28 10:45:50 -04:00
Josh Suereth fe712173f3 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
Josh Suereth 01550a47be Add automated tests for main-class regression. 2014-10-27 11:53:55 -04:00
Josh Suereth 2d3f57ad51 Fix the run logic so the mainClass setting is actually used when set. 2014-10-25 14:25:30 -04:00
Josh Suereth bfb4351fd7 Fix markdown for code example. 2014-10-24 18:55:00 -04:00
Josh Suereth 62d170f717 Add warning about incompatible parser. 2014-10-24 18:52:12 -04:00
Josh Suereth bd2fef571e Bump version for 0.13.7-RC1 2014-10-24 16:36:05 -04:00
Josh Suereth b834be8bfa Merge pull request #1669 from kretes/1648-warn-about-main-classes 
Fix for https://github.com/sbt/sbt/issues/1648 - warn about multiple or no main classes
 2014-10-23 07:37:07 -04:00
Josh Suereth 2ce85b2dcd Merge pull request #1686 from sbt/wip/fix-1684 
Fixes #1684. cached resolution applies overrides on conflict
 2014-10-23 07:35:52 -04:00
Eugene Yokota 65e663ee8e Fixes #1684. cached resolution applies overrides on conflict 
This change brings over dependency overrides to artificial graph.
However, it seems forced might win, so I need to take overrides logic
in account during conflict resolution.
 2014-10-22 19:15:54 -04:00
Eugene Yokota 7827682f41 Remove DefDef and check rhs 
- lhs pattern matching occurs only for vals.
- def also breaks due to proc notation.
- instead of pretty printing, we can just check rhs.
 2014-10-22 19:14:47 -04:00
Tomasz Bartczak 7a1a21d8c8 Fix for sbt#1648 - warn when no or multiple main classes 2014-10-22 22:42:01 +02:00
Eugene Yokota 97584457fa merged #1662 2014-10-21 12:18:54 -04:00
Josh Suereth 577c555d81 Merge pull request #1671 from ajozwik/0.13 
Improve xml handling
 2014-10-20 20:21:09 -04:00
Josh Suereth 2ece67e42f Merge pull request #1683 from sbt/wip/revert-chain-resolver 
Revert chain resolver  by default, for older behavior.
 2014-10-20 16:35:52 -04:00
Josh Suereth 5e0bf71c51 Fix notes with appropriate link. 2014-10-20 12:27:51 -04:00
Josh Suereth c367c83d21 Revert chain resolver by default, for older behavior. 
The issue comes into play where we cannot accurately get a publication date from Maven artifacts, leading to the current
mechanism having undefined behavior and causing other bugs to pop up in resolution.
 2014-10-20 12:26:40 -04:00
andrzej.jozwik@gmail.com 6f9dfcce52 Revert brackets for backward compatibility (binary compatibility), addExplicitXmlContent use pattern matching, splitFile - does not return whitespace statements 2014-10-19 23:54:18 +02:00
Josh Suereth a1644899c7 Merge pull request #1680 from sbt/wip/fix-1677 
Fixes #1677. Provide URLSerializer.
 2014-10-18 17:18:05 -04:00
Eugene Yokota ff18062c86 Fixes #1677. Provide URLSerializer. 
Without this json4s is unable to parse URLs.
 2014-10-18 07:15:52 -04:00
andrzej.jozwik@gmail.com 8c0e400c11 Add ; instead of brackets to xml group 2014-10-17 22:23:20 +02:00
andrzej.jozwik@gmail.com ef74db7319 Revert to previous version. 2014-10-14 11:24:12 +02:00
andrzej.jozwik@gmail.com ddc80357dc Add scala-stm file for unit test. 2014-10-14 08:30:20 +02:00
andrzej.jozwik@gmail.com 50ed84b748 Use original function 2014-10-13 22:53:45 +02:00
andrzej.jozwik@gmail.com f1ab893f98 Fixed #1666 - check from last end of line. 2014-10-13 22:49:26 +02:00
Josh Suereth d7c76aabf1 Merge pull request #1663 from sbt/wip/avoid-deprecated 
enable -deprecation for Scala 2.10
 2014-10-12 12:31:08 -04:00
Josh Suereth 5599b53692 Merge pull request #1653 from sbt/wip/fix-1649 
Fixes #1649. Exclusion rules and other cached resolution fixes
 2014-10-12 12:01:22 -04:00
Eugene Yokota 47583fd2d0 boot package has its own error method 2014-10-10 17:57:08 -04:00
Eugene Yokota c47cbf5d02 Implement configuration.missingOk to fix updateClassifiers 
updateClassifiers sets missingOk to true.
cached resolution wasn’t respecting the looseness.
 2014-10-10 17:25:43 -04:00
Eugene Yokota 3f958a5bce 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 ddf8a173b0 Disable pattern matching in val syntax in sbt 0.13.7. 
Fixes #1661 or at least works around it for now.
 2014-10-10 13:47:02 -04:00
Eugene Yokota 1043d027d0 Make sure all files exist in minigraph. 2014-10-10 06:50:36 -04:00
Eugene Yokota b8873614e0 Use correct stats for cached resolution 2014-10-10 06:40:56 -04:00
Eugene Yokota be763ad655 Make sure IvyAction.update works 2014-10-10 03:20:12 -04:00
Eugene Yokota 8ddff28a9e Fixes #1660 
Provide overloads for transitiveScratch and updateClassifiers that work
with IvyActions.updateEither.
 2014-10-10 00:34:05 -04:00
Josh Suereth e8b91e4e7e Merge pull request #1652 from sbt/wip/disable-new-parser 
Add escape hatch to old parser in case we run into problems.
 2014-10-09 15:13:35 -04:00
Eugene Yokota 09bca754b5 Fixes #1639. Fixes cached resolution interacting with force() 
When conflicts are found for a given module, a forced one
is selected before conflict manager kicks in.
The problem is that DependencyDescriptor seems to mark transitive
forced dependency as forced as well,
so the actual forced dependency are sometimes not prioritized.
To work around this, I’ve introduced a mixin called
SbtDefaultDependencyDescriptor, which carries around ModuleID to detect
direct dependencies.
 2014-10-09 13:11:13 -04:00
Eugene Yokota 54032ddd5f Fixes #1649. Adds exclusion rules into SHA-1 of minigraph path 2014-10-08 17:14:06 -04:00
Josh Suereth 89a3e4982f Add escape hatch to old parser in case we run into problems. 
Just make sure users have the means to still build in case there's any
issues we missed.  This code should be removed in sbt 1.0.
 2014-10-08 15:00:48 -04:00
eugene yokota 32954a959a Merge pull request #1647 from ajozwik/patch-2 
Replace @WarszawScala by @WarsawScala
 2014-10-07 10:29:49 -04:00
Andrzej Jozwik 3fb8d67dd1 Replace @WarszawScala by @WarsawScala 2014-10-07 08:38:07 +02:00