Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix bad artifacts by disabling OSGi support #72

Merged
merged 1 commit into from
Dec 30, 2019
Merged

fix bad artifacts by disabling OSGi support #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
.crossType(CrossType.Pure)
.in(file("."))
.settings(ScalaModulePlugin.scalaModuleSettings)
.jvmSettings(ScalaModulePlugin.scalaModuleSettingsJVM)
// as per #71, we are not currently attempting to support OSGi in this repo
.disablePlugins(SbtOsgi)
// disabling the plugin isn't sufficient; we also must refrain from letting sbt-scala-module put
// OSGi stuff in our settings. normally a module build would include the following commented-out
// line. at present (sbt-scala-module 2.1.3), scalaModuleSettingsJVM contains *only* OSGi stuff,
// so the easiest thing is just to omit it. this isn't future-proof; some future sbt-scala-module
// might put additional stuff in scalaModuleSettingsJVM. it would be nice if sbt-scala-module
// provided a setting key to selectively disable OSGi.
// .jvmSettings(ScalaModulePlugin.scalaModuleSettingsJVM)
.settings(
name := "scala-collection-contrib",
scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings"),
Expand All @@ -25,10 +33,7 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
useCoursier := false
)
.jvmSettings(
scalaModuleMimaPreviousVersion := Some("0.1.0"), // why only in jvmSettings?
// TODO: osgi settings; not trivial because of split packages.
// See https://github.com/scala/scala-collection-compat/pull/226
// OsgiKeys.exportPackage := Seq(s"scala.collection.*;version=${version.value}"),
scalaModuleMimaPreviousVersion := Some("0.1.0")
)
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
.jsSettings(
Expand Down