From fca2698ba95d90bcdaa6d51c5f99ddf8f0fcf0e8 Mon Sep 17 00:00:00 2001
From: Roland Tritsch <roland@tritsch.email>
Date: Wed, 21 Aug 2024 17:18:08 +0100
Subject: [PATCH 1/2] Fix the sonatypeRepo deprecated warning.

---
 src/sbt-test/scoverage/aggregate-disabled-module/build.sbt    | 2 +-
 src/sbt-test/scoverage/aggregate-only/build.sbt               | 2 +-
 src/sbt-test/scoverage/aggregate/build.sbt                    | 2 +-
 src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt     | 2 +-
 src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt       | 2 +-
 src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt  | 2 +-
 src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt    | 2 +-
 src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt    | 2 +-
 src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt      | 2 +-
 src/sbt-test/scoverage/bad-coverage/build.sbt                 | 2 +-
 src/sbt-test/scoverage/coverage-excluded-files/build.sbt      | 4 ++--
 src/sbt-test/scoverage/coverage-excluded-packages/build.sbt   | 4 ++--
 src/sbt-test/scoverage/coverage-off/build.sbt                 | 2 +-
 src/sbt-test/scoverage/data-dir/build.sbt                     | 2 +-
 src/sbt-test/scoverage/good-coverage/build.sbt                | 2 +-
 src/sbt-test/scoverage/preserve-set/build.sbt                 | 2 +-
 src/sbt-test/scoverage/scala3-bad/build.sbt                   | 2 +-
 .../scoverage/scala3-coverage-excluded-files/build.sbt        | 4 ++--
 .../scoverage/scala3-coverage-excluded-packages/build.sbt     | 2 +-
 src/sbt-test/scoverage/scala3-good/build.sbt                  | 2 +-
 src/sbt-test/scoverage/scalajs/build.sbt                      | 2 +-
 21 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt
index 45dfae25..fc741e47 100644
--- a/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt
+++ b/src/sbt-test/scoverage/aggregate-disabled-module/build.sbt
@@ -12,6 +12,6 @@ lazy val c = project.disablePlugins(ScoverageSbtPlugin)
 
 ThisBuild / resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/aggregate-only/build.sbt b/src/sbt-test/scoverage/aggregate-only/build.sbt
index e148019e..a312bb22 100644
--- a/src/sbt-test/scoverage/aggregate-only/build.sbt
+++ b/src/sbt-test/scoverage/aggregate-only/build.sbt
@@ -35,6 +35,6 @@ lazy val root = (project in file("."))
 
 ThisBuild / resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/aggregate/build.sbt b/src/sbt-test/scoverage/aggregate/build.sbt
index e148019e..a312bb22 100644
--- a/src/sbt-test/scoverage/aggregate/build.sbt
+++ b/src/sbt-test/scoverage/aggregate/build.sbt
@@ -35,6 +35,6 @@ lazy val root = (project in file("."))
 
 ThisBuild / resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt
index 49d93c86..3dc05bc6 100644
--- a/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt
+++ b/src/sbt-test/scoverage/bad-coverage-file-branch/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt
index 66e55557..76a86765 100644
--- a/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt
+++ b/src/sbt-test/scoverage/bad-coverage-file-stmt/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt
index aba950e6..de6ae33a 100644
--- a/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt
+++ b/src/sbt-test/scoverage/bad-coverage-package-branch/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt
index 8afb7d2c..1094fc13 100644
--- a/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt
+++ b/src/sbt-test/scoverage/bad-coverage-package-stmt/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt
index 65588c14..2d59fe2c 100644
--- a/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt
+++ b/src/sbt-test/scoverage/bad-coverage-total-branch/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt
index 323acd62..96a6e724 100644
--- a/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt
+++ b/src/sbt-test/scoverage/bad-coverage-total-stmt/build.sbt
@@ -14,6 +14,6 @@ resolvers ++= {
       .get("plugin.version")
       .map(_.endsWith("-SNAPSHOT"))
       .getOrElse(false)
-  ) Seq(Resolver.sonatypeRepo("snapshots"))
+  ) Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/bad-coverage/build.sbt b/src/sbt-test/scoverage/bad-coverage/build.sbt
index 10f0b40b..15ab2ebc 100644
--- a/src/sbt-test/scoverage/bad-coverage/build.sbt
+++ b/src/sbt-test/scoverage/bad-coverage/build.sbt
@@ -10,6 +10,6 @@ coverageFailOnMinimum := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt
index 1f595f00..40df42bd 100644
--- a/src/sbt-test/scoverage/coverage-excluded-files/build.sbt
+++ b/src/sbt-test/scoverage/coverage-excluded-files/build.sbt
@@ -4,10 +4,10 @@ scalaVersion := "2.13.13"
 
 libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
 
-coverageExcludedFiles := ".*/two/GoodCoverage"
+coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*"
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt
index b87f3382..8a1df74d 100644
--- a/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt
+++ b/src/sbt-test/scoverage/coverage-excluded-packages/build.sbt
@@ -4,10 +4,10 @@ scalaVersion := "2.13.13"
 
 libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
 
