Commit Graph

1507 Commits

Author SHA1 Message Date
Eugene Yokota 0c28db9d21 rename to DependencyResolutionInterface 2017-07-15 11:17:23 -04:00
Eugene Yokota 358b750dde turn back syntax classes into traits 2017-07-15 11:17:23 -04:00
Eugene Yokota 7844190964 Use delegation instead of inheritance 2017-07-15 11:17:23 -04:00
Eugene Yokota a98c5f4c65 Minor cleanups per review 2017-07-15 11:17:23 -04:00
Eugene Yokota 7b22e78fd9 Library management API
This splits the core of LM and Ivy-based implementation.

- InlineConfiguration is renamed to ModuleConfiguration
- IvyScala is renamed to ScalaModuleInfo
- UpdateConfiguration, RetrieveConfiguration, PublishConfiguration are refactored to use builder pattern.
- Adds ConfigRef for referencing Configuration
- Moves syntax related things into `sbt.librarymagement.syntax`
2017-07-15 11:17:23 -04:00
eugene yokota 0243eb7492 Merge pull request #129 from eed3si9n/wip/macrofix
Expose Configuration factory
2017-07-15 11:14:14 -04:00
Eugene Yokota f8c656e74d Expose Configuration factory
apply was hidden, so the config macro failed outside of sbt package.
2017-07-15 09:55:33 -04:00
Dale Wijnand f8d3718d28 Merge pull request #113 from eed3si9n/wip/config
define def config(...) as a macro to capture the Scala identifier
2017-07-10 10:02:19 +01:00
Eugene Yokota 13e803d199 Use ConfigRef in reports 2017-07-08 16:10:09 +02:00
Eugene Yokota 9f2f700762 Define ConfigRef and use it in Artifact 2017-07-08 13:01:59 +02:00
Eugene Yokota bc0ed18308 define def config(...) as a macro to capture the Scala identifier 2017-07-08 11:14:37 +02:00
Dale Wijnand f3c0eb2e58 Merge pull request #126 from dwijnand/travis-ci
Bump Scala versions & add caching to .travis.yml
2017-07-07 09:54:27 +01:00
Dale Wijnand dddfa251c7
Bump Scala versions & add caching to .travis.yml 2017-07-06 15:01:04 +01:00
Dale Wijnand 74d8a3835d Merge pull request #122 from dwijnand/detangle
Detangle the dependencies
2017-07-06 14:59:12 +01:00
Eugene Yokota e3891c8732
Bumping up the threshold for offline mode test
Travis CI keeps failing on OfflineModeSpec, so I am going to bump up the threshold.
2017-07-06 14:49:04 +01:00
Dale Wijnand 178b079f40
No sbt-doge in sbt 1, switch back to + 2017-07-06 14:30:06 +01:00
Dale Wijnand 22df64365b
Replace util-collection dep with util-position
With Position being extracted to its own dependency we can drop this
dependency, allowing util-collection to move (back) to sbt/sbt!
2017-07-06 14:30:06 +01:00
Dale Wijnand a375f57101
Mini cleanup JsonUtil 2017-07-06 14:30:06 +01:00
Dale Wijnand f255894413
Drop RepositoriesParser & therefore util-completion
This code originates from a PR against sbt 0.13:
https://github.com/sbt/sbt/pull/2576

The sbt/librarymanagement part was forward-ported to
sbt/librarymanagement and merged, while the sbt/sbt part wasn't.

So let's get rid of this so we can drop the dependency on
util-completion.
2017-07-06 14:30:05 +01:00
Dale Wijnand 85cfe4d78c
Drop util-testing 2017-07-06 14:30:05 +01:00
Dale Wijnand f5d66db0a6
Format the build 2017-07-06 14:02:04 +01:00
eugene yokota 4074e283d3 Merge pull request #119 from eed3si9n/wip/bumputil3
bump util and contraband to the latest
2017-07-01 19:57:59 -04:00
Eugene Yokota 4ac724e529 bump to sbt-contraband 0.3.0-M7 and latest util 2017-07-01 19:44:49 -04:00
Eugene Yokota e8d5bcc600 bump sjson-new to latest 2017-07-01 19:16:16 -04:00
Eugene Yokota e4c1a1c559 Adjust to util bump 2017-07-01 19:16:16 -04:00
eugene yokota 11f9dc6534 Merge pull request #121 from dwijnand/cross-version-aliases
Add CrossVersion val/type compat aliases & .disabled
2017-07-01 16:44:52 -04:00
Dale Wijnand 9d9e8112df
Add CrossVersion val/type compat aliases & .disabled
To ease migrating code from sbt 0.13 to sbt 1 this introduces val and
type aliases to CrossVersion's companion object (via
CrossVersionFunctions).

