From 77c18fc1287622d02a07711a73c1e3e3cbd1bb68 Mon Sep 17 00:00:00 2001 From: Roland Date: Tue, 5 Mar 2013 19:10:45 +0100 Subject: [PATCH] add javadoc to most projects --- project/AkkaBuild.scala | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index c24bab8610..4c0be9ec79 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -105,11 +105,11 @@ object AkkaBuild extends Build { val JavaDoc = config("genjavadoc") extend Compile - val javadocPlugin = inConfig(JavaDoc)(Defaults.configSettings) ++ Seq( + val javadocSettings = inConfig(JavaDoc)(Defaults.configSettings) ++ Seq( libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" %% "genjavadoc-plugin" % "0.1-SNAPSHOT" cross CrossVersion.full), scalacOptions <+= target map (t => "-P:genjavadoc:out=" + t + "/java"), packageDoc in Compile <<= packageDoc in JavaDoc, - sources in JavaDoc <<= (target, compile in Compile) map ((t, c) => (t / "java" ** "*.java").get), + sources in JavaDoc <<= (target, compile in Compile, sources in Compile) map ((t, c, s) => (t / "java" ** "*.java").get ++ s.filter(_.getName.endsWith(".java"))), javacOptions in JavaDoc := Seq(), artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar") ) @@ -117,13 +117,13 @@ object AkkaBuild extends Build { lazy val actor = Project( id = "akka-actor", base = file("akka-actor"), - settings = defaultSettings ++ scaladocSettings ++ javadocPlugin ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ Seq( // to fix scaladoc generation fullClasspath in doc in Compile <<= fullClasspath in Compile, libraryDependencies ++= Dependencies.actor, previousArtifact := akkaPreviousArtifact("akka-actor") ) - ).configs(JavaDoc) + ) val cpsPlugin = Seq( libraryDependencies <+= scalaVersion { v => compilerPlugin("org.scala-lang.plugins" % "continuations" % v) }, @@ -143,7 +143,7 @@ object AkkaBuild extends Build { id = "akka-testkit", base = file("akka-testkit"), dependencies = Seq(actor), - settings = defaultSettings ++ scaladocSettings ++ OSGi.testkit ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.testkit ++ Seq( libraryDependencies ++= Dependencies.testkit, initialCommands += "import akka.testkit._", previousArtifact := akkaPreviousArtifact("akka-testkit") @@ -164,7 +164,7 @@ object AkkaBuild extends Build { id = "akka-remote", base = file("akka-remote"), dependencies = Seq(actor, actorTests % "test->test", testkit % "test->test"), - settings = defaultSettings ++ scaladocSettings ++ OSGi.remote ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.remote ++ Seq( libraryDependencies ++= Dependencies.remote, // disable parallel tests parallelExecution in Test := false, @@ -176,7 +176,7 @@ object AkkaBuild extends Build { id = "akka-multi-node-testkit", base = file("akka-multi-node-testkit"), dependencies = Seq(remote, testkit), - settings = defaultSettings ++ scaladocSettings ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ Seq( previousArtifact := akkaPreviousArtifact("akka-multi-node-testkit") ) ) @@ -202,7 +202,7 @@ object AkkaBuild extends Build { id = "akka-cluster-experimental", base = file("akka-cluster"), dependencies = Seq(remote, remoteTests % "test->test" , testkit % "test->test"), - settings = defaultSettings ++ scaladocSettings ++ multiJvmSettings ++ OSGi.cluster ++ experimentalSettings ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ multiJvmSettings ++ OSGi.cluster ++ experimentalSettings ++ Seq( libraryDependencies ++= Dependencies.cluster, // disable parallel tests parallelExecution in Test := false, @@ -218,7 +218,7 @@ object AkkaBuild extends Build { id = "akka-slf4j", base = file("akka-slf4j"), dependencies = Seq(actor, testkit % "test->test"), - settings = defaultSettings ++ scaladocSettings ++ OSGi.slf4j ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.slf4j ++ Seq( libraryDependencies ++= Dependencies.slf4j, previousArtifact := akkaPreviousArtifact("akka-slf4j") ) @@ -228,7 +228,7 @@ object AkkaBuild extends Build { id = "akka-agent", base = file("akka-agent"), dependencies = Seq(actor, testkit % "test->test"), - settings = defaultSettings ++ scaladocSettings ++ OSGi.agent ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.agent ++ Seq( libraryDependencies ++= Dependencies.agent, previousArtifact := akkaPreviousArtifact("akka-agent") ) @@ -238,7 +238,7 @@ object AkkaBuild extends Build { id = "akka-transactor", base = file("akka-transactor"), dependencies = Seq(actor, testkit % "test->test"), - settings = defaultSettings ++ scaladocSettings ++ OSGi.transactor ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.transactor ++ Seq( libraryDependencies ++= Dependencies.transactor, previousArtifact := akkaPreviousArtifact("akka-transactor") ) @@ -257,7 +257,7 @@ object AkkaBuild extends Build { id = "akka-mailboxes-common", base = file("akka-durable-mailboxes/akka-mailboxes-common"), dependencies = Seq(remote, testkit % "compile;test->test"), - settings = defaultSettings ++ scaladocSettings ++ OSGi.mailboxesCommon ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.mailboxesCommon ++ Seq( libraryDependencies ++= Dependencies.mailboxes, previousArtifact := akkaPreviousArtifact("akka-mailboxes-common"), publishArtifact in Test := true @@ -268,7 +268,7 @@ object AkkaBuild extends Build { id = "akka-file-mailbox", base = file("akka-durable-mailboxes/akka-file-mailbox"), dependencies = Seq(mailboxesCommon % "compile;test->test", testkit % "test"), - settings = defaultSettings ++ scaladocSettings ++ OSGi.fileMailbox ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.fileMailbox ++ Seq( libraryDependencies ++= Dependencies.fileMailbox, previousArtifact := akkaPreviousArtifact("akka-file-mailbox") ) @@ -278,7 +278,7 @@ object AkkaBuild extends Build { id = "akka-zeromq", base = file("akka-zeromq"), dependencies = Seq(actor, testkit % "test;test->test"), - settings = defaultSettings ++ scaladocSettings ++ OSGi.zeroMQ ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.zeroMQ ++ Seq( libraryDependencies ++= Dependencies.zeroMQ, previousArtifact := akkaPreviousArtifact("akka-zeromq") ) @@ -288,7 +288,7 @@ object AkkaBuild extends Build { id = "akka-kernel", base = file("akka-kernel"), dependencies = Seq(actor, testkit % "test->test"), - settings = defaultSettings ++ scaladocSettings ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ Seq( libraryDependencies ++= Dependencies.kernel, previousArtifact := akkaPreviousArtifact("akka-kernel") ) @@ -298,7 +298,7 @@ object AkkaBuild extends Build { id = "akka-camel", base = file("akka-camel"), dependencies = Seq(actor, slf4j, testkit % "test->test"), - settings = defaultSettings ++ scaladocSettings ++ OSGi.camel ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.camel ++ Seq( libraryDependencies ++= Dependencies.camel ) ) @@ -330,7 +330,7 @@ object AkkaBuild extends Build { id = "akka-osgi", base = file("akka-osgi"), dependencies = Seq(actor), - settings = defaultSettings ++ scaladocSettings ++ OSGi.osgi ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.osgi ++ Seq( libraryDependencies ++= Dependencies.osgi, ActorReferenceCopyTask in Compile <<= ActorReferenceCopyAction , cleanFiles <+= baseDirectory { base => base / "src/main/resources" } , @@ -343,7 +343,7 @@ object AkkaBuild extends Build { id = "akka-osgi-aries", base = file("akka-osgi-aries"), dependencies = Seq(osgi % "compile;test->test"), - settings = defaultSettings ++ scaladocSettings ++ OSGi.osgiAries ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.osgiAries ++ Seq( libraryDependencies ++= Dependencies.osgiAries, parallelExecution in Test := false ) @@ -470,7 +470,7 @@ object AkkaBuild extends Build { id = "akka-contrib", base = file("akka-contrib"), dependencies = Seq(remote, remoteTests % "compile;test->test", cluster), - settings = defaultSettings ++ scaladocSettings ++ multiJvmSettings ++ Seq( + settings = defaultSettings ++ scaladocSettings ++ javadocSettings ++ multiJvmSettings ++ Seq( libraryDependencies ++= Dependencies.contrib, testOptions += Tests.Argument(TestFrameworks.JUnit, "-v"), description := """|