From 32c2afaf2d4b985650a2d5417c5f16a8068cfdd9 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Tue, 4 Jun 2019 16:43:55 -0700 Subject: [PATCH] Revert "revert doc" It was only a matter of time before this erroneously got merged in. This reverts commit 05aab1035a95b18a78166e151aea7d22329341ab. --- build.sbt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.sbt b/build.sbt index 6c9cda6fb..1b75bd567 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,6 @@ ThisBuild / Test / scalafmtOnCompile := !(Global / insideCI).value def buildLevelSettings: Seq[Setting[_]] = inThisBuild( Seq( - doc in Compile := file("/dev/null"), organization := "org.scala-sbt", description := "sbt is an interactive build tool", bintrayOrganization := Some("sbt"), @@ -48,7 +47,6 @@ def buildLevelSettings: Seq[Setting[_]] = homepage := Some(url("https://github.com/sbt/sbt")), scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt"), "git@github.com:sbt/sbt.git")), resolvers += Resolver.mavenLocal, - scalafmtOnCompile := false, ) ) @@ -62,7 +60,6 @@ def commonSettings: Seq[Setting[_]] = Def.settings( |""".stripMargin ) ), - doc in Compile := file("/dev/null"), scalaVersion := baseScalaVersion, componentID := None, resolvers += Resolver.typesafeIvyRepo("releases"), @@ -396,7 +393,6 @@ lazy val scriptedSbtReduxProj = (project in file("scripted-sbt-redux")) .dependsOn(commandProj) .settings( baseSettings, - doc in Compile := file("/dev/null"), name := "Scripted sbt Redux", libraryDependencies ++= Seq(launcherInterface % "provided"), resourceGenerators in Compile += Def task { @@ -644,7 +640,6 @@ lazy val mainProj = (project in file("main")) ) .settings( testedBaseSettings, - doc in Compile := file("/dev/null"), name := "Main", checkPluginCross := { val sv = scalaVersion.value