raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

=pro osgi cleanup

Browse source
This commit is contained in:
Konrad Malawski 2016-01-13 01:28:59 +01:00
parent e6448dfd05
commit 00380d5488
2 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
project/AkkaBuild.scala
View file

@ -243,7 +243,7 @@ object AkkaBuild extends Build {
lazy val httpCore = Project( lazy val httpCore = Project(
id = "akka-http-core-experimental", id = "akka-http-core-experimental",
base = file("akka-http-core"), base = file("akka-http-core"),
dependencies = Seq(parsing, streamTestkit % "test->test", stream), dependencies = Seq(stream, parsing, streamTestkit % "test->test"),
settings = defaultSettings settings = defaultSettings
// ++ (if (GenJavaDocEnabled) Seq( // ++ (if (GenJavaDocEnabled) Seq(
// // genjavadoc needs to generate synthetic methods since the java code uses them // // genjavadoc needs to generate synthetic methods since the java code uses them

31
project/OSGi.scala
View file

@ -47,39 +47,28 @@ object OSGi {
val parsing = exports(Seq("akka.parboiled2.*", "akka.shapeless.*"), val parsing = exports(Seq("akka.parboiled2.*", "akka.shapeless.*"),
imports = Seq(optionalResolution("scala.quasiquotes"))) imports = Seq(optionalResolution("scala.quasiquotes")))
val httpCore = exports(Seq("akka.http.*"), val httpCore = exports(Seq("akka.http.*"))
imports = Seq(streamAndHttpImport("akka.stream.*"),
streamAndHttpImport("akka.parboiled2.*"),
streamAndHttpImport("akka.shapeless.*")))
val http = exports(Seq("akka.http.impl.server", val http = exports(Seq("akka.http.impl.server",
"akka.http.scaladsl.server.*", "akka.http.javadsl.server.*", "akka.http.scaladsl.server.*", "akka.http.javadsl.server.*",
"akka.http.scaladsl.client", "akka.http.scaladsl.coding", "akka.http.scaladsl.common", "akka.http.scaladsl.client", "akka.http.scaladsl.coding", "akka.http.scaladsl.common",
"akka.http.scaladsl.marshalling", "akka.http.scaladsl.unmarshalling"), "akka.http.scaladsl.marshalling", "akka.http.scaladsl.unmarshalling"),
imports = Seq(streamAndHttpImport("akka.stream.*"), imports = Seq(
streamAndHttpImport("akka.http.*"), streamAndHttpImport("akka.stream.*"),
streamAndHttpImport("akka.parboiled2.*"))) streamAndHttpImport("akka.parboiled2.*"))
)
val httpTestkit = exports(Seq("akka.http.scaladsl.testkit.*", "akka.http.javadsl.testkit.*"), val httpTestkit = exports(Seq("akka.http.scaladsl.testkit.*", "akka.http.javadsl.testkit.*"))
imports = Seq(streamAndHttpImport("akka.stream.*"),
streamAndHttpImport("akka.http.*")))
val httpSprayJson = exports(Seq("akka.http.scaladsl.marshallers.sprayjson"), val httpSprayJson = exports(Seq("akka.http.scaladsl.marshallers.sprayjson"))
imports = Seq(streamAndHttpImport("akka.stream.*"),
streamAndHttpImport("akka.http.*")))
val httpXml = exports(Seq("akka.http.scaladsl.marshallers.xml"), val httpXml = exports(Seq("akka.http.scaladsl.marshallers.xml"))
imports = Seq(streamAndHttpImport("akka.stream.*"),
streamAndHttpImport("akka.http.*")))
val httpJackson = exports(Seq("akka.http.javadsl.marshallers.jackson"), val httpJackson = exports(Seq("akka.http.javadsl.marshallers.jackson"))
imports = Seq(streamAndHttpImport("akka.stream.*"),
streamAndHttpImport("akka.http.*")))
val stream = exports(Seq("akka.stream.*")) val stream = exports(Seq("akka.stream.*"))
val streamTestkit = exports(Seq("akka.stream.testkit.*"), val streamTestkit = exports(Seq("akka.stream.testkit.*"))
imports = Seq(streamAndHttpImport("akka.stream.*")))
val slf4j = exports(Seq("akka.event.slf4j.*")) val slf4j = exports(Seq("akka.event.slf4j.*"))