@@ -9,7 +9,15 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
9
9
.crossType(CrossType .Pure )
10
10
.in(file(" ." ))
11
11
.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)
13
21
.settings(
14
22
name := " scala-collection-contrib" ,
15
23
scalacOptions ++= Seq (" -opt-warnings" , " -language:higherKinds" , " -deprecation" , " -feature" , " -Xfatal-warnings" ),
@@ -25,10 +33,7 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
25
33
useCoursier := false
26
34
)
27
35
.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" )
32
37
)
33
38
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin ))
34
39
.jsSettings(
0 commit comments