@@ -10,32 +10,11 @@ lazy val commonSettings: Seq[Setting[_]] = Seq()
10
10
11
11
commonSettings // in root
12
12
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
-
23
13
lazy val core = project.in(file(" core" ))
24
14
.settings(ScalaModulePlugin .scalaModuleSettings)
25
- .settings(ScalaModulePlugin .scalaModuleOsgiSettings)
26
15
.settings(commonSettings)
27
16
.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"
39
18
)
40
19
41
20
lazy val junit = project.in(file(" junit" ))
0 commit comments