Merge pull request #2 from adriaanm/osgi

Fix osgi madness

Author: adriaanm

build.sbt

@@ -1,5 +1,6 @@
 import Settings._
 import Keys.{`package` => packageTask }
+import com.typesafe.sbt.osgi.{OsgiKeys, SbtOsgi}
 
 // plugin logic of build based on https://github.com/retronym/boxer
 
@@ -13,15 +14,16 @@ lazy val commonSettings = scalaModuleSettings ++ Seq(
 
 lazy val root = project.in( file(".") ).settings( publishArtifact := false ).aggregate(plugin, library).settings(commonSettings : _*)
 
-lazy val plugin = project settings (
-  name                := "scala-continuations-plugin",
-  libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
+lazy val plugin = project settings (SbtOsgi.osgiSettings: _*) settings (
+  name                   := "scala-continuations-plugin",
+  libraryDependencies    += "org.scala-lang" % "scala-compiler" % scalaVersion.value,
+  OsgiKeys.exportPackage := Seq(s"scala.tools.selectivecps;version=${version.value}")
 ) settings (commonSettings : _*)
 
 val pluginJar = packageTask in (plugin, Compile)
 
 // TODO: the library project's test are really plugin tests, but we first need that jar
-lazy val library = project settings (
+lazy val library = project settings (SbtOsgi.osgiSettings: _*) settings (
   name                 := "scala-continuations-library",
   scalacOptions       ++= Seq(
     // add the plugin to the compiler
@@ -38,5 +40,6 @@ lazy val library = project settings (
   testOptions          += Tests.Argument(
     TestFrameworks.JUnit,
     s"-Dscala-continuations-plugin.jar=${pluginJar.value.getAbsolutePath}"
-  )
+  ),
+  OsgiKeys.exportPackage := Seq(s"scala.util.continuations;version=${version.value}")
 ) settings (commonSettings : _*)

project/ContinuationsBuild.scala

@@ -14,7 +14,7 @@ object Settings {
 
   val osgiVersion = version(_.replace('-', '.'))
 
-  lazy val scalaModuleSettings = SbtOsgi.osgiSettings ++ Seq(
+  lazy val scalaModuleSettings = Seq(
     repoName := name.value,
 
     scalaBinaryVersion := deriveBinaryVersion(scalaVersion.value, snapshotScalaBinaryVersion.value),
@@ -37,10 +37,6 @@ object Settings {
       Seq(file)
     },
 
-    mappings in (Compile, packageBin) += {
-       (baseDirectory.value / s"${name.value}.properties") -> s"${name.value}.properties"
-    },
-
 
     // maven publishing
     publishTo := {
@@ -91,7 +87,6 @@ object Settings {
 
     OsgiKeys.bundleSymbolicName := s"${organization.value}.${name.value}",
     OsgiKeys.bundleVersion := osgiVersion.value,
-    OsgiKeys.exportPackage := Seq(s"*;version=${version.value}"),
     // Sources should also have a nice MANIFEST file
     packageOptions in packageSrc := Seq(
       Package.ManifestAttributes(