Skip to content

Commit fd48f87

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

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

Diff for: build.sbt

+10-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ 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 refrain from letting sbt-scala-module put
15+
// OSGi stuff in our settings. normally a module build would include the following commented-out
16+
// line. at present (sbt-scala-module 2.1.3), scalaModuleSettingsJVM contains *only* OSGi stuff,
17+
// so the easiest thing is just to omit it. this isn't future-proof; some future sbt-scala-module
18+
// might put additional stuff in scalaModuleSettingsJVM. it would be nice if sbt-scala-module
19+
// provided a setting key to selectively disable OSGi.
20+
// .jvmSettings(ScalaModulePlugin.scalaModuleSettingsJVM)
1321
.settings(
1422
name := "scala-collection-contrib",
1523
scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings"),
@@ -25,10 +33,7 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
2533
useCoursier := false
2634
)
2735
.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}"),
36+
scalaModuleMimaPreviousVersion := Some("0.1.0")
3237
)
3338
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
3439
.jsSettings(

0 commit comments

Comments
 (0)