File tree Expand file tree Collapse file tree 1 file changed +8
-1
lines changed Expand file tree Collapse file tree 1 file changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,13 @@ def jwrite(dir: java.io.File)(name: String, content: String) = {
88 f
99}
1010
11+ def osgiExport (scalaVersion : String , version : String ) = {
12+ (CrossVersion .partialVersion(scalaVersion) match {
13+ case Some ((2 , 11 )) => Seq (s " scala.runtime.java8.*;version= ${version}" )
14+ case _ => Nil
15+ }) ++ Seq (s " scala.compat.java8.*;version= ${version}" )
16+ }
17+
1118lazy val commonSettings = Seq (
1219 scalaVersion := " 2.11.8" ,
1320 crossScalaVersions := List (" 2.11.8" , " 2.12.0-M5" ),
@@ -36,7 +43,7 @@ lazy val root = (project in file(".")).
3643 settings(
3744 fork := true , // This must be set so that runner task is forked when it runs fnGen and the compiler gets a proper classpath
3845
39- OsgiKeys .exportPackage := Seq ( s " scala.compat.java8.*; version= ${version .value} " ),
46+ OsgiKeys .exportPackage := osgiExport(scalaVersion.value, version.value),
4047
4148 OsgiKeys .privatePackage := List (" scala.concurrent.java8.*" ),
4249
You can’t perform that action at this time.
0 commit comments