-coverageExcludedPackages := "two\\..*"
+coverageExcludedPackages := "two\\..*;three\\..*"
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/coverage-off/build.sbt b/src/sbt-test/scoverage/coverage-off/build.sbt
index d7a52356..8c0581ba 100644
--- a/src/sbt-test/scoverage/coverage-off/build.sbt
+++ b/src/sbt-test/scoverage/coverage-off/build.sbt
@@ -15,6 +15,6 @@ coverageFailOnMinimum := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/data-dir/build.sbt b/src/sbt-test/scoverage/data-dir/build.sbt
index 56753f62..87dc5e73 100644
--- a/src/sbt-test/scoverage/data-dir/build.sbt
+++ b/src/sbt-test/scoverage/data-dir/build.sbt
@@ -12,6 +12,6 @@ coverageFailOnMinimum := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/good-coverage/build.sbt b/src/sbt-test/scoverage/good-coverage/build.sbt
index d7a52356..8c0581ba 100644
--- a/src/sbt-test/scoverage/good-coverage/build.sbt
+++ b/src/sbt-test/scoverage/good-coverage/build.sbt
@@ -15,6 +15,6 @@ coverageFailOnMinimum := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/preserve-set/build.sbt b/src/sbt-test/scoverage/preserve-set/build.sbt
index eb97e244..30c2c3c1 100644
--- a/src/sbt-test/scoverage/preserve-set/build.sbt
+++ b/src/sbt-test/scoverage/preserve-set/build.sbt
@@ -34,7 +34,7 @@ checkScoverageEnabled := {
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
 
diff --git a/src/sbt-test/scoverage/scala3-bad/build.sbt b/src/sbt-test/scoverage/scala3-bad/build.sbt
index 1eebd0b6..14d9917f 100644
--- a/src/sbt-test/scoverage/scala3-bad/build.sbt
+++ b/src/sbt-test/scoverage/scala3-bad/build.sbt
@@ -12,6 +12,6 @@ coverageEnabled := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt
index 1bf9ac1a..0fa54581 100644
--- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt
+++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/build.sbt
@@ -4,10 +4,10 @@ scalaVersion := "3.4.2"
 
 libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test
 
-coverageExcludedFiles := ".*/two/GoodCoverage;.*/three/GoodCoverage"
+coverageExcludedFiles := ".*\\/two\\/GoodCoverage;.*\\/three\\/.*"
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt
index dfd5b302..7a43f4c0 100644
--- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt
+++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/build.sbt
@@ -8,6 +8,6 @@ coverageExcludedPackages := "two\\..*;three\\..*"
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/scala3-good/build.sbt b/src/sbt-test/scoverage/scala3-good/build.sbt
index 11e62df8..cd033fc1 100644
--- a/src/sbt-test/scoverage/scala3-good/build.sbt
+++ b/src/sbt-test/scoverage/scala3-good/build.sbt
@@ -15,6 +15,6 @@ coverageFailOnMinimum := true
 
 resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }
diff --git a/src/sbt-test/scoverage/scalajs/build.sbt b/src/sbt-test/scoverage/scalajs/build.sbt
index c8af3188..f757ffb4 100644
--- a/src/sbt-test/scoverage/scalajs/build.sbt
+++ b/src/sbt-test/scoverage/scalajs/build.sbt
@@ -16,6 +16,6 @@ lazy val crossJVM = cross.jvm
 
 ThisBuild / resolvers ++= {
   if (sys.props.get("plugin.version").exists(_.endsWith("-SNAPSHOT")))
-    Seq(Resolver.sonatypeRepo("snapshots"))
+    Resolver.sonatypeOssRepos("snapshots")
   else Seq.empty
 }

From a059af353eb5a16f1e8ded35c6aa100c078662c0 Mon Sep 17 00:00:00 2001
From: Roland Tritsch <roland@tritsch.email>
Date: Wed, 21 Aug 2024 17:19:08 +0100
Subject: [PATCH 2/2] Make tests more comprehensive.

---
 src/sbt-test/scoverage/coverage-excluded-files/test           | 2 ++
 src/sbt-test/scoverage/coverage-excluded-packages/test        | 2 ++
 src/sbt-test/scoverage/scala3-coverage-excluded-files/test    | 4 +++-
 src/sbt-test/scoverage/scala3-coverage-excluded-packages/test | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/sbt-test/scoverage/coverage-excluded-files/test b/src/sbt-test/scoverage/coverage-excluded-files/test
index 7822d7ab..73b1427d 100644
--- a/src/sbt-test/scoverage/coverage-excluded-files/test
+++ b/src/sbt-test/scoverage/coverage-excluded-files/test
@@ -4,4 +4,6 @@
 > test
 > coverageReport
 # There should be no directory for the excluded files
+$ exists target/scala-2.13/scoverage-report/GoodCoverage.scala.html
 -$ exists target/scala-2.13/scoverage-report/two
+-$ exists target/scala-2.13/scoverage-report/three
diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/test b/src/sbt-test/scoverage/coverage-excluded-packages/test
index 72f81f6c..6e9c114f 100644
--- a/src/sbt-test/scoverage/coverage-excluded-packages/test
+++ b/src/sbt-test/scoverage/coverage-excluded-packages/test
@@ -4,4 +4,6 @@
 > test
 > coverageReport
 # There should be no directory for the excluded package
+$ exists target/scala-2.13/scoverage-report/GoodCoverage.scala.html
 -$ exists target/scala-2.13/scoverage-report/two
+-$ exists target/scala-2.13/scoverage-report/three
diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test
index 08688334..6b515726 100644
--- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/test
+++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/test
@@ -4,4 +4,6 @@
 > test
 > coverageReport
 # There should be no directory for the excluded files
--$ exists target/scala-3.4.2/scoverage-report/two
\ No newline at end of file
+$ 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
diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test
index e611b048..13dcccc4 100644
--- a/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test
+++ b/src/sbt-test/scoverage/scala3-coverage-excluded-packages/test
@@ -4,4 +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