Skip to content

Commit a596352

Browse files
authored
Merge pull request #99 from lrytz/no-osgi
2 parents 31175e5 + 9a0e4bd commit a596352

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

build.sbt

+1-22
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,11 @@ lazy val commonSettings: Seq[Setting[_]] = Seq()
1010

1111
commonSettings // in root
1212

13-
/** Create an OSGi version range for standard Scala / Lightbend versioning
14-
* schemes that describes binary compatible versions. */
15-
def osgiVersionRange(version: String): String =
16-
if(version contains '-') "${@}" // M, RC or SNAPSHOT -> exact version
17-
else "${range;[==,=+)}" // Any binary compatible version
18-
19-
/** Create an OSGi Import-Package version specification. */
20-
def osgiImport(pattern: String, version: String): String =
21-
pattern + ";version=\"" + osgiVersionRange(version) + "\""
22-
2313
lazy val core = project.in(file("core"))
2414
.settings(ScalaModulePlugin.scalaModuleSettings)
25-
.settings(ScalaModulePlugin.scalaModuleOsgiSettings)
2615
.settings(commonSettings)
2716
.settings(
28-
name := "scala-parallel-collections",
29-
OsgiKeys.exportPackage := Seq(
30-
s"scala.collection.parallel.*;version=${version.value}",
31-
// The first entry on the classpath is the project's target classes dir but sbt-osgi also passes all
32-
// dependencies to bnd. Any "merge" strategy for split packages would include the classes from scala-library.
33-
s"scala.collection;version=${version.value};-split-package:=first",
34-
s"scala.collection.generic;version=${version.value};-split-package:=first"
35-
),
36-
// Use correct version for scala package imports
37-
OsgiKeys.importPackage := Seq(osgiImport("scala*", scalaVersion.value), "*"),
38-
scalaModuleMimaPreviousVersion := None
17+
name := "scala-parallel-collections"
3918
)
4019

4120
lazy val junit = project.in(file("junit"))

0 commit comments

Comments
 (0)