Merge pull request #4775 from eatkins/revert-bad-commit

Revert "revert doc"
This commit is contained in:
eugene yokota 2019-06-05 21:15:18 +00:00 committed by GitHub
commit 602e65d711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions

View File

@ -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