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

=all #13783 replace protobuf dependency by embedded version

Browse source 
- created new subproject akka-protobuf (and added COPYING and LICENSE)
- renamed com.google.protobuf -> akka.protobuf everywhere
- also added such renaming step to the results of protoc compilation in
  project/Protobuf.scala
- had to include transcriptions of Netty’s ProtobufEncoder/Decoder to
  make multi-node-testkit compile again
This commit is contained in:
Roland Kuhn 2015-02-18 00:15:50 +01:00 • committed by Patrik Nordwall
parent baa4399521
commit c3ecb87a65
82 changed files with 56148 additions and 7695 deletions
Download patch file Download diff file Expand all files Collapse all files

21
project/OSGi.scala
View file

@ -26,26 +26,27 @@ object OSGi {
val camel = exports(Seq("akka.camel.*"))
val cluster = exports(Seq("akka.cluster.*"), imports = Seq(protobufImport()))
val cluster = exports(Seq("akka.cluster.*"))
val clusterTools = exports(Seq("akka.cluster.singleton.*", "akka.cluster.client.*", "akka.cluster.pubsub.*"),
imports = Seq(protobufImport()))
val clusterTools = exports(Seq("akka.cluster.singleton.*", "akka.cluster.client.*", "akka.cluster.pubsub.*"))
val clusterSharding = exports(Seq("akka.cluster.sharding.*"), imports = Seq(protobufImport()))
val clusterSharding = exports(Seq("akka.cluster.sharding.*"))
val clusterMetrics = exports(Seq("akka.cluster.metrics.*"), imports = Seq(protobufImport(),kamonImport(),sigarImport()))
val clusterMetrics = exports(Seq("akka.cluster.metrics.*"), imports = Seq(kamonImport(), sigarImport()))
val distributedData = exports(Seq("akka.cluster.ddata.*"), imports = Seq(protobufImport()))
val distributedData = exports(Seq("akka.cluster.ddata.*"))
val contrib = exports(Seq("akka.contrib.*"))
val osgi = exports(Seq("akka.osgi.*"))
val remote = exports(Seq("akka.remote.*"), imports = Seq(protobufImport()))
val protobuf = exports(Seq("akka.protobuf.*"))
val remote = exports(Seq("akka.remote.*"))
val slf4j = exports(Seq("akka.event.slf4j.*"))
val persistence = exports(Seq("akka.persistence.*"), imports = Seq(protobufImport()))
val persistence = exports(Seq("akka.persistence.*"))
val persistenceQuery = exports(Seq("akka.persistence.query.*"))
@ -55,8 +56,7 @@ object OSGi {
// needed because testkit is normally not used in the application bundle,
// but it should still be included as transitive dependency and used by BundleDelegatingClassLoader
// to be able to find reference.conf
"akka.testkit",
"com.google.protobuf")
"akka.testkit")
def exports(packages: Seq[String] = Seq(), imports: Seq[String] = Nil) = osgiSettings ++ Seq(
OsgiKeys.importPackage := imports ++ scalaVersion(defaultImports).value,
@ -65,7 +65,6 @@ object OSGi {
def defaultImports(scalaVersion: String) = Seq("!sun.misc", akkaImport(), configImport(), scalaImport(scalaVersion), "*")
def akkaImport(packageName: String = "akka.*") = versionedImport(packageName, "2.4", "2.5")
def configImport(packageName: String = "com.typesafe.config.*") = versionedImport(packageName, "1.3.0", "1.4.0")
def protobufImport(packageName: String = "com.google.protobuf.*") = versionedImport(packageName, "2.5.0", "2.6.0")
def scalaImport(version: String) = {
val packageName = "scala.*"
val ScalaVersion = """(\d+)\.(\d+)\..*""".r