Commit Graph

17940 Commits

Author SHA1 Message Date
Eugene Yokota a832b4e6db 0.13.7-RC3 2014-11-06 13:56:24 -05:00
Josh Suereth 4529dc501d Merge pull request #1715 from sbt/fix/1711
Fixes #1711 and #1704. Cached resolution fixes
2014-11-06 07:45:54 -05:00
Josh Suereth 608273a428 Merge pull request #1715 from sbt/fix/1711
Fixes #1711 and #1704. Cached resolution fixes
2014-11-06 07:45:54 -05:00
Josh Suereth aae0f6ef40 Merge pull request #1715 from sbt/fix/1711
Fixes #1711 and #1704. Cached resolution fixes
2014-11-06 07:45:54 -05:00
Eugene Yokota 05eab70210 expand internal dependencies more accurately 2014-11-06 00:28:26 -05:00
Eugene Yokota af9e520e28 expand internal dependencies more accurately 2014-11-06 00:28:26 -05:00
Eugene Yokota 1f49e6a5ce Fixes #1704. Fixes cached resolution + module-level exclusions 2014-11-04 19:01:30 -05:00
Eugene Yokota 760a4ab5d2 Fixes #1704. Fixes cached resolution + module-level exclusions 2014-11-04 19:01:30 -05:00
Eugene Yokota b60bd95d73 Fixes #1711. Fixes cached resolution pulling in % "test" from subproj deps 2014-11-04 17:56:34 -05:00
Eugene Yokota ca0f3530f5 Fixes #1711. Fixes cached resolution pulling in % "test" from subproj deps 2014-11-04 17:56:34 -05:00
Eugene Yokota 7f8bbe0193 scalariform 2014-11-04 17:48:46 -05:00
Eugene Yokota c1fc84662f scalariform 2014-11-04 17:48:46 -05:00
Josh Suereth 4815fc6d69 Merge pull request #1713 from sbt/fix/1710
Fixes cached resolution mutual eviction (drops slf4j)
2014-11-03 11:56:51 -05:00
Josh Suereth c8f2f04dde Merge pull request #1713 from sbt/fix/1710
Fixes cached resolution mutual eviction (drops slf4j)
2014-11-03 11:56:51 -05:00
Josh Suereth a9d435664a Merge pull request #79 from stephennancekivell/master
use JAVA_OPTS instead of java_opts.
2014-11-03 11:55:38 -05:00
Stephen Nancekivell 10e95ef240 use JAVA_OPTS instead of java_opts. 2014-11-02 12:52:56 +11:00
Eugene Yokota 4de9c3960d Fixes #1710. Fixed cached resolution mutual eviction
When stitching the minigraphs together only exclude the artifacts that
were evicted in *all* graphs, instead of some graphs.
Consider the following scenario:
- Y1 evicts slf4j-api 1.6.6 and picks 1.7.5
- Y2 evicts slf4j-api 1.7.5 and picks 1.6.6
At the root level, we need to use our own judgement and pick 1.7.5.
2014-11-01 20:50:41 -04:00
Eugene Yokota 398e15ab63 Fixes #1710. Fixed cached resolution mutual eviction
When stitching the minigraphs together only exclude the artifacts that
were evicted in *all* graphs, instead of some graphs.
Consider the following scenario:
- Y1 evicts slf4j-api 1.6.6 and picks 1.7.5
- Y2 evicts slf4j-api 1.7.5 and picks 1.6.6
At the root level, we need to use our own judgement and pick 1.7.5.
2014-11-01 20:50:41 -04:00
Eugene Yokota 97163f0951 rename scripted tests 2014-11-01 20:50:24 -04:00
eugene yokota 35ced948b0 Merge pull request #1709 from sbt/wip/notes-for-javac
Notes about the javac fix.
2014-10-31 16:06:49 -04:00
Josh Suereth 65ff778882 Notes about the javac fix. 2014-10-31 16:04:43 -04:00
eugene yokota c9c2d44900 Merge pull request #1702 from jsuereth/wip/incremental-compiler-javac-cleanup
Create a new API for calling Java toolchains.
2014-10-31 15:31:14 -04:00
eugene yokota aca3130dea Merge pull request #1702 from jsuereth/wip/incremental-compiler-javac-cleanup
Create a new API for calling Java toolchains.
2014-10-31 15:31:14 -04:00
eugene yokota b9964d5153 Merge pull request #1702 from jsuereth/wip/incremental-compiler-javac-cleanup
Create a new API for calling Java toolchains.
2014-10-31 15:31:14 -04:00
Josh Suereth 3876082172 Merge branch 'wip/incremental-compiler-javac-cleanup' of https://github.com/jsuereth/xsbt into wip/incremental-compiler-javac-cleanup 2014-10-31 11:00:35 -04:00
Josh Suereth a2e7b324f3 Fixes for windows.
* Move error parser into its own file.
* Add the ability to parse Windows filenames.
* Remove existence check for the file as a mandatory.
* Add specific test for the parser.
2014-10-31 10:58:51 -04:00
Josh Suereth 80616ea412 Merge pull request #82 from netvl/lines-loop-fix
Fixed incorrect sbtopts lines processing
2014-10-30 20:26:19 -04:00
Josh Suereth 75402b26f2 More fixes from review.
* Fix regex for end of line.
* Rename NewJavaTool and friends to remove the New.
2014-10-30 19:37:22 -04:00
Josh Suereth 8d158e5ab6 TODO cleanups based on @havocp's comments. 2014-10-30 13:28:41 -04:00
Vladimir Matveev 4334c8672d Fixed incorrect sbtopts lines processing
It used `for` loop which is known to work incorrectly with spaces. This
commit changes it to `while read` loop. This allows more complex options
to be specified in sbtopts files.

Fixes #80
2014-10-30 18:08:57 +03:00
Josh Suereth 7c5bf6f5f6 Merge pull request #75 from raboof/remove_unused_variable_mergable
Remove unused variable script_dir
2014-10-30 11:03:05 -04:00
Josh Suereth 08c81aaa91 Merge pull request #78 from rtyley/add-metaspace-support
Use MaxMetaspaceSize rather than MaxPermSize on Java 8
2014-10-30 11:02:44 -04:00
Josh Suereth 5f9f38f300 Fix cross-JDK issues around invalid URIs in JDK6 2014-10-29 21:55:14 -04:00
eugene yokota d6bb793855 Merge pull request #1703 from sbt/wip/merge-0.13.7
Wip/merge 0.13.7
2014-10-29 21:36:36 -04:00
eugene yokota a0fa136630 Merge pull request #1703 from sbt/wip/merge-0.13.7
Wip/merge 0.13.7
2014-10-29 21:36:36 -04:00
eugene yokota 473fc8476d Merge pull request #1703 from sbt/wip/merge-0.13.7
Wip/merge 0.13.7
2014-10-29 21:36:36 -04:00
Josh Suereth 624a74dcd6 Attempt to fix unit test for TravisCI. 2014-10-29 21:15:10 -04:00
Josh Suereth 31088791da Reset sbt version after merge. 2014-10-29 20:33:40 -04:00
Josh Suereth 9aacec8918 Bump RC version for release. 2014-10-29 20:13:25 -04:00
Josh Suereth f0a8f5d44f Create a new API for calling Java toolchains.
* Create a new sbt.compiler.javac package
* Create new interfaces to control running `javac` and `javadoc` whether forked or local.
* Ensure new interfaces make use of `xsbti.Reporter`.
* Create new method on `xsbti.compiler.JavaCompiler` which takes a `xsbti.Reporter`
* Create a new mechanism to parse (more accurately) Warnings + Errors, to distinguish the two.
* Ensure older xsbti.Compiler implementations still succeed via catcing NoSuchMethodError.
* Feed new toolchain through sbt.actions.Compiler API via dirty hackery until we can break things in sbt 1.0
* Added a set of unit tests for parsing errors from Javac/Javadoc
* Added a new integration test for hidden compilerReporter key, including testing threading of javac reports.

Fixes #875, Fixes #1542,  Related #1178 could be looked into/cleaned up.
2014-10-29 20:06:08 -04:00
Josh Suereth 70cdce0830 Create a new API for calling Java toolchains.
* Create a new sbt.compiler.javac package
* Create new interfaces to control running `javac` and `javadoc` whether forked or local.
* Ensure new interfaces make use of `xsbti.Reporter`.
* Create new method on `xsbti.compiler.JavaCompiler` which takes a `xsbti.Reporter`
* Create a new mechanism to parse (more accurately) Warnings + Errors, to distinguish the two.
* Ensure older xsbti.Compiler implementations still succeed via catcing NoSuchMethodError.
* Feed new toolchain through sbt.actions.Compiler API via dirty hackery until we can break things in sbt 1.0
* Added a set of unit tests for parsing errors from Javac/Javadoc
* Added a new integration test for hidden compilerReporter key, including testing threading of javac reports.

Fixes #875, Fixes #1542,  Related #1178 could be looked into/cleaned up.
2014-10-29 20:06:08 -04:00
Josh Suereth 383548dc82 Merge pull request #1700 from sbt/fix/1699
Fixes #1699. ignore transitive force during cached resolution
2014-10-28 22:49:21 -04:00
Josh Suereth a1039ed99a Merge pull request #1700 from sbt/fix/1699
Fixes #1699. ignore transitive force during cached resolution
2014-10-28 22:49:21 -04:00
Josh Suereth 8ba4f051e0 Merge pull request #1700 from sbt/fix/1699
Fixes #1699. ignore transitive force during cached resolution
2014-10-28 22:49:21 -04:00
Eugene Yokota 6052cd65b4 added comments 2014-10-28 22:31:20 -04:00
Eugene Yokota 9482509b32 added comments 2014-10-28 22:31:20 -04:00
Eugene Yokota 6b4ec33ea0 modify test that test transitive force
This test relies on force having effect transitively for cached
resolution.
2014-10-28 16:27:55 -04:00
Josh Suereth b7ebfa332f Merge pull request #1698 from sbt/wip/bc-regression
Fix BC issue discovered in #1696.
2014-10-28 14:35:40 -04:00
Josh Suereth da880abe51 Merge pull request #1698 from sbt/wip/bc-regression
Fix BC issue discovered in #1696.
2014-10-28 14:35:40 -04:00
Eugene Yokota 55fc4a29c1 Fixes #1699. ignore transitive force during cached resolution
When Ivy translates pom to ivy.xml, it adds force=“true”.
So when both non-Maven dependencies and Maven dependencies are mixed, Maven dependencies always wins, which is the case for scala-library dependency added by the user.
2014-10-28 14:28:33 -04:00