diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a0d3358a83..a66ac9af18 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,6 @@ object Dependencies { import DependencyHelpers._ lazy val scalaTestVersion = settingKey[String]("The version of ScalaTest to use.") - lazy val scalaTestPlusVersion = settingKey[String]("The version of ScalaTestPlus to use.") lazy val scalaCheckVersion = settingKey[String]("The version of ScalaCheck to use.") lazy val java8CompatVersion = settingKey[String]("The version of scala-java8-compat to use.") @@ -39,7 +38,6 @@ object Dependencies { scalaVersion := System.getProperty("akka.build.scalaVersion", crossScalaVersions.value.head), scalaCheckVersion := sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.14.3"), scalaTestVersion := "3.1.0", - scalaTestPlusVersion := "3.1.0.0", java8CompatVersion := { CrossVersion.partialVersion(scalaVersion.value) match { // java8-compat is only used in a couple of places for 2.13, @@ -112,12 +110,10 @@ object Dependencies { val mockito = "org.mockito" % "mockito-core" % "3.2.4" % "test" // MIT // changing the scalatest dependency must be reflected in akka-docs/rst/dev/multi-jvm-testing.rst val scalatest = Def.setting { "org.scalatest" %% "scalatest" % scalaTestVersion.value % "test" } // ApacheV2 - val scalatestJUnit = Def.setting { "org.scalatestplus" %% "junit-4-12" % scalaTestPlusVersion.value % "test" } // ApacheV2 - val scalatestTestNG = Def.setting { "org.scalatestplus" %% "testng-6-7" % scalaTestPlusVersion.value % "test" } // ApacheV2 - val scalatestScalaCheck = Def.setting { - "org.scalatestplus" %% "scalacheck-1-14" % scalaTestPlusVersion.value % "test" - } // ApacheV2 - val scalatestMockito = Def.setting { "org.scalatestplus" %% "mockito-1-10" % scalaTestPlusVersion.value % "test" } // ApacheV2 + val scalatestJUnit = "org.scalatestplus" %% "junit-4-12" % "3.1.0.0" % "test" // ApacheV2 + val scalatestTestNG = "org.scalatestplus" %% "testng-6-7" % "3.1.0.0" % "test" // ApacheV2 + val scalatestScalaCheck = "org.scalatestplus" %% "scalacheck-1-14" % "3.1.0.1" % "test" // ApacheV2 + val scalatestMockito = "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % "test" // ApacheV2 val scalacheck = Def.setting { "org.scalacheck" %% "scalacheck" % scalaCheckVersion.value % "test" } // New BSD val pojosr = "com.googlecode.pojosr" % "de.kalpatec.pojosr.framework" % "0.2.1" % "test" // ApacheV2 val tinybundles = "org.ops4j.pax.tinybundles" % "tinybundles" % "3.0.0" % "test" // ApacheV2 @@ -183,8 +179,8 @@ object Dependencies { val actorTests = l ++= Seq( Test.junit, Test.scalatest.value, - Test.scalatestJUnit.value, - Test.scalatestScalaCheck.value, + Test.scalatestJUnit, + Test.scalatestScalaCheck, Test.commonsCodec, Test.commonsMath, Test.scalacheck.value, @@ -197,7 +193,7 @@ object Dependencies { Provided.logback, Provided.junit, Provided.scalatest.value, - Test.scalatestJUnit.value) + Test.scalatestJUnit) val remoteDependencies = Seq(netty, aeronDriver, aeronClient) val remoteOptionalDependencies = remoteDependencies.map(_ % "optional") @@ -225,7 +221,7 @@ object Dependencies { Test.slf4jLog4j, Test.logback, Test.mockito, - Test.scalatestMockito.value) + Test.scalatestMockito) val distributedData = l ++= Seq(lmdb, Test.junit, Test.scalatest.value) @@ -235,7 +231,7 @@ object Dependencies { Provided.levelDB, Provided.levelDBNative, Test.scalatest.value, - Test.scalatestJUnit.value, + Test.scalatestJUnit, Test.junit, Test.commonsIo, Test.commonsCodec) @@ -290,14 +286,14 @@ object Dependencies { lazy val streamTests = l ++= Seq( Test.scalatest.value, Test.scalacheck.value, - Test.scalatestScalaCheck.value, + Test.scalatestScalaCheck, Test.junit, Test.commonsIo, Test.jimfs) lazy val streamTestsTck = l ++= Seq( Test.scalatest.value, - Test.scalatestTestNG.value, + Test.scalatestTestNG, Test.scalacheck.value, Test.junit, Test.reactiveStreamsTck)