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

Fix #21791 by adding exclusions scala packages in external moduls

Browse source 
This patch fixes akka-stream's OSGi manifest by adding
an explicit exclusion for scala.* packages known to have
different versions, so they do not get expanded by scalaImport()
and subsequent "*".

Signed-off-by: Robert Varga <nite@hq.sk>
This commit is contained in:
Robert Varga 2016-11-15 00:24:46 +01:00
parent 88a6bdb059
commit e465f07d94
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
project/OSGi.scala
View file

@ -110,7 +110,8 @@ object OSGi {
OsgiKeys.importPackage := imports ++ scalaVersion(defaultImports).value,
OsgiKeys.exportPackage := packages
)
def defaultImports(scalaVersion: String) = Seq("!sun.misc", akkaImport(), configImport(), scalaImport(scalaVersion), "*")
def defaultImports(scalaVersion: String) = Seq("!sun.misc", akkaImport(), configImport(), "!scala.compat.java8.*",
"!scala.util.parsing.*", 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 scalaImport(version: String) = {