80db26bc20
Fixes #1634 . Adds inconsistent duplicate warning
...
#1634 is about a library getting wiped out of deps graph when it’s
included twice in ascending order of version.
I’d say that’s a logically inconsistent state, and we should just issue
warning instead of trying to fix it.
2014-12-14 07:52:05 -05:00
ccef278865
'evicted' task to display all evictions
2014-12-12 23:30:05 -05:00
2ad07027e4
Merge pull request #1772 from sbt/wip/notes
...
Notes
2014-12-12 23:01:05 -05:00
08e9230aeb
Fixes #1615 . Move the invocation of eviction warning.
...
This moves the invocation of eviction warning so it’s called only when
actual ivy update is being performed.
2014-12-12 17:46:19 -05:00
8b23703081
Merge pull request #1765 from ajozwik/0.13
...
Rollback xml parsing work-around
2014-12-12 12:14:31 -05:00
ca6b138a68
Fixes #1620 . Fixes Set[ModuleID] serialization that broke update cache.
2014-12-08 09:27:56 -05:00
bbe3ebf940
Merge pull request #1748 from sbt/wip/1748
...
excludeDependencies: excludeAll at the project level
2014-12-05 09:06:09 -05:00
7d88a10ded
Merge pull request #1741 from ajozwik/0.13
...
Multi imports in one line
2014-12-05 05:28:28 -05:00
12b0fefac5
Merge pull request #1754 from Duhemm/fix-1655
...
Check for null type trees in dependency extraction
2014-12-04 17:57:44 -05:00
5e0085ee49
Adds excludeDependencies. Fixes #1748
...
Adds project-level dependency exclusions:
excludeDependencies += "org.apache.logging.log4j"
excludeDependencies += "com.example" %% "foo"
In the first example, all artifacts from the organization
`"org.apache.logging.log4j"` are excluded from the managed dependency.
In the second example, artifacts with the organization `"com.example"`
and the name `"foo"` cross versioned to the current `scalaVersion` are
excluded.
2014-12-04 17:35:30 -05:00
987af0099c
Merge pull request #1752 from sbt/wip/1752
...
Cached resolution is too verbose
2014-12-04 17:09:34 -05:00
5cace88095
Fixes #1752 . Fixes cached resolution too verbose.
...
- Fixes cached resolution being too verbose
- Adds new UpdateLogging named "Default"
- When global logLevel or logLevel in update is Debug, Default will
bump up to Full UpdateLogging.
2014-12-04 12:34:30 -05:00
e0e7fd002c
Minor code cleanup
2014-12-03 09:56:34 -08:00
a2018b3a11
Merge pull request #1714 from sbt/wip/bytecode-enhancement
...
Expose mechanism whereby bytecode enhancement can be run *before* saving incremental compiler hashes.
2014-12-03 08:46:52 -05:00
0708f0188e
Merge pull request #1736 from Duhemm/dependency-kind-compile
...
Abstract over dependency kind in Compile
2014-12-02 16:00:22 +01:00
cfe91eefd0
merge 0.13.7 manually
2014-11-19 14:34:08 -05:00
57c0f05a5a
Merge pull request #1340 from Duhemm/abstract-over-dependency-kind
...
Abstract over dependency kind in Analysis
2014-11-18 16:32:06 +01:00
2e9cd6c184
Merge pull request #1724 from sbt/fix/1723
...
Fixes #1723 . classifier-related fixes
2014-11-12 07:03:37 -05:00
813a8ff326
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
b978f8504c
Merge pull request #1720 from sbt/fix/1719
...
cached resolution: Fixes #1711 , #1716 , #1719
2014-11-10 21:06:24 -05:00
78929291c7
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
b57152c77e
fixes #1719 . cached resolution: fixes handling of classifier and other explicit artifacts
2014-11-09 23:32:03 -05:00
608273a428
Merge pull request #1715 from sbt/fix/1711
...
Fixes #1711 and #1704 . Cached resolution fixes
2014-11-06 07:45:54 -05:00
05eab70210
expand internal dependencies more accurately
2014-11-06 00:28:26 -05:00
1f49e6a5ce
Fixes #1704 . Fixes cached resolution + module-level exclusions
2014-11-04 19:01:30 -05:00
b60bd95d73
Fixes #1711 . Fixes cached resolution pulling in % "test" from subproj deps
2014-11-04 17:56:34 -05:00
4815fc6d69
Merge pull request #1713 from sbt/fix/1710
...
Fixes cached resolution mutual eviction (drops slf4j)
2014-11-03 11:56:51 -05:00
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
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
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
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
6052cd65b4
added comments
2014-10-28 22:31:20 -04:00
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
ed0d405371
Merge pull request #1669 from kretes/1648-warn-about-main-classes
...
Fix for https://github.com/sbt/sbt/issues/1648 - warn about multiple or no main classes
2014-10-23 07:37:07 -04:00
467f8187d8
Merge pull request #1686 from sbt/wip/fix-1684
...
Fixes #1684 . cached resolution applies overrides on conflict
2014-10-23 07:35:52 -04:00
d2f2d120a9
Fixes #1684 . cached resolution applies overrides on conflict
...
This change brings over dependency overrides to artificial graph.
However, it seems forced might win, so I need to take overrides logic
in account during conflict resolution.
2014-10-22 19:15:54 -04:00
14f681e49d
merged #1662
2014-10-21 12:18:54 -04:00
660873d685
Merge pull request #1671 from ajozwik/0.13
...
Improve xml handling
2014-10-20 20:21:09 -04:00
9723f3f0a1
Merge pull request #1683 from sbt/wip/revert-chain-resolver
...
Revert chain resolver by default, for older behavior.
2014-10-20 16:35:52 -04:00
1a38b6902e
Revert chain resolver by default, for older behavior.
...
The issue comes into play where we cannot accurately get a publication date from Maven artifacts, leading to the current
mechanism having undefined behavior and causing other bugs to pop up in resolution.
2014-10-20 12:26:40 -04:00
01f098cd28
Merge pull request #1680 from sbt/wip/fix-1677
...
Fixes #1677 . Provide URLSerializer.
2014-10-18 17:18:05 -04:00
2d3bb4ca75
Fixes #1677 . Provide URLSerializer.
...
Without this json4s is unable to parse URLs.
2014-10-18 07:15:52 -04:00
052fa13e3f
Merge pull request #1663 from sbt/wip/avoid-deprecated
...
enable -deprecation for Scala 2.10
2014-10-12 12:31:08 -04:00
adb4dc64e7
Merge pull request #1653 from sbt/wip/fix-1649
...
Fixes #1649 . Exclusion rules and other cached resolution fixes
2014-10-12 12:01:22 -04:00
68b3f8d5ed
Implement configuration.missingOk to fix updateClassifiers
...
updateClassifiers sets missingOk to true.
cached resolution wasn’t respecting the looseness.
2014-10-10 17:25:43 -04:00
cf4e882ac9
enable -deprecation for Scala 2.10
...
Enable -deprecation flag to catch old code being use when we migrate
things.
In this commit I moved error to sys.error.
2014-10-10 15:42:26 -04:00
4ef1c5b4f3
Make sure all files exist in minigraph.
2014-10-10 06:50:36 -04:00
61d7b7e426
Use correct stats for cached resolution
2014-10-10 06:40:56 -04:00
dc2f6e5c55
Make sure IvyAction.update works
2014-10-10 03:20:12 -04:00
1de783aec6
Fixes #1660
...
Provide overloads for transitiveScratch and updateClassifiers that work
with IvyActions.updateEither.
2014-10-10 00:34:05 -04:00
Eugene Yokota
Josh Suereth
Jean-Rémi Desjardins
Grzegorz Kossakowski