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

519 Commits

Author SHA1 Message Date
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
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
Eugene Yokota 577496b1b6 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 4e647ccec4 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
Josh Suereth a27c636a36 Merge pull request #1596 from sbt/wip/herald 
minor notes changes for herald
 2014-09-15 12:11:25 -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 cf48063f2f Untested PR for #485. Unable to test because unable to build 2014-09-15 10:48:47 -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
Josh Suereth a2a9e8cde8 Merge pull request #1591 from cunei/wip-set-every-1430 
Fix for #1430
 2014-09-12 22:54:29 -04:00
eugene yokota e7de4f3604 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 ad07757087 Add constructor to avoid binary compatibility issues 2014-09-11 09:36:37 -07:00
Grzegorz Kossakowski 4d6de77374 Merge pull request #1572 from Duhemm/textanalysisformat-dependency-kinds 
Don't hardcode existing relations in TextAnalysisFormat
 2014-09-11 16:55:08 +02:00
Grzegorz Kossakowski e151e7a788 Merge pull request #1563 from Duhemm/fix-1544 
Fix #1544 (SO in dependencies extraction with macros and name hashing)
 2014-09-11 13:25:27 +02:00
Jean-Rémi Desjardins c2dd55e5b3 Merge branch 'refs/heads/0.13' into topic/remove-warnings 2014-09-10 23:24:53 -07:00
eugene yokota 5545156fec Merge pull request #1585 from sbt/wip/manual-conscript-generation 
Remove automated conscript generation and only generate on release
 2014-09-11 15:18:31 +09:00
Jean-Rémi Desjardins 4c99188f06 Merge branch '0.13' of github.com:sbt/sbt into 0.13 2014-09-10 22:56:01 -07:00
Jean-Rémi Desjardins ac83ec98f2 Add developers keySetting 
The motivation for this is mainly to avoid having to define a pomExtra to publish to Maven central
 2014-09-10 20:18:28 -07:00