[2.x] Merge librarymanagement and sbt-coursier #7739
Merged
Conversation
This file contains hidden or 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 `POM_RELEASE_NOTES_KEY`
…repository Add Apache Maven Snapshots Repository
Try resolve sbt plugin from valid Maven pattern
Problem
In sbt 1, platform cross building is implemented using in the user-land
using `%%%` operator, which clevery handles both Scala cross building
and appending platform suffix like sjs1.
However, in general symbolic `%%%` is confusing, and hard to explain.
Solution
In sbt 2, we should subsume the idea of platform cross building,
so `%%` can act as the current `%%%` operator.
This adds a new field called `platformOpt` to `ModuleID`, which
by default will be set to `None`.
`ScalaModuleInfo` will also add a new field called `platform`,
which can be set to `None`, `Some(sjs1)` etc.
As part of module transformation (like adding `_2.13`), the library
management engine can transform `ModuleID` to `sjs1` etc.
`("com.github.scopt" %% "scopt" % "4.1.0").platform(jvm)` will
explicitly use the JVM version of dependency (equivalent to today's `%%`).
Bumps [coursier/setup-action](https://github.com/coursier/setup-action) from 1.3.0 to 1.3.2. - [Release notes](https://github.com/coursier/setup-action/releases) - [Commits](coursier/setup-action@v1.3.0...v1.3.2) --- updated-dependencies: - dependency-name: coursier/setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
We plan to remove IntegrationTest configuration. See https://eed3si9n.com/sbt-drop-custom-config/ for details.
Deprecate IntegrationTest
…ursier/setup-action-1.3.2 Bump coursier/setup-action from 1.3.0 to 1.3.2
**Problem** Coursier bump PR is currently failing due to shading of zstd. **Solution** 1. Rather than updating the shading rule, this excludes zstd out of the transitive since we likely won't need it. 2. Update coursier to 2.1.2.
Update coursier to 2.1.2
Bumps [coursier/setup-action](https://github.com/coursier/setup-action) from 1.3.2 to 1.3.3. - [Release notes](https://github.com/coursier/setup-action/releases) - [Commits](coursier/setup-action@v1.3.2...v1.3.3) --- updated-dependencies: - dependency-name: coursier/setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…ursier/setup-action-1.3.3 Bump coursier/setup-action from 1.3.2 to 1.3.3
These are used by coursier.cache.ArchiveCache, that is unused in sbt-coursier / lm-coursier
Exclude plexus stuff
…ch-version Don't specify a patch version of coursier/setup-action
….5.12 Update sbt-ci-release to 1.5.12
... even if they would result in an incompatible eviction based on the assumed version scheme.
9f54f94 to
0ea422e
Compare
0ea422e to
6c12178
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
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.
For sbt 2.x only, we merge sbt/librarymanagement and coursier/sbt-coursier into sbt main repo.
The repo contains 3 new folders:
lm-core,lm-ivyandlm-coursier.From coursier/sbt-coursier, I removed
sbt-coursierandsbt-lm-coursierbut I kept some of the scripted tests that were not copies ofdependency-management/*. I moved them to sbt-app/src/sbt-test/lm-coursier/* along with other scripted tests. Thelm-coursier/metadatasubmodule is required to run those tests, see scripts/lm-coursier.sh.In the CI workflow, I added job-type 10, which runs the lm-coursier tests and scripted. It runs on ubuntu-latest and windows-latest (about 10 min and 14 min).
Also added a
NOTICEfile for license and copyright.Ping @alexarchambault