Skip to content

Commit b5b7d0c

Browse files
committed
fix bad artifacts by disabling OSGi support
fixes #51
1 parent ad5a950 commit b5b7d0c

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

Diff for: build.sbt

+9-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
99
.crossType(CrossType.Pure)
1010
.in(file("."))
1111
.settings(ScalaModulePlugin.scalaModuleSettings)
12-
.jvmSettings(ScalaModulePlugin.scalaModuleSettingsJVM)
12+
// as per #71, we are not currently attempting to support OSGi in this repo
13+
.disablePlugins(SbtOsgi)
14+
// disabling the plugin isn't sufficient; we also must prevent sbt-scala-module
15+
// from putting OSGi stuff in our settings. at present (sbt-scala-module 2.1.3),
16+
// scalaModuleSettingsJVM contains *only* OSGi stuff, so the easiest thing is
17+
// just to omit it. this isn't future-proof; some future sbt-scala-module
18+
// might put additional stuff in scalaModuleSettingsJVM
19+
// .jvmSettings(ScalaModulePlugin.scalaModuleSettingsJVM)
1320
.settings(
1421
name := "scala-collection-contrib",
1522
scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings"),
@@ -25,10 +32,7 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
2532
useCoursier := false
2633
)
2734
.jvmSettings(
28-
scalaModuleMimaPreviousVersion := Some("0.1.0"), // why only in jvmSettings?
29-
// TODO: osgi settings; not trivial because of split packages.
30-
// See https://github.com/scala/scala-collection-compat/pull/226
31-
// OsgiKeys.exportPackage := Seq(s"scala.collection.*;version=${version.value}"),
35+
scalaModuleMimaPreviousVersion := Some("0.1.0")
3236
)
3337
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
3438
.jsSettings(

0 commit comments

Comments
 (0)