From 2fb5b372d5c9d4bf8009a4d12253f15469f5eafc Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 6 Feb 2021 22:36:47 -0500 Subject: [PATCH] Fix actions/cross-advanced --- sbt/src/sbt-test/actions/cross-advanced/build.sbt | 12 ++++++------ sbt/src/sbt-test/actions/cross-advanced/test | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sbt/src/sbt-test/actions/cross-advanced/build.sbt b/sbt/src/sbt-test/actions/cross-advanced/build.sbt index 2be408222..0076195d7 100644 --- a/sbt/src/sbt-test/actions/cross-advanced/build.sbt +++ b/sbt/src/sbt-test/actions/cross-advanced/build.sbt @@ -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, ) diff --git a/sbt/src/sbt-test/actions/cross-advanced/test b/sbt/src/sbt-test/actions/cross-advanced/test index 548ea9225..9aabd48d6 100644 --- a/sbt/src/sbt-test/actions/cross-advanced/test +++ b/sbt/src/sbt-test/actions/cross-advanced/test @@ -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