Commit Graph

1121 Commits

Author SHA1 Message Date
David Perez 3d3a07ae5c Merge remote-tracking branch 'upstream/0.13' into 0.13 2015-03-25 16:12:54 +01:00
David Perez 84386580f2 Merge remote-tracking branch 'origin/0.13.7' into 0.13 2015-03-25 16:01:15 +01:00
Josh Suereth b4d0feb7da Remove jcenter from generated pom.xml files (like maven central is not there). 2015-03-25 10:18:59 -04:00
eugene yokota 77be2c8d1c Merge pull request #1935 from sbt/wip/nine
Merging 0.13.8 and bumping up to 0.13.9-SNAPSHOT
2015-03-25 06:12:46 -07:00
Josh Suereth 7877723d12 Restore component manager test via stubs. 2015-03-25 08:03:09 -04:00
Josh Suereth df959cf0d4 Migrate to using the sbt/launcher module, rather than having the code embedded.
* Remove launch/* code/tests, as these are in the sbt/launcher project.
* Create a new project which will resolve launcher module from sonatype-snapshots,
  and repackage it for the currently building version of sbt.
* Remove ComponentManagerTest which was relying DIRECTLY on launcher classes.
  We'll need to reconfigure this shortly to enable the tests again.

Remaining TODOs -

* Update resolvers so people can find the launcher.
* Add ComponentManagerTest back.
* Re-publish the sbt-launch.jar in the location it used to be published.
2015-03-24 16:12:51 -04:00
eugene yokota 2c236de02a Merge pull request #1922 from dwijnand/removable
Add -= & --= for settings & tasks, dual of += & ++=.
2015-03-23 22:13:11 -07:00
eugene yokota d73de0305f Merge pull request #1934 from MaxWorgan/0.13
Fixes #1834, `<developers>` section is not rendered correctly in the pom.xml
2015-03-23 12:06:26 -07:00
Max Worgan a50fcab1f8 Inserted brackets to developer xml renders correctly 2015-03-23 14:16:05 +00:00
eugene yokota c0ee4082b9 Merge pull request #1904 from sbt/fix/1763
Use pickler for cached resolution
2015-03-10 08:02:40 -04:00
Eugene Yokota 3afb941ad2 Remove custom picklers
- sbt/serialization supports these
2015-03-09 21:22:58 -04:00
Eugene Yokota 8a0e8ef74e Write JSON to file without String. #1763 2015-03-09 21:22:58 -04:00
Eugene Yokota 936c804c41 Improve caching internal deps. #1763
Some heap optimization during merging too.
YourKit showed that mergeOrganizationArtifactReports takes up huge
amount of heap.
2015-03-09 21:22:58 -04:00
Eugene Yokota b583c031bb OOM handling. #1763 2015-03-09 21:22:58 -04:00
Eugene Yokota 1a65c774c3 Implement pickler for UpdateReport. #1763 2015-03-09 21:22:57 -04:00
eugene yokota 074f0e58d7 Merge pull request #1902 from dwijnand/define-project-settings-with-SettingsDefinition
Define Project.settings with SettingsDefinition.
2015-03-09 10:48:18 -04:00
eugene yokota b002057a29 Merge pull request #1899 from dwijnand/fix/1818/exempt-scala-actors-migration
Exempt scala-actors-migration from version checks.
2015-03-07 16:30:25 -05:00
Dale Wijnand ececf95919 Exempt scala-pickling as well. 2015-03-06 22:29:58 +00:00
eugene yokota 410950bd80 Merge pull request #1760 from sbt/fix/1760
cached resolution: transitive dependency survives even after its caller is evicted
2015-03-06 02:59:15 -05:00
Eugene Yokota 597bcc489d Fixes typo 2015-03-05 17:27:23 -05:00
Dale Wijnand 77898b67bc Exempt scala-actors-migration from version checks.
Fixes #1818.
2015-03-04 07:45:36 +00:00
Eugene Yokota 38a8215ffa Transitively evict modules when callers are evicted. Fixes #1760 2015-03-03 14:58:41 -05:00
eugene yokota d7543f0b91 Merge pull request #1853 from hcoles/0.13
Fix #1368 - getResources should never return null
2015-02-24 22:55:10 -05:00
eugene yokota 849d4edf4e Merge pull request #1873 from sbt/fix/1730c
Fixes #1711, #1730. Cached resolution: fixes internal project
2015-02-24 18:58:47 -05:00
Eugene Yokota b4e6d6d77b Generalize the logic to all config inheritance 2015-02-24 15:00:19 -05:00
Eugene Yokota 23e20f72ba Fixes #1711, #1730. Cached resolution: fixes internal project
Re-fixes cached resolution's internal dependency issue by recursively
calling customResolve instead of including the transitive dependencies
from internal dependencies into your own graph.
Transformation of configuration still happens, but at the level of
resolved graph (UpdateReport), which is much less granular, and
hopefully less error-prone.
2015-02-24 15:00:19 -05:00
eugene yokota f041f4953b Merge pull request #1859 from sbt/wip/publish-status-fix
Fix nightly publishing location by demoting publish-status to ThisBuild
2015-02-18 13:16:04 -05:00
Josh Suereth 00b6363970 Merge pull request #1846 from sschaef/improve-plugins-doc
Fixes #1845. Reformat Scaladoc of `AutoPlugin`
2015-02-17 22:07:39 -05:00
Havoc Pennington 2dc23ecf99 Merge pull request #1858 from sbt/fix/inline-configuration
Adds an hook treating InlineConfigurationWithExcludes structurally
2015-02-17 16:51:42 -05:00
Eugene Yokota 78881eefb3 Adds an hook treating InlineConfigurationWithExcludes structurally 2015-02-13 16:59:20 -05:00
eugene yokota d8d4e99fdf Merge pull request #1842 from sbt/wip/build-fix
Build fix
2015-02-10 14:35:37 -05:00
eugene yokota d0d26bb44b Merge pull request #1841 from sbt/wip/merge-notes
Merging notes
2015-02-03 17:00:09 -05:00
eugene yokota c36ce88b8d Merge pull request #1799 from indrajitr/cross-source
Enable cross-version support for Scala sources.
2015-02-02 13:09:54 -05:00
eugene yokota e23c76fe81 Merge pull request #1787 from xuwei-k/git-clone-depth
specify the "--depth" parameter for efficient when git clone
2015-02-02 10:46:35 -05:00
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