Skip to content

support Scala 2.13.0-RC3 #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ lazy val commonSettings =
source.close
version.get
},
crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-RC2"),
crossScalaVersions := Seq("2.11.12", "2.12.8", "2.13.0-RC3"),
scalafmtOnCompile := true,
scalacOptions ++= Seq(
"-unchecked",
Expand Down Expand Up @@ -62,7 +62,7 @@ lazy val publishSettings = Seq(

lazy val commonLibraries = Seq(
"org.mockito" % "mockito-core" % "2.27.0",
"org.scalactic" %% "scalactic" % "3.0.8-RC4",
"org.scalactic" %% "scalactic" % "3.0.8-RC5",
"ru.vyarus" % "generics-resolver" % "3.0.0",
)

Expand All @@ -74,7 +74,7 @@ lazy val scalatest = (project in file("scalatest"))
name := "mockito-scala-scalatest",
commonSettings,
publishSettings,
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8-RC4" % "provided",
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8-RC5" % "provided",
)

lazy val specs2 = (project in file("specs2"))
Expand All @@ -98,8 +98,8 @@ lazy val cats = (project in file("cats"))
commonSettings,
publishSettings,
libraryDependencies ++= Seq(
"org.typelevel" %% "cats-core" % "2.0.0-M2" % "provided",
"org.scalatest" %% "scalatest" % "3.0.8-RC4" % "test"
"org.typelevel" %% "cats-core" % "2.0.0-M3" % "provided",
"org.scalatest" %% "scalatest" % "3.0.8-RC5" % "test"
),
)

Expand All @@ -113,7 +113,7 @@ lazy val scalaz = (project in file("scalaz"))
publishSettings,
libraryDependencies ++= Seq(
"org.scalaz" %% "scalaz-core" % "7.2.27" % "provided",
"org.scalatest" %% "scalatest" % "3.0.8-RC4" % "test"
"org.scalatest" %% "scalatest" % "3.0.8-RC5" % "test"
),
)

Expand All @@ -138,7 +138,7 @@ lazy val core = (project in file("core"))
libraryDependencies ++= commonLibraries,
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
//TODO remove when we remove the deprecated classes in org.mockito.integrations.scalatest
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8-RC4" % "provided",
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.8-RC5" % "provided",
// include the macro classes and resources in the main jar
mappings in (Compile, packageBin) ++= mappings
.in(macroSub, Compile, packageBin)
Expand Down