Add Scala 3.3.4 around check to support excluded packages and filenames

README.md

@@ -94,7 +94,7 @@ coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*"
 **NOTE**: The `.scala` file extension needs to be omitted from the
 filename, if one is given.
 
-**NOTE**: These two options only work for Scala2 and Scala 3.4.2+.
+**NOTE**: These two options only work for Scala2, Scala 3.3.4+ and Scala 3.4.2+.
 
 You can also mark sections of code with comments like:
 

src/main/scala/scoverage/ScoverageSbtPlugin.scala

@@ -95,6 +95,7 @@ object ScoverageSbtPlugin extends AutoPlugin {
       .exists {
         case (3, minor) if minor > 4                            => true
         case (3, minor) if (minor == 4 && patch.exists(_ >= 2)) => true
+        case (3, minor) if (minor == 3 && patch.exists(_ >= 4)) => true
         case _                                                  => false
       }
   }

src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/build.sbt

@@ -0,0 +1,13 @@
+version := "0.1"
+
+scalaVersion := "3.3.4"
+
+libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test
+
+coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*"
+
+resolvers ++= {
+  if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
+    Resolver.sonatypeOssRepos("snapshots")
+  else Seq.empty
+}

src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.9.9

src/sbt-test/scoverage/scala3.3.4-coverage-excluded-files/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.3.4-coverage-excluded-files/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.3.4-coverage-excluded-files/src/main/scala/three/GoodCoverage.scala

@@ -0,0 +1,9 @@
+package three
+
+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.3.4-coverage-excluded-files/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.3.4-coverage-excluded-files/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.3.4-coverage-excluded-files/test

@@ -0,0 +1,9 @@
+# run scoverage using the coverage task
+> clean
+> coverage
+> test
+> coverageReport
+# There should be no directory for the excluded files
+$ exists target/scala-3.3.4/scoverage-report/GoodCoverage.scala.html
+-$ exists target/scala-3.3.4/scoverage-report/two
+-$ exists target/scala-3.3.4/scoverage-report/three

src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/build.sbt

@@ -0,0 +1,13 @@
+version := "0.1"
+
+scalaVersion := "3.3.4"
+
+libraryDependencies += "org.scalameta" %% "munit" % "1.0.1" % Test
+
+coverageExcludedPackages := "two\\..*;three\\..*"
+
+resolvers ++= {
+  if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
+    Resolver.sonatypeOssRepos("snapshots")
+  else Seq.empty
+}

src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.9.9

src/sbt-test/scoverage/scala3.3.4-coverage-excluded-packages/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.3.4-coverage-excluded-packages/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.3.4-coverage-excluded-packages/src/main/scala/three/GoodCoverage.scala

@@ -0,0 +1,9 @@
+package three
+
+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.3.4-coverage-excluded-packages/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.3.4-coverage-excluded-packages/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.3.4-coverage-excluded-packages/test

@@ -0,0 +1,9 @@
+# run scoverage using the coverage task
+> clean
+> coverage
+> test
+> coverageReport
+# There should be no directory for the excluded package
+$ exists target/scala-3.3.4/scoverage-report/GoodCoverage.scala.html
+-$ exists target/scala-3.3.4/scoverage-report/two
+-$ exists target/scala-3.3.4/scoverage-report/three