Merge pull request scala#90 from lrytz/module-plugin-2.2

Author: lrytz

build.sbt

@@ -9,15 +9,6 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
   .crossType(CrossType.Pure)
   .in(file("."))
   .settings(ScalaModulePlugin.scalaModuleSettings)
-  // 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"),

project/plugins.sbt

@@ -1,7 +1,7 @@
 val scalaJSVersion =
   Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.32")
 
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.3")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.2.0")
 
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)