Merge pull request #3 from adriaanm/master

Switch to scala-module-plugin, sbt 0.13.1

Author: adriaanm

build.sbt

@@ -1,16 +1,14 @@
-import VersionKeys._
+scalaModuleSettings
 
-organization := "org.scala-lang.modules"
+name                       := "scala-swing"
 
-name := "scala-swing"
+version                    := "1.0.0-SNAPSHOT"
 
-version := "1.0.0-SNAPSHOT"
+scalaVersion               := "2.11.0-M8"
 
-scalaVersion := "2.11.0-M7"
-
-snapshotScalaBinaryVersion := "2.11.0-M7"
+snapshotScalaBinaryVersion := "2.11.0-M8"
 
 // important!! must come here (why?)
-osgiSettings
+scalaModuleOsgiSettings
 
 OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")

project/build.properties

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

project/keys.scala

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