update to genjavadoc 0.4 and fix path concat in Unidoc, see #3144

This commit is contained in:
Roland 2013-03-14 19:43:05 +01:00
parent ad30275388
commit 70dfcb37a9
2 changed files with 2 additions and 2 deletions

View file

@ -879,7 +879,7 @@ object Dependencies {
val sigar = "org.fusesource" % "sigar" % "1.6.4" // ApacheV2
// Compiler plugins
val genjavadoc = compilerPlugin("com.typesafe.genjavadoc" %% "genjavadoc-plugin" % "0.3" cross CrossVersion.full) // ApacheV2
val genjavadoc = compilerPlugin("com.typesafe.genjavadoc" %% "genjavadoc-plugin" % "0.4" cross CrossVersion.full) // ApacheV2
// Test

View file

@ -21,7 +21,7 @@ object Unidoc {
artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar")
) ++ (if (GenJavaDocEnabled) Seq(
libraryDependencies += Dependencies.Compile.genjavadoc,
scalacOptions <+= target map (t => "-P:genjavadoc:out=" + t + "/java")
scalacOptions <+= target map (t => "-P:genjavadoc:out=" + (t / "java"))
) else Nil)
val unidocDirectory = SettingKey[File]("unidoc-directory")