Skip to content

Commit

Permalink
Update sbt-doctest to 0.7.0 (#1821)
Browse files Browse the repository at this point in the history
`doctestWithDependencies` has been removed upstream since the plugin
does not automatically add dependencies anymore.
  • Loading branch information
fthomas authored and kailuowang committed Aug 28, 2017
1 parent d888069 commit 2ea0a3d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
13 changes: 4 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ lazy val scoverageSettings = Seq(

organization in ThisBuild := "org.typelevel"

lazy val catsDoctestSettings = Seq(
doctestWithDependencies := false
)

lazy val kernelSettings = Seq(
// don't warn on value discarding because it's broken on 2.10 with @sp(Unit)
scalacOptions ++= commonScalacOptions.filter(_ != "-Ywarn-value-discard"),
Expand Down Expand Up @@ -82,15 +78,14 @@ lazy val commonJsSettings = Seq(
jsEnv := new org.scalajs.jsenv.nodejs.NodeJSEnv(),
// batch mode decreases the amount of memory needed to compile scala.js code
scalaJSOptimizerOptions := scalaJSOptimizerOptions.value.withBatchMode(isTravisBuild.value),
doctestGenTests := Seq.empty,
doctestWithDependencies := false
// currently sbt-doctest doesn't work in JS builds
// https://github.com/tkawachi/sbt-doctest/issues/52
doctestGenTests := Seq.empty
)

lazy val commonJvmSettings = Seq(
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oDF")
// currently sbt-doctest doesn't work in JS builds, so this has to go in the
// JVM settings. https://github.com/tkawachi/sbt-doctest/issues/52
) ++ catsDoctestSettings
)

lazy val includeGeneratedSrc: Setting[_] = {
mappings in (Compile, packageSrc) ++= {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.5.0")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.7.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.6.1")
addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.1.0")
Expand Down

0 comments on commit 2ea0a3d

Please sign in to comment.