Merge pull request #25906 from woq-blended/master

Adding OSGi settings for akka-actor-typed and persistence-typed.

build.sbt

@@ -382,6 +382,7 @@ lazy val actorTyped = akkaModule("akka-actor-typed")
   .dependsOn(actor)
   .settings(AkkaBuild.mayChangeSettings)
   .settings(AutomaticModuleName.settings("akka.actor.typed")) // fine for now, eventually new module name to become typed.actor
+  .settings(OSGi.actorTyped)
   .settings(
     initialCommands := """
       import akka.actor.typed._
@@ -405,6 +406,7 @@ lazy val persistenceTyped = akkaModule("akka-persistence-typed")
   .settings(Dependencies.persistenceShared)
   .settings(AkkaBuild.mayChangeSettings)
   .settings(AutomaticModuleName.settings("akka.persistence.typed"))
+  .settings(OSGi.persistenceTyped)
   .disablePlugins(MimaPlugin)
 
 lazy val clusterTyped = akkaModule("akka-cluster-typed")

project/OSGi.scala

@@ -35,6 +35,8 @@ object OSGi {
     // dynamicImportPackage needed for loading classes defined in configuration
     OsgiKeys.dynamicImportPackage := Seq("*"))
 
+  val actorTyped = exports(Seq("akka.actor.typed.*"))
+
   val agent = exports(Seq("akka.agent.*"))
 
   val camel = exports(Seq("akka.camel.*"))
@@ -91,8 +93,16 @@ object OSGi {
     exports(
       packages = Seq(
         "akka.stream.*",
-        "com.typesafe.sslconfig.akka.*"),
-      imports = Seq(scalaJava8CompatImport(), scalaParsingCombinatorImport(), sslConfigCoreImport(), sslConfigCoreSslImport(), sslConfigCoreUtilImport()))
+        "com.typesafe.sslconfig.akka.*"
+      ),
+      imports = Seq(
+        scalaJava8CompatImport(),
+        scalaParsingCombinatorImport(),
+        sslConfigCoreImport("com.typesafe.sslconfig.ssl.*"),
+        sslConfigCoreImport("com.typesafe.sslconfig.util.*"),
+        "!com.typesafe.sslconfig.akka.*"
+      )
+    )
 
   val streamTestkit = exports(Seq("akka.stream.testkit.*"))
 
@@ -100,7 +110,13 @@ object OSGi {
 
   val persistence = exports(
     Seq("akka.persistence.*"),
-    imports = Seq(optionalResolution("org.fusesource.leveldbjni.*"), optionalResolution("org.iq80.leveldb.*")))
+    imports = Seq(
+      optionalResolution("org.fusesource.leveldbjni.*"), 
+      optionalResolution("org.iq80.leveldb.*")
+    )
+  )
+
+  val persistenceTyped = exports(Seq("akka.persistence.typed.*"))
 
   val persistenceQuery = exports(Seq("akka.persistence.query.*"))