Commit Graph

1237 Commits

Author SHA1 Message Date
Josh Suereth af87e08d17 Merge pull request #1807 from indrajitr/deprecated-annotation-fix
Fix params order in `@deprecated`
2015-01-19 08:10:15 -05:00
Indrajit Raychaudhuri c967653442 Fix params order in `@deprecated` 2015-01-17 08:25:57 +05:30
Josh Suereth 4a909eb338 Merge pull request #1804 from sbt/wip/document-inc-features
Add missing notes for enhance bytecode feature.
2015-01-14 16:31:39 -05:00
eugene yokota 087bedb698 Merge pull request #1759 from jedesah/topic/minor_cleanup
Minor code cleanup
2015-01-14 16:13:06 -05:00
eugene yokota 8eabd82b32 Merge pull request #1793 from sbt/wip/aether-resolver
Use Aether for resolving maven dependencies
2015-01-14 15:17:50 -05:00
Josh Suereth a0f6662500 Refactoring code.
* remove debugging statements
* Move each class so it's one name-per-file
* Migrate out of org.apache namespace into sbt.mavenint
2015-01-12 14:48:23 -05:00
Josh Suereth e9085b79d1 Merge pull request #1795 from sbt/wip/aether-resolver-plugin
Turn Aether integration into sbt-maven-resolver
2015-01-12 13:41:59 -05:00
Eugene Yokota a02fe61792 Adjust tests. 2015-01-10 22:55:50 -05:00
Eugene Yokota 7bbacce172 Turn Aether integration into sbt-maven-resolver 2015-01-09 14:36:51 -05:00
Josh Suereth 038fb98c7f Migrate pom extra attributes out of CustomPomParser for deprecation. 2015-01-09 14:14:40 -05:00
Josh Suereth 651f92e40c Appropriately transfer sbt-plugin transitive 'extra attribute' properties.
* Propogate the extra dependnecy attribute out of pom files into Aether
* Use the extra depednency attributes to ensure transitive plugins can be resolved.
* Add TODOs for further cleanup work.
2015-01-09 11:14:27 -05:00
Josh Suereth b93627cd6c Fix upload/copy semantics to handle non-file based uploads. 2015-01-09 11:11:37 -05:00
Josh Suereth 4403863aca Create a new Ivy DependencyResolver which uses Aether.
* Here we wire Aether into the Ivy dependency chain
* Add hooks into Aether to use Ivy's http library (so credentials are configured the same)
* Create the actual Resolver which extracts metadata information from Aether
* Deprecate old Ivy-Maven integrations
* Create hooks in existing Resolver facilities to expose a flag to enable the new behavior.
* Create notes documenting the feature.
* Create a new resolver type `MavenCache` which denotes how to read/write local maven cache metadata
  correctly.  We use this type for publishM2 and mavenLocal.
* Update failing -SNAPSHOT related tests to use new Aether resolver
* Create specification for expected behavior from the new resolvers.

Known to fix #1322, #321, #647, #1616
2015-01-08 08:53:25 -05:00
Josh Suereth 1d68855285 Merge pull request #1634 from sbt/fix/1634
A library is missing from dependencyClasspath if it's added to libraryDependencies twice in ascending order
2014-12-15 16:05:57 -05:00
Josh Suereth 14afe119f5 Merge pull request #1620 from sbt/fix/1620
sbt resolves dependencies every compile when using %% with dependencyOverrides
2014-12-15 16:04:18 -05:00
Josh Suereth 370d672fd9 Merge pull request #1615 from sbt/fix/1615
0.13.6 eviction notices too noisy
2014-12-15 15:13:02 -05:00
Eugene Yokota 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
Eugene Yokota ccef278865 'evicted' task to display all evictions 2014-12-12 23:30:05 -05:00
eugene yokota 2ad07027e4 Merge pull request #1772 from sbt/wip/notes
Notes
2014-12-12 23:01:05 -05:00
Eugene Yokota 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
eugene yokota 8b23703081 Merge pull request #1765 from ajozwik/0.13
Rollback xml parsing work-around
2014-12-12 12:14:31 -05:00
Eugene Yokota ca6b138a68 Fixes #1620. Fixes Set[ModuleID] serialization that broke update cache. 2014-12-08 09:27:56 -05:00
Josh Suereth bbe3ebf940 Merge pull request #1748 from sbt/wip/1748
excludeDependencies: excludeAll at the project level
2014-12-05 09:06:09 -05:00
eugene yokota 7d88a10ded Merge pull request #1741 from ajozwik/0.13
Multi imports in one line
2014-12-05 05:28:28 -05:00
Josh Suereth 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
Eugene Yokota 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
Josh Suereth 987af0099c Merge pull request #1752 from sbt/wip/1752
Cached resolution is too verbose
2014-12-04 17:09:34 -05:00
Eugene Yokota 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
Jean-Rémi Desjardins e0e7fd002c Minor code cleanup 2014-12-03 09:56:34 -08:00
eugene yokota 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
Grzegorz Kossakowski 0708f0188e Merge pull request #1736 from Duhemm/dependency-kind-compile
Abstract over dependency kind in Compile
2014-12-02 16:00:22 +01:00
Eugene Yokota cfe91eefd0 merge 0.13.7 manually 2014-11-19 14:34:08 -05:00
Grzegorz Kossakowski 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
eugene yokota 2e9cd6c184 Merge pull request #1724 from sbt/fix/1723
Fixes #1723. classifier-related fixes
2014-11-12 07:03:37 -05:00
Eugene Yokota 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
Josh Suereth b978f8504c Merge pull request #1720 from sbt/fix/1719
cached resolution: Fixes #1711, #1716, #1719
2014-11-10 21:06:24 -05:00
Eugene Yokota 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
Eugene Yokota b57152c77e fixes #1719. cached resolution: fixes handling of classifier and other explicit artifacts 2014-11-09 23:32:03 -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
Eugene Yokota 05eab70210 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 b60bd95d73 Fixes #1711. Fixes cached resolution pulling in % "test" from subproj deps 2014-11-04 17:56:34 -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
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 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 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
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
Eugene Yokota 6052cd65b4 added comments 2014-10-28 22:31:20 -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
Josh Suereth 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