In addition, for consistency, it introduces CrossVersion.disabled.
2017-06-30 14:55:08 +01:00
Dale Wijnand eef8c11ca8 Merge pull request #120 from eed3si9n/wip/fixtostring
Fix toString
2017-06-30 10:21:29 +01:00
Eugene Yokota 31d519a003 Fix toString 2017-06-30 04:46:54 -04:00
Dale Wijnand 7e87603b5f Merge pull request #6 from jozic/updateoptions-tostring
add toString to UpdateOptions
2017-06-27 15:55:05 +01:00
Dale Wijnand 8782c40a22 Merge pull request #117 from smarter/add-constant
Add constant CrossVersion
2017-06-27 15:52:59 +01:00
Guillaume Martres f325d466de Add tests for CrossVersion.constant 2017-06-23 16:50:29 +02:00
Guillaume Martres aaf471dd36 Add constant CrossVersion
sbt 1 removes CrossVersion.binaryMapped which was used in the sbt-dotty
plugin to provide a way to depend on Scala 2.x artifacts in a project
that cross-compiles between Scala 2.x and Dotty (see `withDottyCompat()` in
https://github.com/lampepfl/dotty/blob/master/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala).

Using `binaryWith` is not enough because it only allows the user to
specify a prefix and a suffix for the binary version which will always
be set to `scalaBinaryVersion`. This commit introduces a new `Constant`
kind of CrossVersion which allows the user to specify any string he
wants as a cross-version, thus making it possible to port
`withDottyCompat()` to sbt 1.
2017-06-23 16:24:48 +02:00
eugene yokota 0bb1aa7120 Merge pull request #114 from eed3si9n/wip/sbt_bump
Bump to sbt 1.0.0-M6
2017-06-17 02:32:50 -04:00
Eugene Yokota 60e1eb6275 Bump to sbt 1.0.0-M6 2017-06-17 02:19:37 -04:00
eugene yokota ffd165c6cc Merge pull request #112 from dwijnand/sbt-1-binary-version
Change the sbt API/binary version for sbt 1.x to be 1.0
2017-06-09 22:43:55 -04:00
Dale Wijnand e45d9a254b
Switch version patterns to Long instead of Int
For sbt/sbt#3011 reasons.
2017-06-09 15:36:06 +01:00
Dale Wijnand 039e2e6b6a
Change the sbt API/binary version for sbt 1.x to be 1.0 2017-06-09 12:17:46 +01:00
Dale Wijnand f98ee86668
Clarify NonRelease variants in CrossVersion 2017-06-09 12:17:42 +01:00
Dale Wijnand 1bbc4719c6
Cleanup CrossVersion code & tests 2017-06-09 11:47:38 +01:00
eugene yokota 46cc7055b1 Merge pull request #111 from eed3si9n/wip/null
Guard ManagedChecksums setting retrieval
2017-05-30 00:45:13 -04:00
Eugene Yokota 128798247c Guard ManagedChecksums setting retrieval
This setting doesn't exist for ivysettings.xml, which then causes null problem.

Fixes sbt/librarymanagement#110
2017-05-30 00:32:44 -04:00
eugene yokota fae2b0de51 Merge pull request #105 from scalacenter/managed-checksums
Implement `managedChecksums` in ivy
2017-05-27 18:01:57 -04:00
jvican 9d0dfce869
Move checksum to artifact
This is a more elegant solution than before since module IDs can bring
different artifacts (in updateClassifiers, for instance).
2017-05-27 23:48:21 +02:00
eugene yokota be972124c6 Merge pull request #107 from eed3si9n/fport/3202
[fport] Improve the eviction warning presentation
2017-05-27 00:19:34 -04:00
eugene yokota 5558a13cd4 Merge pull request #106 from eed3si9n/fport/3152
[fport] Fix default scalaBinaryVersion for Dotty
2017-05-27 00:19:20 -04:00
Eugene Yokota 182b50a12b Improve the eviction warning presentation.
Fixes sbt/sbt#2699

Before:

    [warn] There may be incompatibilities among your library dependencies.
    [warn] Here are some of the libraries that were evicted:
    [warn]  * com.google.code.findbugs:jsr305:2.0.1 -> 3.0.0
    [warn] Run 'evicted' to see detailed eviction warnings

After:

    [warn] Found version conflict(s) in library dependencies; some are suspected to be binary incompatible:
    [warn]
    [warn] 	* com.typesafe.akka:akka-actor_2.12:2.5.0 is selected over 2.4.17
    [warn] 	    +- de.heikoseeberger:akka-log4j_2.12:1.4.0            (depends on 2.5.0)
    [warn] 	    +- com.typesafe.akka:akka-parsing_2.12:10.0.6         (depends on 2.4.17)
    [warn] 	    +- com.typesafe.akka:akka-stream_2.12:2.4.17 ()       (depends on 2.4.17)
    [warn]
    [warn] Run 'evicted' to see detailed eviction warnings
2017-05-26 23:21:33 -04:00
Eugene Yokota 182a07402a update EvictionWarningSpec 2017-05-26 23:07:25 -04:00
Eugene Yokota a50f96c7c4 change EvictionWarningOptions.default
Fixes sbt/sbt#3171

change EvictionWarningOptions.default to include transitive evictions and caller info.
2017-05-26 22:53:07 -04:00
Guillaume Martres 87a53986e3 Fix default scalaBinaryVersion for Dotty
Dotty is versioned as 0.*, but `CrossVersionUtil#binaryScalaVersion`
will return the full version instead of just `major.minor` for all
compiler versions < 2.10, add a special case for Dotty to avoid this.
2017-05-26 22:11:51 -04:00