From 8034155c14e3c90e9360a23289ca9eff2cc58298 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Thu, 17 Dec 2020 15:04:43 +0100 Subject: [PATCH] Update test-release.sh script to currently supported versions --- bin/test-release.sh | 6 ++++-- build.sbt | 3 +-- tests/shared/src/test/scala/munit/BaseSuite.scala | 4 +--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bin/test-release.sh b/bin/test-release.sh index f0435114..5acc340b 100755 --- a/bin/test-release.sh +++ b/bin/test-release.sh @@ -9,7 +9,8 @@ coursier resolve \ org.scalameta:munit_2.11:$version \ org.scalameta:munit_2.12:$version \ org.scalameta:munit_2.13:$version \ - org.scalameta:munit_3.0.0-M1:$version \ + org.scalameta:munit_3.0.0-M2:$version \ + org.scalameta:munit_3.0.0-M3:$version \ org.scalameta:munit_0.27:$version \ org.scalameta:munit_native0.4.0-M2_2.11:$version \ org.scalameta:munit_sjs1_2.11:$version \ @@ -19,7 +20,8 @@ coursier resolve \ org.scalameta:munit-scalacheck_2.12:$version \ org.scalameta:munit-scalacheck_2.13:$version \ org.scalameta:munit-scalacheck_0.27:$version \ - org.scalameta:munit-scalacheck_3.0.0-M1:$version \ + org.scalameta:munit-scalacheck_3.0.0-M2:$version \ + org.scalameta:munit-scalacheck_3.0.0-M3:$version \ org.scalameta:munit-scalacheck_native0.4.0-M2_2.11:$version \ org.scalameta:munit-scalacheck_sjs1_2.11:$version \ org.scalameta:munit-scalacheck_sjs1_2.12:$version \ diff --git a/build.sbt b/build.sbt index 35989464..c7e0665f 100644 --- a/build.sbt +++ b/build.sbt @@ -251,8 +251,7 @@ lazy val munitScalacheck = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings( moduleName := "munit-scalacheck", sharedSettings, - libraryDependencies += - "org.scalacheck" %%% "scalacheck" % "1.15.2" + libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.15.2" ) .jvmSettings( sharedJVMSettings diff --git a/tests/shared/src/test/scala/munit/BaseSuite.scala b/tests/shared/src/test/scala/munit/BaseSuite.scala index 6bc8f17b..a72b4134 100644 --- a/tests/shared/src/test/scala/munit/BaseSuite.scala +++ b/tests/shared/src/test/scala/munit/BaseSuite.scala @@ -16,9 +16,7 @@ class BaseSuite extends FunSuite { if (test.tags(NoDotty) && isDotty) { test.tag(Ignore) } else if ( - test.tags(OnlyFromM3) && Set("3.0.0-M1", "3.0.0-M2")( - BuildInfo.scalaVersion - ) + test.tags(OnlyFromM3) && "3.0.0-M2" == BuildInfo.scalaVersion ) { test.tag(Ignore) } else if (test.tags(Only213) && !is213) {