Commit Graph

1240 Commits

Author SHA1 Message Date
jvican b1e36e50c8
Add review comments and improve docs 2017-05-11 18:10:01 +02:00
jvican 5ff32f2a99
Add a frozen mode to update configuration
The frozen mode is used by the dependency lock file.

It makes sure that the resolution is always intransitive and that ivy
does not check for changed dependencies and stores that information in
the resolved ivy files. Following the ivy documentation, the last change
may bring a slight performance improvement:

http://ant.apache.org/ivy/history/latest-milestone/use/resolve.html
2017-05-11 18:00:24 +02:00
jvican 7391290d8a
Add comments to `SbtChainResolver` implementation 2017-05-10 20:34:41 +02:00
eugene yokota 498367dbf4 Merge pull request #92 from scalacenter/offline-mode
Add offline mode to `UpdateConfiguration`
2017-05-10 14:30:24 -04:00
jvican 57d5908737
Make `SbtChainResolver` readable
This is the most important part of the sbt ivy management and it's
almost unreadable in the previous shape...

This attempts to make a rewrite without any semantic change.
2017-05-10 20:27:53 +02:00
jvican 89b722c132
Update ivy version to include IVY-1515
https://github.com/sbt/ivy/pull/25
2017-05-09 11:02:34 +02:00
jvican 96c775c445
Remove previous custom offline implementation
The previous custom offline implementation was not working on 100% of
the cases and relied on the TTL of ivy. As the previous commit
enabled the native offline implementation provided by ivy as of 2.3.0,
this functionality is not useful anymore.

The current place to specify offline is `UpdateConfiguration`, and not
`InlineIvyConfiguration` that is required to instantiate sbt. With the
current approach, we can be online or offline without having to
instantiate ivy sbt twice.

I will provide a Scalafix rewrite for this change.
2017-05-09 11:02:34 +02:00
jvican 67d9012a17
Add offline mode to `UpdateConfiguration`
The following commit tries to address the well-known issue that sbt
cannot be used in offline mode. In order to enable that use case, this
commit adds support for a flag in update configuration called `offline`
that users can change as they wish (and that sbt will expose via
settings).

It adds tests to check that the resolution uses the caches instead of
trying to resolve from the Internet. Unfortunately, ivy does not expose
a way to know whether a resolution was made from the cache or the
Internet, so the test case invents a metric to check that resolution
indeed happens from cache.

In order to benefit from this 100%, we need to update to ivy 2.4.0 or
cherry-pick a commit because a major issue in `useCacheOnly` has been
fixed: https://issues.apache.org/jira/browse/IVY-1515.

In short, this is good for the dependency lock file too. Since we can
make sure that once we have downloaded and resolved all the dependencies
locally, we do resolve from the cache.
2017-05-09 11:02:34 +02:00
jvican 1a11fd86a3
Disable parallel execution 2017-05-09 11:02:34 +02:00
eugene yokota a3eb9fd1a2 Merge pull request #91 from scalacenter/clean-update
Deduplicate and remove deprecations in `IvyActions`
2017-05-02 12:19:03 -04:00
eugene yokota ec652130f0 Merge pull request #90 from scalacenter/add-parallel-ivy
Fix sbt/sbt#2982: Add a parallel Ivy engine
2017-05-02 12:13:49 -04:00
eugene yokota eaf6af2dc9 Merge pull request #88 from scalacenter/issue/1518
Fix sbt/sbt#1518: Handle cross-versioned exclusions
2017-05-02 12:11:10 -04:00
jvican 0885ae1a96
Add documentation to `updateEither` 2017-04-28 11:28:38 +02:00
jvican 429dd84393
Remove deprecated methods in `IvyActions` 2017-04-28 10:19:12 +02:00
jvican 1f4030ff17
Remove unused apply in `UnresolvedWarning` 2017-04-28 10:19:12 +02:00
jvican c84d297912
Turn `ResolveException` private[sbt]
Plus, remove deprecated method using `ResolveException`.
2017-04-28 10:19:12 +02:00
jvican 258cb7c5ac
Remove unused instance of `retrieve`
This commit removes the second instance of `retrieve` that was private
and unused, therefore reducing the API surface of `IvyActions`.
2017-04-28 10:19:12 +02:00
jvican eea500d64f
Remove coded uplication in `updateEither`
This commit reduces the code duplication in `updateEither` which was
duplicating a good deal of the resolution logic to deal with the
different resolution mechanisms: the simple one and the cached one.

