diff --git a/akka-http-core/build.sbt b/akka-http-core/build.sbt index 57883e24583..b48c8cdc388 100644 --- a/akka-http-core/build.sbt +++ b/akka-http-core/build.sbt @@ -2,7 +2,6 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings -AkkaBuild.experimentalSettings Formatting.formatSettings OSGi.httpCore Dependencies.httpCore diff --git a/akka-parsing/build.sbt b/akka-parsing/build.sbt index f1a9fd0117c..b8251b13f27 100644 --- a/akka-parsing/build.sbt +++ b/akka-parsing/build.sbt @@ -2,7 +2,6 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings -AkkaBuild.experimentalSettings Formatting.docFormatSettings site.settings OSGi.parsing diff --git a/akka-stream-testkit/build.sbt b/akka-stream-testkit/build.sbt index fb0fa86982e..1f9446d4f43 100644 --- a/akka-stream-testkit/build.sbt +++ b/akka-stream-testkit/build.sbt @@ -2,7 +2,6 @@ import akka._ import com.typesafe.tools.mima.plugin.MimaKeys AkkaBuild.defaultSettings -AkkaBuild.experimentalSettings Formatting.formatSettings OSGi.streamTestkit Dependencies.streamTestkit diff --git a/akka-stream/build.sbt b/akka-stream/build.sbt index ec1ddb47edf..e1ee3413288 100644 --- a/akka-stream/build.sbt +++ b/akka-stream/build.sbt @@ -3,7 +3,6 @@ import com.typesafe.tools.mima.plugin.MimaKeys import spray.boilerplate.BoilerplatePlugin._ AkkaBuild.defaultSettings -AkkaBuild.experimentalSettings Formatting.formatSettings OSGi.stream Dependencies.stream diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 82b83f0f0a3..effbb730125 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -201,7 +201,7 @@ object AkkaBuild extends Build { ) lazy val httpCore = Project( - id = "akka-http-core-experimental", + id = "akka-http-core", base = file("akka-http-core"), dependencies = Seq(stream, parsing, streamTestkit % "test->test") ) @@ -212,12 +212,6 @@ object AkkaBuild extends Build { dependencies = Seq(httpCore) ) - lazy val streamTestkit = Project( - id = "akka-stream-testkit", - base = file("akka-stream-testkit"), // TODO that persistence dependency - dependencies = Seq(stream, persistence % "compile;provided->provided;test->test", testkit % "compile;test->test") - ) - lazy val httpTestkit = Project( id = "akka-http-testkit-experimental", base = file("akka-http-testkit"), @@ -266,16 +260,22 @@ object AkkaBuild extends Build { ) lazy val parsing = Project( - id = "akka-parsing-experimental", + id = "akka-parsing", base = file("akka-parsing") ) lazy val stream = Project( - id = "akka-stream-experimental", + id = "akka-stream", base = file("akka-stream"), dependencies = Seq(actor) ) + lazy val streamTestkit = Project( + id = "akka-stream-testkit", + base = file("akka-stream-testkit"), // TODO that persistence dependency + dependencies = Seq(stream, persistence % "compile;provided->provided;test->test", testkit % "compile;test->test") + ) + lazy val streamTests = Project( id = "akka-stream-tests-experimental", base = file("akka-stream-tests"),