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

3866 Commits

Author SHA1 Message Date
Martin Duhem 38b795534a Add a scripted test that uses macro annotations 2014-12-03 13:21:57 +01:00
Martin Duhem 18c521dd4b Check for null type trees in dependency extraction 
In some cases the dependency extraction may encounter a null `TypeTree`
(eg. arguments of macro annotations that are untyped). In such cases,
we simply ignore the node.

Fixes #1593, #1655.
 2014-11-29 12:17:32 +01:00
eugene yokota d47d0b1463 Merge pull request #1746 from j-keck/fix/filter-hidden-files 
ignore hidden build files from the build.
 2014-11-25 04:49:36 -05:00
j-keck 928de373cd update notes 2014-11-25 09:57:25 +01:00
j-keck 2624e3aad6 add scripted test 2014-11-25 09:54:42 +01:00
j-keck 2e8c98f1a4 filter out hidden files 2014-11-24 06:34:56 +01:00
Josh Suereth 75744746a3 Merge pull request #1744 from eed3si9n/fix/1743 
Fixes #1743. Fixes IndexOutOfBoundsException on Java warning with no position
 2014-11-21 09:10:53 -05:00
Eugene Yokota 8c2149dfb6 Fixes #1743. Fixes IndexOutOfBoundsException on Java warning with no position 
Enbugged in #1702.
The d.getPosition, d.getStartPosition uses -1 as NOPOS value, but they
weren’t being checked.
Added checkNoPos.
 2014-11-20 20:54:06 -05:00
Peter Vlugter 5704e31256 Fix sbinary cache limit when caching doc inputs 
Cache the classpath as Seq[File] rather than String in RawCompileLike.
 2014-11-19 14:41:17 -05:00
Eugene Yokota 416ffa76d1 merge 0.13.7 manually 2014-11-19 14:34:08 -05:00
Eugene Yokota b6a2011734 notes 2014-11-19 01:57:28 -05:00
Eugene Yokota 80b9cd0cc0 notes 2014-11-19 01:55:56 -05:00
Eugene Yokota 37bf97dfce notes 2014-11-19 01:55:07 -05:00
Eugene Yokota 46f7e2d258 notes 2014-11-19 01:53:59 -05:00
Eugene Yokota 48b8b94927 launchconfig 2014-11-19 01:40:59 -05:00
Eugene Yokota 98e241f5a7 notes 2014-11-19 01:25:52 -05:00
Grzegorz Kossakowski b2c2ff698e Merge pull request #1340 from Duhemm/abstract-over-dependency-kind 
Abstract over dependency kind in Analysis
 2014-11-18 16:32:06 +01:00
Martin Duhem 191c3ed675 Use new infrastructure in `AnalysisTest` 
A new infrastructure to register sources and their dependencies has
been introduced in `c09a391`.

This commit brings the required modifications to `AnalysisTest`,
so that it uses it.
 2014-11-18 13:09:07 +01:00
Martin Duhem b1a608cf1d Use new infrastructure in `AnalysisCallback` 
A new infrastructure to register sources and their dependencies has
been introduced in `c09a391`.

This commit brings the required modifications to `AnalysisCallback`,
so that it uses it.
 2014-11-18 13:08:51 +01:00
Martin Duhem c09a3912d1 Implement abstraction over dependency kinds 
This commit implements the abstraction over the dependency kinds and
deprecates the methods that were used to register files and their
dependencies.

Dependencies are now divided into two categories : Internal and
External dependencies. Moreover, each internal or external dependency
has a Context, which describes what introduced the dependency (for
instance, a dependency may be introduced by member reference or by
inheritance).

Dependencies must now be registered using the method `addSource` in
`Analysis` and in `Relations`. This method has the advantage of being
independent from the existing dependency contexts. That is, its
signature does not need to be modified whenever a new dependency
context is introduced.
 2014-11-18 13:07:58 +01:00
eugene yokota f842bee44e Merge pull request #1724 from sbt/fix/1723 
Fixes #1723. classifier-related fixes
 2014-11-12 07:03:37 -05:00
Eugene Yokota cef4479685 Fixes #1723. classifier-related fixes 
- minigraph sha now contains extra attributes from artifacts
- artifacts are merged from different mini graphs (in some cases, this
should result to better resolution than stock ivy)
 2014-11-11 21:15:11 -05:00
Josh Suereth d4a8e4079d Merge pull request #1720 from sbt/fix/1719 
cached resolution: Fixes #1711, #1716, #1719
 2014-11-10 21:06:24 -05:00
Eugene Yokota 867e2b7a18 fixes #1711, #1716. Fixes configuration remapping 
The actual change is one line at line 64. nextConfMap takes dep instead
of dd.
 2014-11-10 01:10:37 -05:00
Eugene Yokota 4fd5d505f1 fixes #1719. cached resolution: fixes handling of classifier and other explicit artifacts 2014-11-09 23:32:03 -05:00
Eugene Yokota a832b4e6db 0.13.7-RC3 2014-11-06 13:56:24 -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 af9e520e28 expand internal dependencies more accurately 2014-11-06 00:28:26 -05:00
Eugene Yokota 760a4ab5d2 Fixes #1704. Fixes cached resolution + module-level exclusions 2014-11-04 19:01:30 -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 c1fc84662f scalariform 2014-11-04 17:48:46 -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
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 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 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
Josh Suereth 5f9f38f300 Fix cross-JDK issues around invalid URIs in JDK6 2014-10-29 21:55:14 -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 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 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 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