[2.x] Merge sbt-projectmatrix #7681
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
I think I screwed up the M1 publishing, since it's missing sbt-launch.jar that sbt extra needs.
intitial import
Add Scala.js support
[CI] Fix wrong hook
move Scala version into row definition
It's a thin layer around custom, but specifically created for cross library building. Ref #2
add crossLibrary
enable org.scalajs.sbtplugin.ScalaJSPlugin
Fix configure function not being called on nativePlatform
sbt 1.9.0
* add java sources folders * add test --------- Co-authored-by: Miguel Villa <miguel.villa@siriusxm.com>
* add test that should fail for module not found * Use axisValues when !autoScalaLibrary --------- Co-authored-by: Miguel Villa <miguel.villa@siriusxm.com>
…on by matrix projects (sbt#89) Add support for non-matrix projects to be aggregated in and depended on by matrix projects
* Fix sbt#90 --------- Co-authored-by: Kizuki Yasue <kizuki-yasue@m3.com>
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: eugene yokota <eed3si9n@gmail.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: eugene yokota <eed3si9n@gmail.com>
adpi2
commented
Sep 17, 2024
Comment on lines
+317
to
+320
| outputPath := { | ||
| val o = outputPath.value | ||
| if nonScalaNorPlatformDirSuffix.nonEmpty then s"$o/$nonScalaNorPlatformDirSuffix" | ||
| else o |
There was a problem hiding this comment.
No need a custom path for platform anymore, it's already in the path by default.
There was a problem hiding this comment.
Js and Native tests are pending
92029e4 to
3fe6144
Compare
adpi2
commented
Sep 17, 2024
| val other = lookupMatrix(ref) | ||
| resolveMatrixAggregate(other, r) | ||
| } ++ nonMatrixAggregate | ||
| val dotSbtMatrix = new java.io.File(".sbt") / "matrix" |
There was a problem hiding this comment.
I wonder if we should change that path to target/matrix.
There was a problem hiding this comment.
Yea, something we can explore post merge I guess. Not sure how IDEs would behave if the base directories get wiped up.
|
Could we keep the git history from the original plz? It's only around 100 commits. |
9241154 to
b59856b
Compare
Here we are |
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.
Fixes #7641