Merge pull request #556 from rolandtritsch/main

Make sure we support patch versions larger than 9
scoverage · Sep 2, 2024 · b15c706 · b15c706
2 parents 8b0f3cc + 7647440
commit b15c706
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/main/scala/scoverage/ScoverageSbtPlugin.scala b/src/main/scala/scoverage/ScoverageSbtPlugin.scala
@@ -89,14 +89,13 @@ object ScoverageSbtPlugin extends AutoPlugin {
       }
 
   private def isScala3SupportingFilePackageExclusion(scalaVersion: String) = {
-    def patch = scalaVersion.split('.').drop(2).headOption
+    def patch = scalaVersion.split('.').map(_.toInt).drop(2).headOption
     CrossVersion
       .partialVersion(scalaVersion)
       .exists {
-        case (3, minor)
-            if minor > 4 || (minor == 4 && patch.exists(_ >= "2")) =>
-          true
-        case _ => false
+        case (3, minor) if minor > 4                            => true
+        case (3, minor) if (minor == 4 && patch.exists(_ >= 2)) => true
+        case _                                                  => false
       }
   }
 

diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-files/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-files/test b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test
@@ -4,6 +4,6 @@
 > test
 > coverageReport
 # There should be no directory for the excluded files
-$ 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