From fdcd96416567b3ea52b8d8533cd3c44d70bcc7c1 Mon Sep 17 00:00:00 2001 From: Martynas Mickevicius Date: Mon, 12 May 2014 16:19:29 +0200 Subject: [PATCH] =pro #15031 separate sbt build file for every module --- akka-actor-tests/build.sbt | 11 ++ akka-actor/build.sbt | 16 +++ akka-agent/build.sbt | 16 +++ akka-camel/build.sbt | 16 +++ akka-cluster/build.sbt | 28 +++++ akka-contrib/build.sbt | 27 +++++ akka-docs/build.sbt | 26 +++++ akka-kernel/build.sbt | 14 +++ akka-multi-node-testkit/build.sbt | 12 +++ akka-osgi/build.sbt | 18 ++++ akka-persistence/build.sbt | 23 ++++ akka-remote-tests/build.sbt | 26 +++++ akka-remote/build.sbt | 18 ++++ akka-slf4j/build.sbt | 16 +++ akka-testkit/build.sbt | 19 ++++ akka-zeromq/build.sbt | 16 +++ project/ActivatorDist.scala | 4 +- project/AkkaBuild.scala | 172 +++++++----------------------- 18 files changed, 341 insertions(+), 137 deletions(-) create mode 100644 akka-actor-tests/build.sbt create mode 100644 akka-actor/build.sbt create mode 100644 akka-agent/build.sbt create mode 100644 akka-camel/build.sbt create mode 100644 akka-cluster/build.sbt create mode 100644 akka-contrib/build.sbt create mode 100644 akka-docs/build.sbt create mode 100644 akka-kernel/build.sbt create mode 100644 akka-multi-node-testkit/build.sbt create mode 100644 akka-osgi/build.sbt create mode 100644 akka-persistence/build.sbt create mode 100644 akka-remote-tests/build.sbt create mode 100644 akka-remote/build.sbt create mode 100644 akka-slf4j/build.sbt create mode 100644 akka-testkit/build.sbt create mode 100644 akka-zeromq/build.sbt diff --git a/akka-actor-tests/build.sbt b/akka-actor-tests/build.sbt new file mode 100644 index 0000000000..22783f3625 --- /dev/null +++ b/akka-actor-tests/build.sbt @@ -0,0 +1,11 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, Unidoc } + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +publishArtifact in Compile := false + +libraryDependencies ++= Dependencies.actorTests diff --git a/akka-actor/build.sbt b/akka-actor/build.sbt new file mode 100644 index 0000000000..4d70a076fe --- /dev/null +++ b/akka-actor/build.sbt @@ -0,0 +1,16 @@ +import akka.{ AkkaBuild, Formatting, OSGi, Unidoc, Dependencies } +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +Unidoc.javadocSettings + +OSGi.actor + +libraryDependencies ++= Dependencies.actor + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-actor") diff --git a/akka-agent/build.sbt b/akka-agent/build.sbt new file mode 100644 index 0000000000..188cd80642 --- /dev/null +++ b/akka-agent/build.sbt @@ -0,0 +1,16 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, OSGi, Unidoc } +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettingsNoVerificationOfDiagrams + +Unidoc.javadocSettings + +OSGi.agent + +libraryDependencies ++= Dependencies.agent + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-agent") diff --git a/akka-camel/build.sbt b/akka-camel/build.sbt new file mode 100644 index 0000000000..acc3346ebe --- /dev/null +++ b/akka-camel/build.sbt @@ -0,0 +1,16 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, OSGi, Unidoc } +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +Unidoc.javadocSettings + +OSGi.camel + +libraryDependencies ++= Dependencies.camel + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-kernel") diff --git a/akka-cluster/build.sbt b/akka-cluster/build.sbt new file mode 100644 index 0000000000..47fddae950 --- /dev/null +++ b/akka-cluster/build.sbt @@ -0,0 +1,28 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, OSGi, MultiNode, Unidoc } +import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys._ +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +Unidoc.javadocSettings + +MultiNode.multiJvmSettings + +OSGi.cluster + +libraryDependencies ++= Dependencies.cluster + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-cluster") + +// disable parallel tests +parallelExecution in Test := false + +extraOptions in MultiJvm <<= (sourceDirectory in MultiJvm) { src => + (name: String) => (src ** (name + ".conf")).get.headOption.map("-Dakka.config=" + _.absolutePath).toSeq +} + +scalatestOptions in MultiJvm := MultiNode.defaultMultiJvmScalatestOptions.value diff --git a/akka-contrib/build.sbt b/akka-contrib/build.sbt new file mode 100644 index 0000000000..116e3e2f04 --- /dev/null +++ b/akka-contrib/build.sbt @@ -0,0 +1,27 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, MultiNode, Unidoc } +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettingsNoVerificationOfDiagrams + +Unidoc.javadocSettings + +MultiNode.multiJvmSettings + +libraryDependencies ++= Dependencies.contrib + +MimaKeys.reportBinaryIssues := () // disable bin comp check + +description := """| + |This subproject provides a home to modules contributed by external + |developers which may or may not move into the officially supported code + |base over time. A module in this subproject doesn't have to obey the rule + |of staying binary compatible between minor releases. Breaking API changes + |may be introduced in minor releases without notice as we refine and + |simplify based on your feedback. A module may be dropped in any release + |without prior deprecation. The Typesafe subscription does not cover + |support for these modules. + |""".stripMargin diff --git a/akka-docs/build.sbt b/akka-docs/build.sbt new file mode 100644 index 0000000000..e343122761 --- /dev/null +++ b/akka-docs/build.sbt @@ -0,0 +1,26 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, SphinxDoc } +import com.typesafe.sbt.SbtScalariform.ScalariformKeys +import com.typesafe.sbt.SbtSite.site +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.docFormatSettings + +site.settings + +site.sphinxSupport() + +site.publishSite + +SphinxDoc.docsSettings + +SphinxDoc.sphinxPreprocessing + +libraryDependencies ++= Dependencies.docs + +publishArtifact in Compile := false + +unmanagedSourceDirectories in ScalariformKeys.format in Test <<= unmanagedSourceDirectories in Test + +MimaKeys.reportBinaryIssues := () // disable bin comp check diff --git a/akka-kernel/build.sbt b/akka-kernel/build.sbt new file mode 100644 index 0000000000..a50c8624f0 --- /dev/null +++ b/akka-kernel/build.sbt @@ -0,0 +1,14 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, Unidoc } +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettingsNoVerificationOfDiagrams + +Unidoc.javadocSettings + +libraryDependencies ++= Dependencies.kernel + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-kernel") diff --git a/akka-multi-node-testkit/build.sbt b/akka-multi-node-testkit/build.sbt new file mode 100644 index 0000000000..ddf7bbd708 --- /dev/null +++ b/akka-multi-node-testkit/build.sbt @@ -0,0 +1,12 @@ +import akka.{AkkaBuild, Formatting, Unidoc, OSGi} +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +Unidoc.javadocSettings + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-multi-node-testkit") diff --git a/akka-osgi/build.sbt b/akka-osgi/build.sbt new file mode 100644 index 0000000000..d543056dc4 --- /dev/null +++ b/akka-osgi/build.sbt @@ -0,0 +1,18 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, OSGi, Unidoc } +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +Unidoc.javadocSettings + +OSGi.osgi + +libraryDependencies ++= Dependencies.osgi + +parallelExecution in Test := false + +MimaKeys.reportBinaryIssues := () // disable bin comp check diff --git a/akka-persistence/build.sbt b/akka-persistence/build.sbt new file mode 100644 index 0000000000..bf98e02f53 --- /dev/null +++ b/akka-persistence/build.sbt @@ -0,0 +1,23 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, OSGi, Unidoc } +import com.typesafe.tools.mima.plugin.MimaKeys +import akka.MultiNode + +AkkaBuild.defaultSettings + +AkkaBuild.experimentalSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +Unidoc.javadocSettings + +OSGi.persistence + +libraryDependencies ++= Dependencies.persistence + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-persistence-experimental") + +fork in Test := true + +javaOptions in Test := MultiNode.defaultMultiJvmOptions diff --git a/akka-remote-tests/build.sbt b/akka-remote-tests/build.sbt new file mode 100644 index 0000000000..c49a17694f --- /dev/null +++ b/akka-remote-tests/build.sbt @@ -0,0 +1,26 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, MultiNode, Unidoc } +import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys._ +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +MultiNode.multiJvmSettings + +libraryDependencies ++= Dependencies.remoteTests + +// disable parallel tests +parallelExecution in Test := false + +extraOptions in MultiJvm <<= (sourceDirectory in MultiJvm) { src => + (name: String) => (src ** (name + ".conf")).get.headOption.map("-Dakka.config=" + _.absolutePath).toSeq +} + +scalatestOptions in MultiJvm := MultiNode.defaultMultiJvmScalatestOptions.value + +publishArtifact in Compile := false + +MimaKeys.reportBinaryIssues := () // disable bin comp check diff --git a/akka-remote/build.sbt b/akka-remote/build.sbt new file mode 100644 index 0000000000..e9ef16cc57 --- /dev/null +++ b/akka-remote/build.sbt @@ -0,0 +1,18 @@ +import akka.{AkkaBuild, Dependencies, Formatting, Unidoc, OSGi} +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +Unidoc.javadocSettings + +OSGi.remote + +libraryDependencies ++= Dependencies.remote + +parallelExecution in Test := false + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-remote") diff --git a/akka-slf4j/build.sbt b/akka-slf4j/build.sbt new file mode 100644 index 0000000000..935bf7227d --- /dev/null +++ b/akka-slf4j/build.sbt @@ -0,0 +1,16 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, OSGi, Unidoc } +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +Unidoc.javadocSettings + +OSGi.slf4j + +libraryDependencies ++= Dependencies.slf4j + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-slf4j") diff --git a/akka-testkit/build.sbt b/akka-testkit/build.sbt new file mode 100644 index 0000000000..f20dd46e68 --- /dev/null +++ b/akka-testkit/build.sbt @@ -0,0 +1,19 @@ +import akka.{ AkkaBuild, Formatting, OSGi, Unidoc, Dependencies } +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +Unidoc.javadocSettings + +OSGi.testkit + +// to fix scaladoc generation +libraryDependencies ++= Dependencies.testkit + +initialCommands += "import akka.testkit._" + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-testkit") diff --git a/akka-zeromq/build.sbt b/akka-zeromq/build.sbt new file mode 100644 index 0000000000..05c4726136 --- /dev/null +++ b/akka-zeromq/build.sbt @@ -0,0 +1,16 @@ +import akka.{ AkkaBuild, Dependencies, Formatting, OSGi, Unidoc } +import com.typesafe.tools.mima.plugin.MimaKeys + +AkkaBuild.defaultSettings + +Formatting.formatSettings + +Unidoc.scaladocSettings + +Unidoc.javadocSettings + +OSGi.zeroMQ + +libraryDependencies ++= Dependencies.zeroMQ + +MimaKeys.previousArtifact := akkaPreviousArtifact("akka-zeromq") diff --git a/project/ActivatorDist.scala b/project/ActivatorDist.scala index 48e84078e4..3935615a8d 100644 --- a/project/ActivatorDist.scala +++ b/project/ActivatorDist.scala @@ -20,7 +20,7 @@ object ActivatorDist { (thisProjectRef, baseDirectory, activatorDistDirectory, version, buildStructure, streams) map { (project, projectBase, activatorDistDirectory, version, structure, s) => { val directories = projectBase.listFiles(DirectoryFilter).filter(dir => (dir / "activator.properties").exists) - val rootGitignoreLines = IO.readLines(AkkaBuild.akka.base / ".gitignore") + val rootGitignoreLines = IO.readLines(AkkaBuild.root.base / ".gitignore") for (dir <- directories) { val localGitignoreLines = if ((dir / ".gitignore").exists) IO.readLines(dir / ".gitignore") else Nil val gitignoreFileFilter = (".gitignore" :: localGitignoreLines ::: rootGitignoreLines). @@ -36,7 +36,7 @@ object ActivatorDist { s.log.info(s"zipping: $targetDir -> $targetFile") Dist.zip(targetDir, targetFile) } - + activatorDistDirectory } } diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 16cce0c1b5..6affcecd2a 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -6,21 +6,19 @@ package akka import sbt._ import sbt.Keys._ -import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.{ MultiJvm, extraOptions, scalatestOptions } -import com.typesafe.sbt.SbtScalariform.ScalariformKeys +import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.{ MultiJvm, extraOptions } import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings import com.typesafe.tools.mima.plugin.MimaKeys.previousArtifact import com.typesafe.tools.mima.plugin.MimaKeys.reportBinaryIssues import com.typesafe.tools.mima.plugin.MimaKeys.binaryIssueFilters -import com.typesafe.sbt.SbtSite.site import java.io.{InputStreamReader, FileInputStream, File} import java.util.Properties import sbtunidoc.Plugin.UnidocKeys.unidoc import TestExtras.{ JUnitFileReporting, StatsDMetrics, GraphiteBuildEvents } import com.typesafe.sbt.S3Plugin.{ S3, s3Settings } -import Unidoc.{ scaladocSettings, scaladocSettingsNoVerificationOfDiagrams, unidocSettings, javadocSettings } -import Formatting.{ formatSettings, docFormatSettings } -import MultiNode.{ multiJvmSettings, defaultMultiJvmOptions, defaultMultiJvmScalatestOptions } +import Unidoc.{ scaladocSettings, unidocSettings } +import Formatting.docFormatSettings +import MultiNode.multiJvmSettings import com.typesafe.sbt.site.SphinxSupport import com.typesafe.sbt.site.SphinxSupport.Sphinx @@ -39,7 +37,7 @@ object AkkaBuild extends Build { scalaBinaryVersion := System.getProperty("akka.scalaBinaryVersion", if (scalaVersion.value contains "-") scalaVersion.value else scalaBinaryVersion.value) ) - lazy val akka = Project( + lazy val root = Project( id = "akka", base = file("."), settings = parentSettings ++ Release.settings ++ unidocSettings ++ Publish.versionSettings ++ @@ -74,162 +72,85 @@ object AkkaBuild extends Build { lazy val actor = Project( id = "akka-actor", - base = file("akka-actor"), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.actor ++ Seq( - // to fix scaladoc generation - fullClasspath in doc in Compile <<= fullClasspath in Compile, - libraryDependencies ++= Dependencies.actor, - previousArtifact := akkaPreviousArtifact("akka-actor") - ) + base = file("akka-actor") ) lazy val testkit = Project( id = "akka-testkit", base = file("akka-testkit"), - dependencies = Seq(actor), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.testkit ++ Seq( - libraryDependencies ++= Dependencies.testkit, - initialCommands += "import akka.testkit._", - previousArtifact := akkaPreviousArtifact("akka-testkit") - ) + dependencies = Seq(actor) ) lazy val actorTests = Project( id = "akka-actor-tests", base = file("akka-actor-tests"), - dependencies = Seq(testkit % "compile;test->test"), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ Seq( - publishArtifact in Compile := false, - libraryDependencies ++= Dependencies.actorTests - ) + dependencies = Seq(testkit % "compile;test->test") ) lazy val remote = Project( id = "akka-remote", base = file("akka-remote"), - dependencies = Seq(actor, actorTests % "test->test", testkit % "test->test"), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.remote ++ Seq( - libraryDependencies ++= Dependencies.remote, - // disable parallel tests - parallelExecution in Test := false, - previousArtifact := akkaPreviousArtifact("akka-remote") - ) + dependencies = Seq(actor, actorTests % "test->test", testkit % "test->test") ) lazy val multiNodeTestkit = Project( id = "akka-multi-node-testkit", base = file("akka-multi-node-testkit"), - dependencies = Seq(remote, testkit), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ Seq( - previousArtifact := akkaPreviousArtifact("akka-multi-node-testkit") - ) + dependencies = Seq(remote, testkit) ) lazy val remoteTests = Project( id = "akka-remote-tests", base = file("akka-remote-tests"), - dependencies = Seq(actorTests % "test->test", multiNodeTestkit), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ multiJvmSettings ++ Seq( - libraryDependencies ++= Dependencies.remoteTests, - // disable parallel tests - parallelExecution in Test := false, - extraOptions in MultiJvm <<= (sourceDirectory in MultiJvm) { src => - (name: String) => (src ** (name + ".conf")).get.headOption.map("-Dakka.config=" + _.absolutePath).toSeq - }, - scalatestOptions in MultiJvm := defaultMultiJvmScalatestOptions.value, - publishArtifact in Compile := false, - reportBinaryIssues := () // disable bin comp check - ) + dependencies = Seq(actorTests % "test->test", multiNodeTestkit) ) configs (MultiJvm) lazy val cluster = Project( id = "akka-cluster", base = file("akka-cluster"), - dependencies = Seq(remote, remoteTests % "test->test" , testkit % "test->test"), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ multiJvmSettings ++ OSGi.cluster ++ Seq( - libraryDependencies ++= Dependencies.cluster, - // disable parallel tests - parallelExecution in Test := false, - extraOptions in MultiJvm <<= (sourceDirectory in MultiJvm) { src => - (name: String) => (src ** (name + ".conf")).get.headOption.map("-Dakka.config=" + _.absolutePath).toSeq - }, - scalatestOptions in MultiJvm := defaultMultiJvmScalatestOptions.value, - previousArtifact := akkaPreviousArtifact("akka-cluster") - ) + dependencies = Seq(remote, remoteTests % "test->test" , testkit % "test->test") ) configs (MultiJvm) lazy val slf4j = Project( id = "akka-slf4j", base = file("akka-slf4j"), - dependencies = Seq(actor, testkit % "test->test"), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.slf4j ++ Seq( - libraryDependencies ++= Dependencies.slf4j, - previousArtifact := akkaPreviousArtifact("akka-slf4j") - ) + dependencies = Seq(actor, testkit % "test->test") ) lazy val agent = Project( id = "akka-agent", base = file("akka-agent"), - dependencies = Seq(actor, testkit % "test->test"), - settings = defaultSettings ++ formatSettings ++ scaladocSettingsNoVerificationOfDiagrams ++ javadocSettings ++ OSGi.agent ++ Seq( - libraryDependencies ++= Dependencies.agent, - previousArtifact := akkaPreviousArtifact("akka-agent") - ) + dependencies = Seq(actor, testkit % "test->test") ) lazy val persistence = Project( id = "akka-persistence-experimental", base = file("akka-persistence"), - dependencies = Seq(actor, remote % "test->test", testkit % "test->test"), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ experimentalSettings ++ javadocSettings ++ OSGi.persistence ++ Seq( - fork in Test := true, - javaOptions in Test := defaultMultiJvmOptions, - libraryDependencies ++= Dependencies.persistence, - previousArtifact := akkaPreviousArtifact("akka-persistence-experimental") - ) + dependencies = Seq(actor, remote % "test->test", testkit % "test->test") ) lazy val zeroMQ = Project( id = "akka-zeromq", base = file("akka-zeromq"), - dependencies = Seq(actor, testkit % "test;test->test"), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.zeroMQ ++ Seq( - libraryDependencies ++= Dependencies.zeroMQ, - previousArtifact := akkaPreviousArtifact("akka-zeromq") - ) + dependencies = Seq(actor, testkit % "test;test->test") ) lazy val kernel = Project( id = "akka-kernel", base = file("akka-kernel"), - dependencies = Seq(actor, testkit % "test->test"), - settings = defaultSettings ++ formatSettings ++ scaladocSettingsNoVerificationOfDiagrams ++ javadocSettings ++ Seq( - libraryDependencies ++= Dependencies.kernel, - previousArtifact := akkaPreviousArtifact("akka-kernel") - ) + dependencies = Seq(actor, testkit % "test->test") ) lazy val camel = Project( id = "akka-camel", base = file("akka-camel"), - dependencies = Seq(actor, slf4j, testkit % "test->test"), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.camel ++ Seq( - libraryDependencies ++= Dependencies.camel, - testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"), - previousArtifact := akkaPreviousArtifact("akka-camel") - ) + dependencies = Seq(actor, slf4j, testkit % "test->test") ) lazy val osgi = Project( id = "akka-osgi", base = file("akka-osgi"), - dependencies = Seq(actor), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ OSGi.osgi ++ Seq( - libraryDependencies ++= Dependencies.osgi, - parallelExecution in Test := false, - reportBinaryIssues := () // disable bin comp check - ) + dependencies = Seq(actor) ) lazy val samples = Project( @@ -312,6 +233,20 @@ object AkkaBuild extends Build { settings = sampleSettings ) + lazy val docs = Project( + id = "akka-docs", + base = file("akka-docs"), + dependencies = Seq(actor, testkit % "test->test", + remote % "compile;test->test", cluster, slf4j, agent, zeroMQ, camel, osgi, + persistence % "compile;test->test") + ) + + lazy val contrib = Project( + id = "akka-contrib", + base = file("akka-contrib"), + dependencies = Seq(remote, remoteTests % "test->test", cluster, persistence) + ) configs (MultiJvm) + lazy val clusterSampleJava = Project( id = "akka-sample-cluster-java", base = file("akka-samples/akka-sample-cluster-java"), @@ -428,43 +363,6 @@ object AkkaBuild extends Build { lazy val osgiSampleSettings: Seq[Setting[_]] = Seq(target := baseDirectory.value / "target-sbt") - lazy val docs = Project( - id = "akka-docs", - base = file("akka-docs"), - dependencies = Seq(actor, testkit % "test->test", - remote % "compile;test->test", cluster, slf4j, agent, zeroMQ, camel, osgi, - persistence % "compile;test->test"), - settings = defaultSettings ++ docFormatSettings ++ site.settings ++ site.sphinxSupport() ++ site.publishSite ++ - SphinxDoc.docsSettings ++ SphinxDoc.sphinxPreprocessing ++ Seq( - libraryDependencies ++= Dependencies.docs, - publishArtifact in Compile := false, - unmanagedSourceDirectories in ScalariformKeys.format in Test <<= unmanagedSourceDirectories in Test, - testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"), - reportBinaryIssues := () // disable bin comp check - ) - ) - - lazy val contrib = Project( - id = "akka-contrib", - base = file("akka-contrib"), - dependencies = Seq(remote, remoteTests % "test->test", cluster, persistence), - settings = defaultSettings ++ formatSettings ++ scaladocSettings ++ javadocSettings ++ multiJvmSettings ++ Seq( - libraryDependencies ++= Dependencies.contrib, - testOptions += Tests.Argument(TestFrameworks.JUnit, "-v"), - reportBinaryIssues := (), // disable bin comp check - description := """| - |This subproject provides a home to modules contributed by external - |developers which may or may not move into the officially supported code - |base over time. A module in this subproject doesn't have to obey the rule - |of staying binary compatible between minor releases. Breaking API changes - |may be introduced in minor releases without notice as we refine and - |simplify based on your feedback. A module may be dropped in any release - |without prior deprecation. The Typesafe subscription does not cover - |support for these modules. - |""".stripMargin - ) - ) configs (MultiJvm) - // Settings override lazy val settings = @@ -572,6 +470,10 @@ object AkkaBuild extends Build { // don't save test output to a file testListeners in (Test, test) := Seq(TestLogger(streams.value.log, {_ => streams.value.log }, logBuffered.value)), + // -v Log "test run started" / "test started" / "test run finished" events on log level "info" instead of "debug". + // -a Show stack traces and exception class name for AssertionErrors. + testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"), + validatePullRequestTask, // add reportBinaryIssues to validatePullRequest on minor version maintenance branch validatePullRequest <<= validatePullRequest.dependsOn(reportBinaryIssues)