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

Fix actions/cross-advanced

This commit is contained in:
Eugene Yokota 2021-02-06 22:36:47 -05:00
parent 587d821828
commit 2fb5b372d5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbt/src/sbt-test/actions/cross-advanced/build.sbt
View File

@ -10,19 +10,19 @@ lazy val root = (project in file("."))
lazy val foo = project
.settings(
crossScalaVersions := Seq("2.12.12", "2.13.1"),
crossScalaVersions := Seq("2.12.13", "2.13.1"),
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.0",
check := {
// This tests that +check will respect bar's crossScalaVersions and not switch
val x = (LocalProject("bar") / scalaVersion).value
assert(x == "2.12.12", s"$x == 2.12.12")
assert(x == "2.12.13", s"$x == 2.12.12")
(Compile / compile).value
},
(Test / testOnly) := {
// This tests that +testOnly will respect bar's crossScalaVersions and not switch
val x = (LocalProject("bar") / scalaVersion).value
assert(x == "2.12.12", s"$x == 2.12.12")
assert(x == "2.12.13", s"$x == 2.12.12")
val _ = (Test / testOnly).evaluated
},
compile2 := {
@ -35,7 +35,7 @@ lazy val foo = project
lazy val bar = project
.settings(
crossScalaVersions := Seq("2.12.12"),
crossScalaVersions := Seq("2.12.13"),
check := (Compile / compile).value,
compile2 := (Compile / compile).value,
)
@ -46,14 +46,14 @@ lazy val baz = project
check := {
// This tests that +baz/check will respect bar's crossScalaVersions and not switch
val x = (LocalProject("bar") / scalaVersion).value
assert(x == "2.12.12", s"$x == 2.12.12")
assert(x == "2.12.13", s"$x == 2.12.13")
(Compile / compile).value
},
)
lazy val client = project
.settings(
crossScalaVersions := Seq("2.12.12", "2.13.1"),
crossScalaVersions := Seq("2.12.13", "2.13.1"),
check := (Compile / compile).value,
compile2 := (Compile / compile).value,
)

2
sbt/src/sbt-test/actions/cross-advanced/test
View File

@ -17,7 +17,7 @@
## test + with command or alias
> clean
## for command cross building you do need crossScalaVerions on root
> set root/crossScalaVersions := Seq("2.12.12", "2.13.1")
> set root/crossScalaVersions := Seq("2.12.13", "2.13.1")
> + build
$ exists foo/target/scala-2.12
$ exists foo/target/scala-2.13