Merge pull request #22370 from akka/wip-22363-osgi-range-patriknw

update osgi version import, #22363
This commit is contained in:
Patrik Nordwall 2017-02-23 13:11:51 +01:00 committed by GitHub
commit ed8a67daa4

View file

@ -114,7 +114,7 @@ object OSGi {
)
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 akkaImport(packageName: String = "akka.*") = versionedImport(packageName, "2.5", "2.6")
def configImport(packageName: String = "com.typesafe.config.*") = versionedImport(packageName, "1.3.0", "1.4.0")
def scalaImport(version: String) = {
val packageName = "scala.*"