Commit Graph

3732 Commits

Author SHA1 Message Date
Josh Suereth cf6be71e00 Merge pull request #1631 from sbt/wip/cached-resolution
Cached resolution (minigraph caching)
2014-10-01 07:40:57 -04:00
Eugene Yokota 4cd895e92a notes 2014-09-30 21:57:18 -04:00
Eugene Yokota 40b91b5a71 some more minor changes 2014-09-30 18:19:46 -04:00
Eugene Yokota 02249c1382 update deprecation message 2014-09-30 17:48:17 -04:00
Eugene Yokota 6c3b95b23d split up json persistence into JsonUtil.scala 2014-09-30 17:44:56 -04:00
Eugene Yokota 1428a5685d spawn new instance of Ivy during minigraph resolution 2014-09-30 17:30:51 -04:00
Eugene Yokota fe8d290c17 Implemented cached resolution (minigraph caching) 2014-09-29 17:33:37 -04:00
Josh Suereth 2c87a643a4 Merge pull request #1627 from jaceklaskowski/scaladoc-fixes
Small scaladoc fixes
2014-09-29 07:45:12 -04:00
Jacek Laskowski 627956901b Small scaladoc fixes 2014-09-28 23:27:59 +02:00
Josh Suereth bd34aa057a Merge pull request #1621 from tmandke/0.13
propagate pattern descriptorOptional and skipConsistencyCheck
2014-09-26 07:22:47 -04:00
eugene yokota cba192a291 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 ec5dfee517 Fix NPE in ChainrResolver when there is no ivy file for a dependency. 2014-09-25 08:08:26 -04:00
Grzegorz Kossakowski 550f14cbad Merge pull request #1619 from gkossakowski/ClassToAPI-NPE
Use Option.apply instead of Some.apply in ClassToAPI
2014-09-25 09:41:45 +02:00
Tejas Mandke 270246464c propagate pattern descriptorOptional and skipConsistencyCheck 2014-09-24 19:42:15 -07:00
Josh Suereth b09be9bf83 Adding notes for ChainResolver fixes.
Fixes #1611
2014-09-24 18:41:40 -04:00
Josh Suereth d865251686 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
Grzegorz Kossakowski 20f50100be Use Option.apply instead of Some.apply in ClassToAPI
When dealing with Java APIs (Java reflection in case of ClassToAPI), one
should always go through Option.apply that performs null check.

This is supposed to fix NPE reported in #1617. We don't have a reproduction
so this is just an educated guess.
2014-09-24 23:05:52 +02:00
Josh Suereth 5e65beb145 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 e8a2fcc26f Merge pull request #1600 from topping/0.13
PR for #1589
2014-09-24 09:11:57 -04:00
Josh Suereth d2a18926b0 Merge pull request #1613 from jedesah/topic/remove-warnings
Remove compiler warnings
2014-09-24 09:10:35 -04:00
Brian Topping 59ea77e590 Add warning for bad XML parse of settings file 2014-09-22 10:56:10 -04:00
eugene yokota d8c9a1ac08 Merge pull request #1607 from sbt/fix/1598-2
Fix #1598 - Ivy fails to load evicted information.
2014-09-21 20:57:14 -04:00
Josh Suereth 14148c96f7 Fix #1598 - Ivy fails to load evicted information.
Upgrade to a version of ivy 2.3.0 that has a backported fix for conflict resolver.
2014-09-19 13:08:49 -04:00
Brian Topping 31acddf856 Additional updates, should be clean now. 2014-09-17 15:24:33 -04:00
Josh Suereth 3c8893ef2c Merge pull request #1590 from jedesah/0.13
Add developer key
2014-09-17 10:32:04 -04:00
eugene yokota dc077c27ed 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 619536b059 Add notes for this fix. 2014-09-17 10:27:12 -04:00
Josh Suereth 920c875e12 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 161b0b7ca5 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 e3975015b8 Fix obtuse compilation error 2014-09-16 09:26:43 -07:00
Jean-Rémi Desjardins 2eb8fd1b8a Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-16 09:20:21 -07:00
Josh Suereth afd917dac3 Bump to a version of ivy that will not swap in httpclient URL handler.
When ivy finds the httpclient on the classpath, it will silently change
its url handler, and the httpclient in ivy 2.3.x has a few known
issues.
2014-09-16 09:32:19 -04:00
Eugene Yokota fe7a6f6193 Expose Ivy's circular dependency check via UpdateOptions 2014-09-16 09:22:21 -04:00
Jean-Remi Desjardins b1b44f9c3f Change additional constructor to what it should probably be
I am at a total loss for why this is not compiling.
2014-09-15 22:38:44 -07:00
Jean-Remi Desjardins c61ca347cf Add notes 2014-09-15 22:37:35 -07:00
Jean-Remi Desjardins 6985a1266a Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-15 22:24:10 -07:00
Brian Topping ad7d9ce42b Tested PR for #485. Had a hard time squashing this, maybe because I did a merge in between. Sorry about that! 2014-09-15 15:26:45 -04:00
Jean-Rémi Desjardins b754c04a30 Add missing default option 2014-09-15 10:02:08 -07:00
Josh Suereth 2181c60925 Merge pull request #1596 from sbt/wip/herald
minor notes changes for herald
2014-09-15 12:11:25 -04:00
Brian Topping ef3eccf95f Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-09-15 11:14:13 -04:00
Brian Topping b89c49adcb Untested PR for #485. Unable to test because unable to build 2014-09-15 10:48:47 -04:00
eugene yokota 904c8377b1 Merge pull request #1588 from sbt/wip/bump-sbt-version
Bump version for next sbt release.
2014-09-13 15:38:42 -04:00
Eugene Yokota 46af6b5907 notes 2014-09-13 15:37:00 -04:00
Josh Suereth c6036d956a Merge pull request #1591 from cunei/wip-set-every-1430
Fix for #1430
2014-09-12 22:54:29 -04:00
Antonio Cunei 9b94a16b73 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
eugene yokota 4846eb35d5 Merge pull request #1586 from sbt/wip/cross-ivy-maven-issues
Fix ivy-mvn cross-wiring issues
2014-09-12 14:42:39 -04:00
Jean-Rémi Desjardins 880f3733d9 Add constructor to avoid binary compatibility issues 2014-09-11 09:36:37 -07:00
Josh Suereth 6033106a2e Add notes and add note about notes in Contributing. 2014-09-11 11:59:38 -04:00
Grzegorz Kossakowski 7885fd2558 Merge pull request #1572 from Duhemm/textanalysisformat-dependency-kinds
Don't hardcode existing relations in TextAnalysisFormat
2014-09-11 16:55:08 +02:00
Martin Duhem 82152b8905 Don't hardcode existing relations in TextAnalysisFormat
The previous implementation of TextAnalysisFormat contained the list
of all the existing relations that sbt knew of, and used this
information to write to and read from the disk the persisted analyses.

In this knew implementation, TextAnalysisFormat gets from the
Relations object what are the existing relations, and then persists
them to disk.

The previous situation was not optimal since it meant that, in order
to add a new dependency kind, one had to modify both the Relations
and TextAnalysisFormat.

Using this new implementation, no change to TextAnalysisFormat is
required whenever a new dependency kind is added.
2014-09-11 14:45:47 +02:00