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

1237 Commits

Author SHA1 Message Date
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
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 14f681e49d 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 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 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 01f098cd28 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
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 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
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 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 4ef1c5b4f3 Make sure all files exist in minigraph. 2014-10-10 06:50:36 -04:00
Eugene Yokota 61d7b7e426 Use correct stats for cached resolution 2014-10-10 06:40:56 -04:00
Eugene Yokota dc2f6e5c55 Make sure IvyAction.update works 2014-10-10 03:20:12 -04:00
Eugene Yokota 1de783aec6 Fixes #1660 
Provide overloads for transitiveScratch and updateClassifiers that work
with IvyActions.updateEither.
 2014-10-10 00:34:05 -04:00
Eugene Yokota 832bf601b5 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 c2b4c0ec94 Fixes #1649. Adds exclusion rules into SHA-1 of minigraph path 2014-10-08 17:14:06 -04:00
eugene yokota 855dff21be Merge pull request #1645 from sbt/wip/no-blankies-rebased 
Natural whitespace handling for SBT configuration parser AKA 'no more blankies'
 2014-10-06 14:27:50 -04:00
eugene yokota fe5a09b7ad Merge pull request #1629 from sbt/wip/less-chatty-errors 
Reduce the noise when resolving maven artifacts.
 2014-10-06 13:52:51 -04:00
eugene yokota fab566735d Merge pull request #1644 from sbt/wip/cached-resolution-bug 
[0.13.7] Fixes json serialization turning license into {}.
 2014-10-06 13:52:28 -04:00
Eugene Yokota 7547a70991 Fixed json serialization turning license into {}. 2014-10-05 04:24:22 -04:00
Josh Suereth 9c447246f6 Remove binary compatibility breakages and migrate new parser features into an internal package. 2014-10-03 14:22:51 -04:00
Jean-Remi Desjardins 83cd45d6f1 Change additional constructor to what it should probably be 
I am at a total loss for why this is not compiling.
 2014-10-03 14:22:51 -04:00
Josh Suereth 69faa81a70 Merge pull request #1633 from ajozwik/patch-1 
Update to current 0.13.7-SNAPSHOT
 2014-10-01 16:22:39 -04:00
eugene yokota 8554d11d3d Merge pull request #1635 from sbt/wip/fix-1632 
Wip/fix 1632
 2014-10-01 14:50:15 -04:00
Josh Suereth c84a5e70c7 Add file existence check for Eugene. 2014-10-01 08:18:09 -04:00
Josh Suereth b9dc9f8f4f Fix regression where IOExceptions were not caught on trying to access disk. 
Fixes #1632
 2014-10-01 08:04:39 -04:00
Josh Suereth 1a4dfe1883 Merge pull request #1631 from sbt/wip/cached-resolution 
Cached resolution (minigraph caching)
 2014-10-01 07:40:57 -04:00
Eugene Yokota e58a236c9e some more minor changes 2014-09-30 18:19:46 -04:00
Eugene Yokota 024a99ed07 update deprecation message 2014-09-30 17:48:17 -04:00
Eugene Yokota 428f2a3706 split up json persistence into JsonUtil.scala 2014-09-30 17:44:56 -04:00
Eugene Yokota 04499b98ff spawn new instance of Ivy during minigraph resolution 2014-09-30 17:30:51 -04:00
Eugene Yokota 07b696b395 Implemented cached resolution (minigraph caching) 2014-09-29 17:33:37 -04:00
Josh Suereth 855f1f0c33 Reduce the noise when resolving maven artifacts. 2014-09-29 14:09:35 -04:00
Josh Suereth e96d40ebbd Merge pull request #1621 from tmandke/0.13 
propagate pattern descriptorOptional and skipConsistencyCheck
 2014-09-26 07:22:47 -04:00
eugene yokota 64b17a348c Merge pull request #1618 from sbt/wip/mavne-resolution-woes 
Fix various issues with maven + Ivy
 2014-09-25 11:30:53 -04:00
Josh Suereth 8166c8aa5d Fix NPE in ChainrResolver when there is no ivy file for a dependency. 2014-09-25 08:08:26 -04:00
Tejas Mandke 51f48a8993 propagate pattern descriptorOptional and skipConsistencyCheck 2014-09-24 19:42:15 -07:00
Josh Suereth 7e100a0fe0 Add workaround (and warning message) for when ChainResolver gets a null publication date while we investigate other issues. 
* Attempt to set publication date to last modified time, if the stars align
* Issue warning about undefined resolution behavior otherwise
* Add scripted test which exercises the NPE issue in resolving -SNAPSHOTs.
* Commit scalariform style edit in Act.scala

* After parsing and transforming the pom, check for pub date.
* If we don't have a pub date, try to grab lastModified from the URL
* If we can't do anything, issue a warning about the problem artifact.
 2014-09-24 18:23:15 -04:00
Josh Suereth 704d823849 Fix URL resolver so that we can push Maven artifacts to local maven repositories. 
* Hook "LocalIfFile" repository to also handle publishing
* Add test to ensure mavne publishign works.
 2014-09-24 14:37:26 -04:00
Josh Suereth 305d34d011 Merge pull request #1600 from topping/0.13 
PR for #1589
 2014-09-24 09:11:57 -04:00
Josh Suereth d1d4896c3b Merge pull request #1613 from jedesah/topic/remove-warnings 
Remove compiler warnings
 2014-09-24 09:10:35 -04:00
Brian Topping db04fa53be Add warning for bad XML parse of settings file 2014-09-22 10:56:10 -04:00
Brian Topping 7edf77bc28 Additional updates, should be clean now. 2014-09-17 15:24:33 -04:00
Josh Suereth c1fd09e6bf Merge pull request #1590 from jedesah/0.13 
Add developer key
 2014-09-17 10:32:04 -04:00
eugene yokota 3f7ff9af94 Merge pull request #1602 from sbt/wip/ivy-no-commons-httpclient 
Bump to a version of ivy that will not swap in httpclient URL handler.
 2014-09-17 10:29:06 -04:00
Josh Suereth b187e0f0dc Merge pull request #1601 from sbt/wip/circular 
Expose Ivy's circular dependency check via UpdateOptions
 2014-09-16 18:18:44 -04:00
Jean-Rémi Desjardins 44a51f69cc 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 53e4bce5e3 Fix obtuse compilation error 2014-09-16 09:26:43 -07:00