Commit Graph

1507 Commits

Author SHA1 Message Date
eugene yokota 2e46857ae3 Merge pull request #104 from eed3si9n/wip/gigahorse2
use okhttp to download the artifacts
2017-05-26 15:19:16 -04:00
jvican 27bf130853
Move `managedChecksums` to InlineIvyConfiguration
`UpdateOptions` is only meant for user-provided options. Since this
option should not be exposed to users, it's moved to inline ivy
configuration, whose parameters require information about the build and
is usually defined project-wide instead of `Global`-wide.
2017-05-26 20:10:53 +02:00
jvican e3a52c3e1f
Make explicit where we deviate from ivy behaviour 2017-05-26 14:47:01 +02:00
jvican 7bf60557d9
Implement `managedChecksums` in ivy
Managed checksums tells ivy to forget about checking checksums for jar
files and just persist them in the cache.

The user that enables that option will take care of verifying they are
correct.

This is a big deal because:

1. Ivy takes *a lot of time* checking timestamps for big jars, and does
   it sequentially. The user (sbt) can do better by running these checks
   in parallel, speeding up the whole resolution process!
2. The fact that the sha files are not present in the cache means that
   build tools cannot check if a checksum is correct without preprocessing
   the jar.

Note that the user is responsible for keeping the cache consistent. If
the checksum is not correct, the user should report it and overwrite the
checksum file with the valid digest.
2017-05-26 12:43:06 +02:00
jvican 4c8036c7cb
Add `managedChecksums` to `UpdateOptions` 2017-05-26 12:43:06 +02:00
jvican 892f6e3775
Add checksum to ModuleID
A checksum in a `ModuleID` ensures that the checksum of the resolved
module id matches. This checksum check is done at the same time ivy
checks it.
2017-05-26 12:43:05 +02:00
jvican 7500291dfc
Fix bug in updateOptionsFormat 2017-05-26 12:43:05 +02:00
jvican 80ee35b01c
Add custom checksum checks to ivy 2017-05-26 12:42:56 +02:00
Eugene Yokota fd7cec0148 use okhttp to download the artifacts
This adds a custom URLHandler that internally uses Square OkHttp.

Fixes sbt/librarymanagement#95
2017-05-26 04:13:55 -04:00
eugene yokota 4d9013a3a3 Merge pull request #102 from eed3si9n/wip/gigahorse
add Gigahorse
2017-05-25 14:16:56 -04:00
Eugene Yokota dd4b33105b add Gigahorse 2017-05-15 16:34:38 -04:00
eugene yokota 9e799a80f3 Merge pull request #97 from scalacenter/unique-resolvers
Allow to define concrete resolvers for dependencies
2017-05-12 22:57:53 -04:00
jvican 8bb1676e61
Allow to define concrete resolvers for dependencies
Sometimes, for predictability and performance, we may be interested in
specifying the concrete resolver that a `ModuleID` should use.

This patch achieves this by adding a new field to `UpdateOptions` and
then getting this information from the `SbtChainResolver`, that will
select the concrete resolver for a given dependency descriptor.

Why is this useful? Well, two reasons:

* Predictable behaviour. We have the guarantee that an artifact only
  comes from a concrete resolver.
* Resolution speedup. Around 1/3 or 1/2 times faster than normal
  resolution in a moderate test case scenario. If there is a lot of
  latency or network connection is poor, speedups will be higher.

LOGS:

```
NORMAL RESOLUTION TIME 1790
FASTER RESOLUTION TIME 1054
```

```
NORMAL RESOLUTION TIME 2078
FASTER RESOLUTION TIME 1055
```

Lots of projects can benefit from this option, as well as organizations
and companies. This will eventually integrate with the dependency lock
file, but can be used independently of it.
2017-05-12 23:47:05 +02:00
eugene yokota 3b55a30141 Merge pull request #98 from scalacenter/issue-3051
Fix sbt/sbt#2650: Degrade log level and clarify
2017-05-12 13:24:20 -04:00
jvican 92cc5339eb
Fix sbt/sbt#2650: Degrade log level and clarify
To ensure that SNAPSHOTs are always the latest, we go through all the
resolved modules and check their timestamps. Good.

However, if in the process of reparsing/redownloading the module
descriptor we fail (or it's not found in that resolver at all), then we
cannot refresh the resolved module that could have been internalized or
heavily cached in memory by ivy. We do this for correctness.

This patch does two things:

1. Adds more comments.
2. Warns only when there are parsing errors in ivy files.
3. Adds debug info in the rest of the cases.

This removes the pain of seeing `Unable to parse` that could be caused by
other reasons that are not related to parsing at all and which would not
affect the algorithm at hand. For instance, if we get a URLResource,
that's totally fine -- there is no way we could parse the ivy file. Ivy
uses URLResources in several cases where the artifact origin URL is
specified.
2017-05-12 18:56:00 +02:00
eugene yokota ccc63d3ee0 Merge pull request #100 from scalacenter/add-frozen-mode
Add a frozen mode to update configuration
2017-05-12 12:43:24 -04:00
eugene yokota 40fa6dcd3b Merge pull request #96 from scalacenter/sbt-chain-resolver-rewrite
Make `SbtChainResolver` readable
2017-05-12 12:40:26 -04:00
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