It also unifies the signatures of the helpers that are invoked by
`updateEither`, removing the weirdness of the different return type
signatures and ad-hoc logic handling.
2017-04-28 10:19:11 +02:00
jvican b68498d013
Remove unused arguments in clean and use site
`cleanCachedResolutionCache` and `clean` were doing extra work because
`clean` does only need to clean the cache in the configuration (that is
a class parameter).
2017-04-28 10:19:06 +02:00
jvican 8c993d2d53
Fix sbt/sbt#2982: Add a parallel Ivy engine
This is a port of https://github.com/sbt/sbt/pull/2992.

Original description of the feature:

```
Ivy downloads have traditionally been single-threaded.

Parallel downloads are a must for a modern build tool. This commit
builds upon the work done by Josh Suereth in the branch
sbt/ivy-parallel-download-artifact.

To avoid adding external dependencies, it uses the Scala parallel
collections. If maintainers consider that is worth it to use a more
modern and appropriate approach, like Task, I'm happy to reimplement
the features with it.
```

This commit does not preserve Josh's metadata in the commit since the
whole design of the repository has changed and I did not know how to
import a commit from sbt/sbt. However, it does apply several changes to
the original PR.

Co-authored-by: Josh Suereth <joshua.suereth@gmail.com>
2017-04-27 00:02:37 +02:00
jvican e1d98a1ec2
Fix sbt/sbt#1518: Handle cross-versioned exclusions
The following PR does two things:

* Removes the unnecessary `SbtExclusionRule` that was introduced to
  exclude artifacts at the project level (and not the dependency level).
  This change was done in an independent class to avoid breaking
  bincompat in 0.13.x series.
* Handle exclusion rules correctly, propagating the cross version to the
  exclusions of the dependencies.

To fix sbt/sbt#1518, this PR takes the avenue taken in
`SbtExclusionRule`, it accepts `GroupArtifactID` which should be the
preferred way to specify dependencies from now on. Unlike
`SbtExclusionRule`, it also supports `ModuleID` for those that want to
exclude a concrete dependency.

`InclExcl` did not have any tests. The following commit also adds a
testing suite for it, showing how the issue it's fixed and how you
should use `exclude` if you're calling directly `ExclusionRule` instead
of passing in `GroupArtifactID` and `ModuleID`.
2017-04-26 23:44:14 +02:00
eugene yokota c588869f2e Merge pull request #87 from scalacenter/reformat
Reformat with scalafmt
2017-04-26 17:43:09 -04:00
jvican d42ea869d0
Apply formatting 2017-04-26 22:55:38 +02:00
jvican 712c83f859
Configure scalafmt and disable scalariform 2017-04-26 22:53:17 +02:00
eugene yokota e2ab823c06 Merge pull request #85 from eed3si9n/wip/bumputil2
Bump to util 1.0.0-M23
2017-04-17 13:46:31 -04:00
Eugene Yokota 4b0b3a05f9 Bump to util 1.0.0-M23
I'm now going to use `CacheStore.apply` in `JsonUtil` (used by cached resolution). This gets rid of `fileToStore` parameter from a bunch of classes and simplifies the setup around librarymanagement.
2017-04-17 13:29:02 -04:00
eugene yokota 4e3693179b Merge pull request #84 from dwijnand/expose-more-RichUpdateReport
Expose more in RichUpdateReport
2017-04-13 14:31:48 -04:00
Dale Wijnand 40e34b3e8e
Make RichUpdateReport return Vectors & cuddle sys.error 2017-04-13 10:08:53 +01:00
Dale Wijnand 7f25614d71
Expose more in RichUpdateReport
Fixes #83
2017-04-13 09:28:00 +01:00
Dale Wijnand 153f3837f1 Merge pull request #82 from dwijnand/default-ScmInfo-devConnection
Make ScmInfo devConnection default to None
2017-04-07 17:15:32 +01:00
Dale Wijnand 80715dfb57
Make ScmInfo devConnection default to None 2017-04-05 15:51:36 +01:00
Eugene Yokota 3244e67040 Bump io and util 2017-04-05 00:13:49 -04:00
eugene yokota 6fe4d820ed Merge pull request #81 from eed3si9n/fport/3017
[fport] Fix version parsing
2017-04-04 17:50:58 -07:00
Eugene Yokota 36121bed74 Fix version parsing
Fixes sbt/sbt#3011
2017-04-04 18:34:37 -04:00
eugene yokota a1e7e5713f Merge pull request #80 from eed3si9n/fport/2959
[fport] Maven version range improvement
2017-04-04 14:17:29 -07:00
Eugene Yokota bb258f42a6 Maven version range improvement
Previously, when the dependency resolver (Ivy) encountered a Maven version range such as `[1.3.0,)`
it would go out to the Internet to find the latest version.
This would result to a surprising behavior where the eventual version keeps changing over time
*even when there's a version of the library that satisfies the range condition*.

