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
Josh Suereth 31550c6e81 Merge pull request #1613 from jedesah/topic/remove-warnings 
Remove compiler warnings
 2014-09-24 09:10:35 -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
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 db04fa53be Add warning for bad XML parse of settings file 2014-09-22 10:56:10 -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 7edf77bc28 Additional updates, should be clean now. 2014-09-17 15:24:33 -04:00
Brian Topping 31acddf856 Additional updates, should be clean now. 2014-09-17 15:24:33 -04:00
Josh Suereth bf37f0924d Merge pull request #1590 from jedesah/0.13 
Add developer key
 2014-09-17 10:32:04 -04:00
Josh Suereth c1fd09e6bf Merge pull request #1590 from jedesah/0.13 
Add developer key
 2014-09-17 10:32:04 -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 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
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 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
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 a3ba82c645 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 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 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 53e4bce5e3 Fix obtuse compilation error 2014-09-16 09:26:43 -07:00
Jean-Rémi Desjardins e3975015b8 Fix obtuse compilation error 2014-09-16 09:26:43 -07:00
Jean-Rémi Desjardins 3ad68524cb Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-16 09:20:21 -07:00
Jean-Rémi Desjardins 956c3da82a Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-16 09:20:21 -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 577496b1b6 Expose Ivy's circular dependency check via UpdateOptions 2014-09-16 09:22:21 -04:00
Eugene Yokota fe7a6f6193 Expose Ivy's circular dependency check via UpdateOptions 2014-09-16 09:22:21 -04:00
Jean-Remi Desjardins 29cf4ef814 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 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 b3ef4d1e59 Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-15 22:24:10 -07:00
Jean-Remi Desjardins 4e647ccec4 Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-15 22:24:10 -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 e81e8596b7 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
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 40f3e72ed9 Merge pull request #1596 from sbt/wip/herald 
minor notes changes for herald
 2014-09-15 12:11:25 -04:00
Josh Suereth a27c636a36 Merge pull request #1596 from sbt/wip/herald 
minor notes changes for herald
 2014-09-15 12:11:25 -04: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 46d62074e0 Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-09-15 11:14:13 -04:00
Brian Topping 300bd9a752 Merge remote-tracking branch 'upstream/0.13' into 0.13 2014-09-15 11:14:13 -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 cf48063f2f Untested PR for #485. Unable to test because unable to build 2014-09-15 10:48:47 -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 b8c567d2ce 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 b14415d581 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 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 7ea6f79a8d Merge pull request #1591 from cunei/wip-set-every-1430 
Fix for #1430
 2014-09-12 22:54:29 -04:00