Update scalacheck-1-14 to 3.1.0.1 (#28498)
Co-authored-by: Arnout Engelen <github@bzzt.net>
This commit is contained in:
parent
e4fba1cfab
commit
ea4ab8118d
1 changed files with 11 additions and 15 deletions
|
|
@ -11,7 +11,6 @@ object Dependencies {
|
||||||
import DependencyHelpers._
|
import DependencyHelpers._
|
||||||
|
|
||||||
lazy val scalaTestVersion = settingKey[String]("The version of ScalaTest to use.")
|
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 scalaCheckVersion = settingKey[String]("The version of ScalaCheck to use.")
|
||||||
lazy val java8CompatVersion = settingKey[String]("The version of scala-java8-compat 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),
|
scalaVersion := System.getProperty("akka.build.scalaVersion", crossScalaVersions.value.head),
|
||||||
scalaCheckVersion := sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.14.3"),
|
scalaCheckVersion := sys.props.get("akka.build.scalaCheckVersion").getOrElse("1.14.3"),
|
||||||
scalaTestVersion := "3.1.0",
|
scalaTestVersion := "3.1.0",
|
||||||
scalaTestPlusVersion := "3.1.0.0",
|
|
||||||
java8CompatVersion := {
|
java8CompatVersion := {
|
||||||
CrossVersion.partialVersion(scalaVersion.value) match {
|
CrossVersion.partialVersion(scalaVersion.value) match {
|
||||||
// java8-compat is only used in a couple of places for 2.13,
|
// 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
|
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
|
// 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 scalatest = Def.setting { "org.scalatest" %% "scalatest" % scalaTestVersion.value % "test" } // ApacheV2
|
||||||
val scalatestJUnit = Def.setting { "org.scalatestplus" %% "junit-4-12" % scalaTestPlusVersion.value % "test" } // ApacheV2
|
val scalatestJUnit = "org.scalatestplus" %% "junit-4-12" % "3.1.0.0" % "test" // ApacheV2
|
||||||
val scalatestTestNG = Def.setting { "org.scalatestplus" %% "testng-6-7" % scalaTestPlusVersion.value % "test" } // ApacheV2
|
val scalatestTestNG = "org.scalatestplus" %% "testng-6-7" % "3.1.0.0" % "test" // ApacheV2
|
||||||
val scalatestScalaCheck = Def.setting {
|
val scalatestScalaCheck = "org.scalatestplus" %% "scalacheck-1-14" % "3.1.0.1" % "test" // ApacheV2
|
||||||
"org.scalatestplus" %% "scalacheck-1-14" % scalaTestPlusVersion.value % "test"
|
val scalatestMockito = "org.scalatestplus" %% "mockito-1-10" % "3.1.0.0" % "test" // ApacheV2
|
||||||
} // ApacheV2
|
|
||||||
val scalatestMockito = Def.setting { "org.scalatestplus" %% "mockito-1-10" % scalaTestPlusVersion.value % "test" } // ApacheV2
|
|
||||||
val scalacheck = Def.setting { "org.scalacheck" %% "scalacheck" % scalaCheckVersion.value % "test" } // New BSD
|
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 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
|
val tinybundles = "org.ops4j.pax.tinybundles" % "tinybundles" % "3.0.0" % "test" // ApacheV2
|
||||||
|
|
@ -183,8 +179,8 @@ object Dependencies {
|
||||||
val actorTests = l ++= Seq(
|
val actorTests = l ++= Seq(
|
||||||
Test.junit,
|
Test.junit,
|
||||||
Test.scalatest.value,
|
Test.scalatest.value,
|
||||||
Test.scalatestJUnit.value,
|
Test.scalatestJUnit,
|
||||||
Test.scalatestScalaCheck.value,
|
Test.scalatestScalaCheck,
|
||||||
Test.commonsCodec,
|
Test.commonsCodec,
|
||||||
Test.commonsMath,
|
Test.commonsMath,
|
||||||
Test.scalacheck.value,
|
Test.scalacheck.value,
|
||||||
|
|
@ -197,7 +193,7 @@ object Dependencies {
|
||||||
Provided.logback,
|
Provided.logback,
|
||||||
Provided.junit,
|
Provided.junit,
|
||||||
Provided.scalatest.value,
|
Provided.scalatest.value,
|
||||||
Test.scalatestJUnit.value)
|
Test.scalatestJUnit)
|
||||||
|
|
||||||
val remoteDependencies = Seq(netty, aeronDriver, aeronClient)
|
val remoteDependencies = Seq(netty, aeronDriver, aeronClient)
|
||||||
val remoteOptionalDependencies = remoteDependencies.map(_ % "optional")
|
val remoteOptionalDependencies = remoteDependencies.map(_ % "optional")
|
||||||
|
|
@ -225,7 +221,7 @@ object Dependencies {
|
||||||
Test.slf4jLog4j,
|
Test.slf4jLog4j,
|
||||||
Test.logback,
|
Test.logback,
|
||||||
Test.mockito,
|
Test.mockito,
|
||||||
Test.scalatestMockito.value)
|
Test.scalatestMockito)
|
||||||
|
|
||||||
val distributedData = l ++= Seq(lmdb, Test.junit, Test.scalatest.value)
|
val distributedData = l ++= Seq(lmdb, Test.junit, Test.scalatest.value)
|
||||||
|
|
||||||
|
|
@ -235,7 +231,7 @@ object Dependencies {
|
||||||
Provided.levelDB,
|
Provided.levelDB,
|
||||||
Provided.levelDBNative,
|
Provided.levelDBNative,
|
||||||
Test.scalatest.value,
|
Test.scalatest.value,
|
||||||
Test.scalatestJUnit.value,
|
Test.scalatestJUnit,
|
||||||
Test.junit,
|
Test.junit,
|
||||||
Test.commonsIo,
|
Test.commonsIo,
|
||||||
Test.commonsCodec)
|
Test.commonsCodec)
|
||||||
|
|
@ -290,14 +286,14 @@ object Dependencies {
|
||||||
lazy val streamTests = l ++= Seq(
|
lazy val streamTests = l ++= Seq(
|
||||||
Test.scalatest.value,
|
Test.scalatest.value,
|
||||||
Test.scalacheck.value,
|
Test.scalacheck.value,
|
||||||
Test.scalatestScalaCheck.value,
|
Test.scalatestScalaCheck,
|
||||||
Test.junit,
|
Test.junit,
|
||||||
Test.commonsIo,
|
Test.commonsIo,
|
||||||
Test.jimfs)
|
Test.jimfs)
|
||||||
|
|
||||||
lazy val streamTestsTck = l ++= Seq(
|
lazy val streamTestsTck = l ++= Seq(
|
||||||
Test.scalatest.value,
|
Test.scalatest.value,
|
||||||
Test.scalatestTestNG.value,
|
Test.scalatestTestNG,
|
||||||
Test.scalacheck.value,
|
Test.scalacheck.value,
|
||||||
Test.junit,
|
Test.junit,
|
||||||
Test.reactiveStreamsTck)
|
Test.reactiveStreamsTck)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue