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

17940 Commits

Author SHA1 Message Date
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
Josh Suereth e72fbff20a Merge pull request #1695 from kretes/1180-sorted-main-classes 
Fix for sbt#1180 - discovered classes are now sorted
 2014-10-28 13:35:05 -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 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
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
Tomasz Bartczak 96f57f9fcd Fix for sbt#1180 - discovered classes are now sorted 2014-10-27 21:31:03 +01: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 ed0d405371 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 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 467f8187d8 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
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 d2f2d120a9 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 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 5d00a9f5cd merged #1662 2014-10-21 12:18:54 -04:00
Eugene Yokota 14f681e49d merged #1662 2014-10-21 12:18:54 -04:00
Eugene Yokota 97584457fa merged #1662 2014-10-21 12:18:54 -04:00
Josh Suereth 660873d685 Merge pull request #1671 from ajozwik/0.13 
Improve xml handling
 2014-10-20 20:21:09 -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 9723f3f0a1 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 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 1a38b6902e 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
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 01f098cd28 Merge pull request #1680 from sbt/wip/fix-1677 
Fixes #1677. Provide URLSerializer.
 2014-10-18 17:18:05 -04: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 2d3bb4ca75 Fixes #1677. Provide URLSerializer. 
Without this json4s is unable to parse URLs.
 2014-10-18 07:15:52 -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 ba04f7761d 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 052fa13e3f 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 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 adb4dc64e7 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
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 68b3f8d5ed 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 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 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
Eugene Yokota cf4e882ac9 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
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