Merge pull request #554 from jozic/support-3.X.Y-with-Y-less-than-2

Support file and package exclusions for Scala 3.X.Y for Y < 2
scoverage · Aug 26, 2024 · 708823f · 708823f
2 parents 942d544 + 7d71be9
commit 708823f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala
@@ -93,8 +93,10 @@ object ScoverageSbtPlugin extends AutoPlugin {
     CrossVersion
       .partialVersion(scalaVersion)
       .exists {
-        case (3, minor) if minor >= 4 && patch.exists(_ >= "2") => true
-        case _                                                  => false
+        case (3, minor)
+            if minor > 4 || (minor == 4 && patch.exists(_ >= "2")) =>
+          true
+        case _ => false
       }
   }
 

diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt
@@ -1,6 +1,6 @@
 version := "0.1"
 
-scalaVersion := "3.4.2"
+scalaVersion := "3.5.0"
 
 libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
 

diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test
@@ -4,6 +4,6 @@
 > test
 > coverageReport
 # There should be no directory for the excluded package
-$ exists target/scala-3.4.2/scoverage-report/GoodCoverage.scala.html
--$ exists target/scala-3.4.2/scoverage-report/two
--$ exists target/scala-3.4.2/scoverage-report/three
+$ exists target/scala-3.5.0/scoverage-report/GoodCoverage.scala.html
+-$ exists target/scala-3.5.0/scoverage-report/two
+-$ exists target/scala-3.5.0/scoverage-report/three