Update scalatest to 3.2.19 (#1620)

* Applied Scalafix rule(s) https://raw.githubusercontent.com/scalatest/autofix/e4de53fa40fac423bd64d165ff36bde38ce52388/3.1.x/rules/src/main/scala/org/scalatest/autofix/v3_1_x/RewriteDeprecatedNames.scala See https://github.com/scalatest/autofix/blob/master/3.1.x/README.md for details * Update scalatest to 3.2.19 --------- Co-authored-by: Muki Seiler <[email protected]>
sbt · Jul 30, 2024 · 2bfdef1 · 2bfdef1
1 parent 40be500
commit 2bfdef1
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 12 deletions.
diff --git a/build.sbt b/build.sbt
@@ -22,7 +22,7 @@ libraryDependencies ++= Seq(
   "org.apache.ant" % "ant" % "1.10.14",
   // workaround for the command line size limit
   "com.github.eldis" % "tool-launcher" % "0.2.2",
-  "org.scalatest" %% "scalatest" % "3.0.9" % Test
+  "org.scalatest" %% "scalatest" % "3.2.19" % Test
 )
 
 // sbt dependent libraries

diff --git a/src/test/scala/com/typesafe/sbt/packager/FileUtilSpec.scala b/src/test/scala/com/typesafe/sbt/packager/FileUtilSpec.scala
@@ -2,8 +2,10 @@ package com.typesafe.sbt.packager
 
 import org.scalatest._
 import java.nio.file.attribute.PosixFilePermission._
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class FileUtilSpec extends FlatSpec with Matchers {
+class FileUtilSpec extends AnyFlatSpec with Matchers {
 
   "permissions" should "convert octal to symbolic correctly" taggedAs (LinuxTag, WindowsTag) in {
     permissions convert "0000" should be("---------")

diff --git a/src/test/scala/com/typesafe/sbt/packager/StartScriptMainClassConfigSpec.scala b/src/test/scala/com/typesafe/sbt/packager/StartScriptMainClassConfigSpec.scala
@@ -2,8 +2,10 @@ package com.typesafe.sbt.packager
 
 import com.typesafe.sbt.packager.archetypes.scripts._
 import org.scalatest._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class StartScriptMainClassConfigSpec extends WordSpec with Matchers {
+class StartScriptMainClassConfigSpec extends AnyWordSpec with Matchers {
 
   "StartScriptMainClassConfig" should {
 

diff --git a/src/test/scala/com/typesafe/sbt/packager/archetypes/jlink/JlinkSpec.scala b/src/test/scala/com/typesafe/sbt/packager/archetypes/jlink/JlinkSpec.scala
@@ -3,11 +3,12 @@ package com.typesafe.sbt.packager.archetypes.jlink
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Paths}
 
-import org.scalatest.{FlatSpec, Matchers}
 import JlinkPlugin.Ignore.byPackagePrefix
 import JlinkPlugin.javaVersionPattern
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class JlinkSpec extends FlatSpec with Matchers {
+class JlinkSpec extends AnyFlatSpec with Matchers {
   "Ignore.byPackagePrefix()" should "match as expected for sample examples" in {
     byPackagePrefix("" -> "")("foo" -> "bar") should be(true)
 

diff --git a/src/test/scala/com/typesafe/sbt/packager/archetypes/scripts/ScriptUtilsTest.scala b/src/test/scala/com/typesafe/sbt/packager/archetypes/scripts/ScriptUtilsTest.scala
@@ -1,8 +1,9 @@
 package com.typesafe.sbt.packager.archetypes.scripts
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class ScriptUtilsTest extends FlatSpec with Matchers {
+class ScriptUtilsTest extends AnyFlatSpec with Matchers {
   "toLowerCase()" should "convert regular names" in {
     ScriptUtils.toLowerCase("package.TestClass") should be("package.test-class")
   }

diff --git a/src/test/scala/com/typesafe/sbt/packager/docker/DockerApiVersionSpec.scala b/src/test/scala/com/typesafe/sbt/packager/docker/DockerApiVersionSpec.scala
@@ -1,8 +1,10 @@
 package com.typesafe.sbt.packager.docker
 
 import org.scalatest._
+import org.scalatest.diagrams.Diagrams
+import org.scalatest.flatspec.AnyFlatSpec
 
-class DockerApiVersionSpec extends FlatSpec with DiagrammedAssertions {
+class DockerApiVersionSpec extends AnyFlatSpec with Diagrams {
   "DockerApiVersion" should "parse 1.40" in {
     val v = DockerApiVersion.parse("1.40")
     assert(v == Some(DockerApiVersion(1, 40)))

diff --git a/src/test/scala/com/typesafe/sbt/packager/docker/DockerVersionSpec.scala b/src/test/scala/com/typesafe/sbt/packager/docker/DockerVersionSpec.scala
@@ -1,8 +1,10 @@
 package com.typesafe.sbt.packager.docker
 
 import org.scalatest._
+import org.scalatest.diagrams.Diagrams
+import org.scalatest.flatspec.AnyFlatSpec
 
-class DockerVersionSpec extends FlatSpec with DiagrammedAssertions {
+class DockerVersionSpec extends AnyFlatSpec with Diagrams {
   "DockerVersion" should "parse 18.09.2" in {
     val v = DockerVersion.parse("18.09.2")
     assert(v == Some(DockerVersion(18, 9, 2, None)))

diff --git a/src/test/scala/com/typesafe/sbt/packager/linux/LinuxMappingDSLSpec.scala b/src/test/scala/com/typesafe/sbt/packager/linux/LinuxMappingDSLSpec.scala
@@ -2,9 +2,10 @@ package com.typesafe.sbt.packager.linux
 
 import java.io.File
 
-import org.scalatest.{Matchers, WordSpec}
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class LinuxMappingDSLSpec extends WordSpec with Matchers with LinuxMappingDSL {
+class LinuxMappingDSLSpec extends AnyWordSpec with Matchers with LinuxMappingDSL {
 
   "The LinuxMappingDSL" should {
 

diff --git a/src/test/scala/com/typesafe/sbt/packager/universal/ZipHelperSpec.scala b/src/test/scala/com/typesafe/sbt/packager/universal/ZipHelperSpec.scala
@@ -7,8 +7,10 @@ import java.io.File
 import java.nio.file.{Files, Path, Paths}
 import java.nio.file.attribute.PosixFilePermission._
 import scala.collection.JavaConversions._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
 
-class ZipHelperSpec extends WordSpec with Matchers with BeforeAndAfterEach with BeforeAndAfterAll {
+class ZipHelperSpec extends AnyWordSpec with Matchers with BeforeAndAfterEach with BeforeAndAfterAll {
 
   var tmp: Path = _
   val toDelete = scala.collection.mutable.ListBuffer[Path]()