Add support for Scala 3

src/main/scala/scoverage/ScoverageSbtPlugin.scala

@@ -80,6 +80,14 @@ object ScoverageSbtPlugin extends AutoPlugin {
       }
       .getOrElse(false)
 
+  private def isScala3SupportingScoverage(scalaVersion: String) =
+    CrossVersion
+      .partialVersion(scalaVersion)
+      .collect {
+        case (3, minor) if minor >= 2 => true
+      }
+      .getOrElse(false)
+
   private lazy val coverageSettings = Seq(
     libraryDependencies ++= {
       if (coverageEnabled.value && isScala2(scalaVersion.value)) {
@@ -156,14 +164,10 @@ object ScoverageSbtPlugin extends AutoPlugin {
           if (coverageHighlighting.value) Some("-Yrangepos") else None
         ).flatten
       } else if (
-        // TODO this is very temporary until support for this gets merged in.
-        // For now we restrict this to this exact SNAPSHOT version which needs
-        // to be published localled in order to test
-        coverageEnabled.value && scalaVersion.value == "3.1.2-RC1-bin-SNAPSHOT"
+        coverageEnabled.value && isScala3SupportingScoverage(scalaVersion.value)
       ) {
         Seq(
-          "-coverage",
-          s"${coverageDataDir.value.getAbsolutePath()}/scoverage-data"
+          s"-coverage-out:${coverageDataDir.value.getAbsolutePath()}/scoverage-data"
         )
       } else {
         Nil

src/sbt-test/scoverage/scala3-bad/build.sbt

@@ -0,0 +1,17 @@
+version := "0.1"
+
+scalaVersion := "3.2.0-RC1-bin-20220523-6783853-NIGHTLY" // TODO: Should be updated to stable version on 3.2.0-RC1 release
+
+libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
+
+coverageMinimum := 80
+
+coverageFailOnMinimum := true
+
+coverageEnabled := true
+
+resolvers ++= {
+  if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
+    Seq(Resolver.sonatypeRepo("snapshots"))
+  else Seq.empty
+}

src/sbt-test/scoverage/scala3-bad/project/plugins.sbt

@@ -0,0 +1,16 @@
+val pluginVersion = sys.props.getOrElse(
+  "plugin.version",
+  throw new RuntimeException(
+    """|The system property 'plugin.version' is not defined.
+       |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
+  )
+)
+
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
+
+resolvers ++= {
+  if (pluginVersion.endsWith("-SNAPSHOT"))
+    Seq(Resolver.sonatypeRepo("snapshots"))
+  else
+    Seq.empty
+}

src/sbt-test/scoverage/scala3-bad/src/main/scala/BadCoverage.scala

@@ -0,0 +1,10 @@
+object BadCoverage {
+
+  def sum(num1: Int, num2: Int) = {
+    num1 + num2
+  }
+
+  def mult(num1: Int, num2: Int) = {
+    num1 * num2
+  }
+}

src/sbt-test/scoverage/scala3-bad/src/test/scala/BadCoverageSpec.scala

@@ -0,0 +1,10 @@
+import munit.FunSuite
+
+/** Created by tbarke001c on 7/8/14.
+  */
+class BadCoverageSpec extends FunSuite {
+
+  test("BadCoverage should sum two numbers") {
+    assertEquals(BadCoverage.sum(1, 2), 3)
+  }
+}

src/sbt-test/scoverage/scala3-bad/test

@@ -0,0 +1,5 @@
+# run scoverage
+> clean
+> coverage
+> test
+-> coverageReport

src/sbt-test/scoverage/scala3-good/build.sbt

@@ -0,0 +1,21 @@
+version := "0.1"
+
+scalaVersion := "3.2.0-RC1-bin-20220523-6783853-NIGHTLY" // TODO: Should be updated to stable version on 3.2.0-RC1 release
+
+libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
+
+coverageMinimum := 80
+coverageMinimumStmtTotal := 100
+coverageMinimumBranchTotal := 100
+coverageMinimumStmtPerPackage := 100
+coverageMinimumBranchPerPackage := 100
+coverageMinimumStmtPerFile := 100
+coverageMinimumBranchPerFile := 100
+
+coverageFailOnMinimum := true
+
+resolvers ++= {
+  if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
+    Seq(Resolver.sonatypeRepo("snapshots"))
+  else Seq.empty
+}

src/sbt-test/scoverage/scala3-good/project/plugins.sbt

@@ -0,0 +1,16 @@
+val pluginVersion = sys.props.getOrElse(
+  "plugin.version",
+  throw new RuntimeException(
+    """|The system property 'plugin.version' is not defined.
+       |Specify this property using the scriptedLaunchOpts -D.""".stripMargin
+  )
+)
+
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
+
+resolvers ++= {
+  if (pluginVersion.endsWith("-SNAPSHOT"))
+    Seq(Resolver.sonatypeRepo("snapshots"))
+  else
+    Seq.empty
+}

src/sbt-test/scoverage/scala3-good/src/main/scala/GoodCoverage.scala

@@ -0,0 +1,7 @@
+object GoodCoverage {
+
+  def sum(num1: Int, num2: Int) = {
+    if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2
+  }
+
+}

src/sbt-test/scoverage/scala3-good/src/main/scala/two/GoodCoverage.scala

@@ -0,0 +1,9 @@
+package two
+
+object GoodCoverage {
+
+  def sum(num1: Int, num2: Int) = {
+    if (0 == num1) num2 else if (0 == num2) num1 else num1 + num2
+  }
+
+}

src/sbt-test/scoverage/scala3-good/src/test/scala/GoodCoverageSpec.scala

@@ -0,0 +1,19 @@
+import munit.FunSuite
+
+/** Created by tbarke001c on 7/8/14.
+  */
+class GoodCoverageSpec extends FunSuite {
+
+  test("GoodCoverage should sum two numbers") {
+    assertEquals(GoodCoverage.sum(1, 2), 3)
+    assertEquals(GoodCoverage.sum(0, 3), 3)
+    assertEquals(GoodCoverage.sum(3, 0), 3)
+  }
+
+  test("two.GoodCoverage should sum two numbers") {
+    assertEquals(two.GoodCoverage.sum(1, 2), 3)
+    assertEquals(two.GoodCoverage.sum(0, 3), 3)
+    assertEquals(two.GoodCoverage.sum(3, 0), 3)
+  }
+
+}

src/sbt-test/scoverage/scala3-good/test

@@ -0,0 +1,5 @@
+# run scoverage
+> clean
+> coverage
+> test
+> coverageReport