This changes to some Maven version ranges would be replaced with its lower bound
so that when a satisfactory version is found in the dependency graph it will be used.
You can disable this behavior using the JVM flag `-Dsbt.modversionrange=false`.

Fixes #2954
Ref #2291 / #2953
2017-04-04 16:22:28 -04:00
eugene yokota 728e57827f Merge pull request #79 from eed3si9n/fport/2897
[fport] OverrideScalaMediator, dotty nightly builds
2017-04-04 11:09:25 -07:00
Guillaume Martres 0561c12d19 Fix support for published dotty nightly builds
Dotty nightly builds are published to maven, so they end up in
configuration "default", not "compile". We still need to look into
"compile" when dotty is published locally.

You can test this using https://github.com/smarter/dotty-example-project
by updating the sbt version used in project/build.properties and by
replacing "0.1.1-SNAPSHOT" by a nightly version like
"0.1.1-20170109-be64643-NIGHTLY" in build.sbt
2017-04-04 14:01:42 -04:00
Guillaume Martres 45288b5f80 Avoid NullPointerException in sbt.ScalaOverrideTest 2017-04-04 13:18:46 -04:00
Guillaume Martres 9375c88a8b OverrideScalaMediator: fix bootstrapping a Scala compiler
Fixes #2867, #2896
2017-04-04 13:18:32 -04:00
eugene yokota 9b0818f49a Merge pull request #78 from dwijnand/expose-rich-update-report
Expose RichUpdateReport & DependencyFilter
2017-04-03 22:02:13 -07:00
Dale Wijnand 1afe7114e8
Expose RichUpdateReport enrichment 2017-04-03 12:39:52 +01:00
Dale Wijnand 723abc945f
Overload RichUpdateReport#select instead of using default args 2017-04-03 12:39:39 +01:00
Dale Wijnand cbdbf23127
Expose RichUpdateReport & DependencyFilter
Fixes #42
2017-04-03 12:39:39 +01:00
eugene yokota 9cf41bbf36 Merge pull request #77 from dwijnand/ssh-based-repo-apis
Recover lost ssh-based repo API
2017-03-31 10:20:48 -07:00
eugene yokota fcaea6787f Merge pull request #76 from dwijnand/cross-version-suffix
Allow for some customization in CrossVersion results
2017-03-31 10:20:13 -07:00
Dale Wijnand 084c94a93c
Recover lost ssh-based repo API
Recover APIs I accidentally removed in
f2efa10af1.
2017-03-31 15:02:16 +01:00
Dale Wijnand fb049d181b
Add prefix support to Binary/Full 2017-03-31 10:48:45 +01:00
Dale Wijnand 87e8d87811
Allow for some customization in CrossVersion results
The old way to customize CrossVersion results was a `String => String`
function called 'remapVersion', removed in
301ec787f2.

That was removed because it's not possible to serialise Function1s, and
we want to serialise CrossVersion (and therefore ModuleID, etc) to be
able to transfer them in sbt server.

This commit reintroduces a less-powerful way to vary the results of
apply CrossVersion, but just providing the opportunity to define a
suffix. From looking at the users of CrossVersion (Scala.js'
sbt-scalajs-plugin & Scala Native's sbt-crossproject) this looks to be
sufficient.
2017-03-31 10:24:16 +01:00
Dale Wijnand 92cc7c4cb1
Remove some compile warnings 2017-03-31 10:19:47 +01:00