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

Merge pull request #25906 from woq-blended/master

Browse source 
Adding OSGi settings for akka-actor-typed and persistence-typed.
This commit is contained in:
Patrik Nordwall 2018-11-13 15:07:00 +01:00 • committed by GitHub
commit f30f3b2104
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.sbt
View file

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

22
project/OSGi.scala
View file

@ -35,6 +35,8 @@ object OSGi {
// dynamicImportPackage needed for loading classes defined in configuration // dynamicImportPackage needed for loading classes defined in configuration
OsgiKeys.dynamicImportPackage := Seq("*")) OsgiKeys.dynamicImportPackage := Seq("*"))
val actorTyped = exports(Seq("akka.actor.typed.*"))
val agent = exports(Seq("akka.agent.*")) val agent = exports(Seq("akka.agent.*"))
val camel = exports(Seq("akka.camel.*")) val camel = exports(Seq("akka.camel.*"))
@ -91,8 +93,16 @@ object OSGi {
exports( exports(
packages = Seq( packages = Seq(
"akka.stream.*", "akka.stream.*",
"com.typesafe.sslconfig.akka.*"), "com.typesafe.sslconfig.akka.*"
imports = Seq(scalaJava8CompatImport(), scalaParsingCombinatorImport(), sslConfigCoreImport(), sslConfigCoreSslImport(), sslConfigCoreUtilImport())) ),
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.*")) val streamTestkit = exports(Seq("akka.stream.testkit.*"))
@ -100,7 +110,13 @@ object OSGi {
val persistence = exports( val persistence = exports(
Seq("akka.persistence.*"), 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.*")) val persistenceQuery = exports(Seq("akka.persistence.query.*"))