Merge pull request #3 from adriaanm/master

Switch to scala-module-plugin, sbt 0.13.1

Author: adriaanm

build.sbt

@@ -1,4 +1,3 @@
-import Settings._
 import Keys.{`package` => packageTask }
 import com.typesafe.sbt.osgi.{OsgiKeys, SbtOsgi}
 
@@ -8,13 +7,13 @@ lazy val commonSettings = scalaModuleSettings ++ Seq(
   repoName                   := "scala-continuations",
   organization               := "org.scala-lang.plugins",
   version                    := "1.0.0-SNAPSHOT",
-  scalaVersion               := "2.11.0-M7",
-  snapshotScalaBinaryVersion := "2.11.0-M7"
+  scalaVersion               := "2.11.0-M8",
+  snapshotScalaBinaryVersion := "2.11.0-M8"
 )
 
 lazy val root = project.in( file(".") ).settings( publishArtifact := false ).aggregate(plugin, library).settings(commonSettings : _*)
 
-lazy val plugin = project settings (SbtOsgi.osgiSettings: _*) settings (
+lazy val plugin = project settings (scalaModuleOsgiSettings: _*) settings (
   name                   := "scala-continuations-plugin",
   libraryDependencies    += "org.scala-lang" % "scala-compiler" % scalaVersion.value,
   OsgiKeys.exportPackage := Seq(s"scala.tools.selectivecps;version=${version.value}")
@@ -23,7 +22,7 @@ lazy val plugin = project settings (SbtOsgi.osgiSettings: _*) settings (
 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 (SbtOsgi.osgiSettings: _*) settings (
+lazy val library = project settings (scalaModuleOsgiSettings: _*) settings (
   name                 := "scala-continuations-library",
   scalacOptions       ++= Seq(
     // add the plugin to the compiler
@@ -34,9 +33,9 @@ lazy val library = project settings (SbtOsgi.osgiSettings: _*) settings (
     // the library after editing the plugin. (Otherwise a 'clean' is needed.)
     s"-Jdummy=${pluginJar.value.lastModified}"),
   libraryDependencies ++= Seq(
-    "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test",
-    "junit" % "junit" % "4.11" % "test",
-    "com.novocode" % "junit-interface" % "0.10" % "test"),
+    "org.scala-lang" % "scala-compiler"  % scalaVersion.value % "test",
+    "junit"          % "junit"           % "4.11" % "test",
+    "com.novocode"   % "junit-interface" % "0.10" % "test"),
   testOptions          += Tests.Argument(
     TestFrameworks.JUnit,
     s"-Dscala-continuations-plugin.jar=${pluginJar.value.getAbsolutePath}"

project/ContinuationsBuild.scala

@@ -1 +1 @@
-sbt.version=0.13.1-RC5
+sbt.version=0.13.1

project/build.properties

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
+addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.1")