Merge pull request #17692 from ennru/master
2.4.0-M1: Wrong version of com.typesafe.config in OSGi manifest
This commit is contained in:
commit
b61088e13b
1 changed files with 1 additions and 1 deletions
|
|
@ -60,7 +60,7 @@ 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.2.0", "1.3.0")
|
||||
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.*"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue