Skip to content

Commit 771f9ee

Browse files
authored
Merge pull request #111 from lrytz/withDocs
Re-enable docs
2 parents d7299b6 + d72f6bd commit 771f9ee

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

build.sbt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ crossScalaVersions in ThisBuild := List("2.13.0-M4")
44

55
val disableDocs = sys.props("nodocs") == "true"
66

7-
//lazy val JavaDoc = config("genjavadoc") extend Compile
7+
lazy val JavaDoc = config("genjavadoc") extend Compile
88

99
def jwrite(dir: java.io.File, pck: String = "scala/compat/java8")(name: String, content: String) = {
1010
val f = dir / pck / s"${name}.java"
@@ -103,9 +103,6 @@ lazy val root = (project in file(".")).
103103
}
104104
).
105105
settings(
106-
sources in (Compile,doc) := Seq.empty,
107-
publishArtifact in (Compile, packageDoc) := false).
108-
/* settings(
109106
(inConfig(JavaDoc)(Defaults.configSettings) ++ (if (disableDocs) Nil else Seq(
110107
packageDoc in Compile := (packageDoc in JavaDoc).value,
111108
sources in JavaDoc := {
@@ -119,7 +116,7 @@ lazy val root = (project in file(".")).
119116
libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.11" cross CrossVersion.full),
120117
scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java")
121118
))): _*
122-
).*/
119+
).
123120
settings(
124121
initialCommands :=
125122
"""|import scala.concurrent._

0 commit comments

Comments
 (0)