diff --git a/notes/4.1.0.markdown b/notes/4.1.0.markdown new file mode 100644 index 0000000000..1eadd97e75 --- /dev/null +++ b/notes/4.1.0.markdown @@ -0,0 +1,9 @@ +Upgrade version + +## Upgrades + + * **mockito** upgraded to Mockito `2.18.2`, this is mostly to avoid a concurrency bug introduced by Mockito (#641). + * **html** the default options for pandoc are now compatible with pandoc `2.1.3` for markdown generation + + Otherwise please refer to the `4.0.4` notes for the latest changes. + diff --git a/project/depends.scala b/project/depends.scala index 47bf296b3b..16c9cc00cd 100644 --- a/project/depends.scala +++ b/project/depends.scala @@ -37,7 +37,7 @@ object depends { def kindp(scalaVersion: String) = "org.spire-math" % "kind-projector" % "0.8.2" cross CrossVersion.binary - lazy val mockito = Seq("org.mockito" % "mockito-core" % "2.16.0") + lazy val mockito = Seq("org.mockito" % "mockito-core" % "2.18.0") lazy val junit = Seq("junit" % "junit" % "4.12") lazy val hamcrest = Seq("org.hamcrest" % "hamcrest-core" % "1.3") @@ -69,7 +69,8 @@ object depends { Seq() lazy val resolvers = - Seq(sbt.Keys.resolvers ++= Seq(Resolver.sonatypeRepo("releases"))) + Seq(sbt.Keys.resolvers ++= Seq( + Resolver.sonatypeRepo("releases"))) def scalaMinorVersionAtLeast(scalaVersion: String, n: Int): Boolean = CrossVersion.partialVersion(scalaVersion) match { diff --git a/version.sbt b/version.sbt index 1aff6743cc..da6fe0f418 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "4.0.4" +version in ThisBuild := "4.1.0"