Skip to content

Commit

Permalink
Updated release version, default scala version, Dotty version 3.0.0-M…
Browse files Browse the repository at this point in the history
…1 and fixed scaladoc problem when publishing.
  • Loading branch information
cheeseng committed Nov 8, 2020
1 parent c623077 commit cbcfd14
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
13 changes: 9 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "mockito-3.4"

organization := "org.scalatestplus"

version := "3.2.2.0"
version := "3.2.3.0"

homepage := Some(url("https://github.com/scalatest/scalatestplus-mockito"))

Expand All @@ -25,12 +25,14 @@ developers := List(
)
)

crossScalaVersions := List("2.10.7", "2.11.12", "2.12.12", "2.13.3", "0.27.0-RC1")
scalaVersion := "2.13.3"

crossScalaVersions := List("2.10.7", "2.11.12", "2.12.12", "2.13.3", "3.0.0-M1")

libraryDependencies ++= Seq(
"org.mockito" % "mockito-core" % "3.4.6",
"org.scalatest" %% "scalatest-core" % "3.2.2",
"org.scalatest" %% "scalatest-funsuite" % "3.2.2" % "test"
"org.scalatest" %% "scalatest-core" % "3.2.3",
"org.scalatest" %% "scalatest-funsuite" % "3.2.3" % "test"
)

Test / scalacOptions ++= (if (isDotty.value)
Expand Down Expand Up @@ -107,4 +109,7 @@ pomExtra := (

credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")

// Temporary disable publishing of doc in dotty, can't get it to build.
publishArtifact in (Compile, packageDoc) := !scalaBinaryVersion.value.startsWith("3.")

scalacOptions in (Compile, doc) := Seq("-doc-title", s"ScalaTest + Mockito ${version.value}")
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")

addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")

addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.1")
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.5")

0 comments on commit cbcfd14

Please sign in to comment.