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

=pro merge ssl-config-akka from ssl-config project into akka-stream (#21551)

Browse source 
This will fix the cyclic dependency issue between the ssl-config repo
and akka.

It would have been better if akka-stream would not require
these changes at all but com.typesafe.sslconfig.akka.AkkaSSLConfig is
part of the public interface of akka-stream's TLS stage. So, this
can only be fixed in the next major version.

Source code was copied over from the tree at commit
470fae76f3

See https://github.com/typesafehub/ssl-config/issues/47
This commit is contained in:
Johannes Rudolph 2016-10-28 16:41:26 +02:00 • committed by Konrad Malawski
parent 0127d4f424
commit c9854e4350
7 changed files with 288 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
project/OSGi.scala
View file

@ -5,6 +5,7 @@ package akka
import com.typesafe.sbt.osgi.OsgiKeys
import com.typesafe.sbt.osgi.SbtOsgi._
import com.typesafe.sbt.osgi.SbtOsgi.autoImport._
import sbt._
import sbt.Keys._
@ -81,7 +82,12 @@ object OSGi {
val httpJackson = exports(Seq("akka.http.javadsl.marshallers.jackson"))
val stream = exports(Seq("akka.stream.*"), imports = Seq(scalaJava8CompatImport()))
val stream =
exports(
packages = Seq("akka.stream.*",
"com.typesafe.sslconfig.akka.*"),
imports = Seq(scalaJava8CompatImport())) ++
Seq(OsgiKeys.requireBundle := Seq(s"""com.typesafe.sslconfig;bundle-version="${Dependencies.sslConfigVersion}""""))
val streamTestkit = exports(Seq("akka.stream.testkit.*"))