From 9a0e4bd2af41c0a81005b52c6bc7e3a5bb83fa28 Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Fri, 17 Apr 2020 09:14:57 +0200 Subject: [PATCH] No longer bundle as OSGi --- build.sbt | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/build.sbt b/build.sbt index 13e93b2b..555b1536 100644 --- a/build.sbt +++ b/build.sbt @@ -10,32 +10,11 @@ lazy val commonSettings: Seq[Setting[_]] = Seq() commonSettings // in root -/** Create an OSGi version range for standard Scala / Lightbend versioning - * schemes that describes binary compatible versions. */ -def osgiVersionRange(version: String): String = - if(version contains '-') "${@}" // M, RC or SNAPSHOT -> exact version - else "${range;[==,=+)}" // Any binary compatible version - -/** Create an OSGi Import-Package version specification. */ -def osgiImport(pattern: String, version: String): String = - pattern + ";version=\"" + osgiVersionRange(version) + "\"" - lazy val core = project.in(file("core")) .settings(ScalaModulePlugin.scalaModuleSettings) - .settings(ScalaModulePlugin.scalaModuleOsgiSettings) .settings(commonSettings) .settings( - name := "scala-parallel-collections", - OsgiKeys.exportPackage := Seq( - s"scala.collection.parallel.*;version=${version.value}", - // The first entry on the classpath is the project's target classes dir but sbt-osgi also passes all - // dependencies to bnd. Any "merge" strategy for split packages would include the classes from scala-library. - s"scala.collection;version=${version.value};-split-package:=first", - s"scala.collection.generic;version=${version.value};-split-package:=first" - ), - // Use correct version for scala package imports - OsgiKeys.importPackage := Seq(osgiImport("scala*", scalaVersion.value), "*"), - scalaModuleMimaPreviousVersion := None + name := "scala-parallel-collections" ) lazy val junit = project.in(file("junit"))