Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-ci-release-1.5.10
Browse files Browse the repository at this point in the history
  • Loading branch information
tkrs committed Oct 15, 2021
2 parents 679a89a + b65b351 commit 3002750
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ object Dependencies {

val scalatest = "3.2.10"
val scalatestplus = new {
val scalacheck = "3.2.2.0"
val scalacheck = "3.2.9.0"
val mockito = "3.2.10.0"
}
}
Expand All @@ -33,7 +33,7 @@ object Dependencies {
lazy val logbackClassic = "ch.qos.logback" % "logback-classic" % Ver.logback

lazy val scalatest = "org.scalatest" %% "scalatest" % Ver.scalatest
lazy val scalacheck = "org.scalatestplus" %% "scalacheck-1-14" % Ver.scalatestplus.scalacheck
lazy val scalacheck = "org.scalatestplus" %% "scalacheck-1-15" % Ver.scalatestplus.scalacheck
lazy val mockito = "org.scalatestplus" %% "mockito-3-4" % Ver.scalatestplus.mockito

lazy val forTest = Seq(scalatest, scalacheck, mockito)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")

0 comments on commit 3002750

Please sign in to comment.