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

3739 Commits

Author SHA1 Message Date
Grzegorz Kossakowski 11acbbdc4a Merge pull request #1642 from Duhemm/fix-1640 
Port fix for #1544 from Dependency to ExtractUsedNames
 2014-10-04 11:30:47 +02:00
Martin Duhem 41f07be247 Port fix for #1544 from Dependency to ExtractUsedNames 
The fix for sbt/sbt#1237 was unfortunately not completely correct,
and infinite loops could still occur during the extraction of used
names.

In sbt/sbt#1544, a fix that was robuster and easier to understand
was applied to `/compile/interface/src/main/scala/xsbt/Dependency.scala`
in a similar situation (cyclic chains of original trees in macro
expansions).

This commit ports this fix to `ExtractUsedNames.scala`.

Closes sbt/sbt#1640, sbt/sbt#1610.
 2014-10-03 22:01:49 +02:00
Josh Suereth 02f9e0fd17 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 e452f77b81 Merge pull request #1635 from sbt/wip/fix-1632 
Wip/fix 1632
 2014-10-01 14:50:15 -04:00
Josh Suereth 2b3f34f6f6 Add file existence check for Eugene. 2014-10-01 08:18:09 -04:00
Josh Suereth ef9e88a115 Fix regression where IOExceptions were not caught on trying to access disk. 
Fixes #1632
 2014-10-01 08:04:39 -04:00
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
Andrzej Jozwik a22ffcd8f3 Update to current 0.13.7-SNAPSHOT 
$HOME/.ivy2/local/org.scala-sbt/sbt-launch/ instead of temporary target folder
 2014-09-30 21:29:39 +02: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