luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7862 from eed3si9n/wip/cross-bug 

Fix ++ with a command argument
This commit is contained in:
eugene yokota 2024-11-03 15:02:47 -05:00 committed by GitHub
parent 658d378513 f8280f14c8
commit f4c2f35961
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/scala/sbt/Cross.scala
View File

@ -122,7 +122,10 @@ object Cross {
.map { case uri ~ seg1 ~ cmd => (uri, seg1, cmd) }
Parser.parse(command, parser) match {
case Right((uri, seg1, cmd)) =>
structure.allProjectRefs.find(p => uri.contains(p.build.toString) && seg1 == p.project) match {
structure.allProjectRefs.find {
case p if uri.isDefined => seg1 == p.project && uri.contains(p.build.toString)
case p => seg1 == p.project
} match {
case Some(proj) => (Seq(proj), cmd)
case _ => (resolveAggregates(extracted), command)
}

6
sbt-app/src/sbt-test/actions/cross-multiproject/test
View File

@ -21,6 +21,12 @@ $ exists sbt-foo/target/scala-2.12
$ exists ref/target/scala-2.12
-$ exists ref/target/scala-2.13
# test safe switching
> clean
> ++ 2.12.20 -v libProj/compile
$ exists lib/target/scala-2.12
-$ exists lib/target/scala-2.13
# Test legacy cross build with command support
# > clean
# > + build