[2.x] Merge develop into wip/sbt-2.x #442
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add predefined list of licenses
Deprecate `sonatypeRepo`, add `sonatypeOssRepos` to `Resolver`
remove bintray resolver
Ref sbt/sbt#6912 Problem ------- There's apparently a security issue with OkHttp 3.x, which I am not really sure how applicable it is to our usage of OkHttp but it is there. Solution -------- Since most of OkHttp-specic usage within LM is for Apache Ivy downloading, I am going to drop this. Since `sbt.librarymanagement.Http.http` is a public API, I am substituting this with Apache HTTP backed implementation.
Drop OkHttp dependency
Add CrossVersionExtra.isBinaryCompatible utility
Problem ------- Current impl is relaxed about comparing non-release Scala 2.x versions. Solutution ---------- Use scalaApiVersion to compare two Scala 2 versions.
Fix isScalaBinaryCompatibleWith
util 1.7.0
Use sbt 1.7.0
Better deprecation message for `sonatypeRepo`
Ivy 2.3.0-sbt-a8f9eb5bf09d0539ea3658a2c2d4e09755b5133e
Bump io, util, and scala-xml
sbt plugins were published to an invalid path with regard to Maven's specifictation. As of sbt 1.9 we produce two POMs, a deprecated one and a new one, that is valid with regard to Maven resolution. When resolving, we first try to resolve the new valid POM and we fallback to the invalid one if needed. In the new POM format, we append the sbt cross-version to all artifactIds of sbt plugins. This is because we want Maven to be able to resolve the plugin and all its dependencies. When parsing it, we remove the cross-version suffix so that the result of parsing the valid POM format is exactly the same as parsing the deprecated POM format. Hence conflict resolution happens as intended. More details can be found at sbt/sbt#7096
fix warnings. `Resolver.sonatypeRepo` => `Resolver.sonatypeOssRepos`
Update jsch to 0.2.17 (switch to the com.github.mwiede fork)
Use 2 for binarySbtVersion in 2.x
Util 1.10.0-RC1
Util 1.10.0
|
|
- regenerate contraband
Closed
|
I cannot run the tests in sbt/sbt#7573 because of eed3si9n/sbt-coursier#1 (comment). So maybe we should merge it, release it, and 🤞. |
|
Thanks for merging! I will need a release of this to pursue the merge in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We will probably need to release this to make sbt/sbt#7554 compile and pass the test.
And we should do the same for Zinc.