More changes for sbt 0.13, also refactoring build according to effect…

…ive sbt rules

README.md

@@ -6,12 +6,12 @@ Plugin for [sbt](http://www.scala-sbt.org) to to create [OSGi](http://www.osgi.o
 Installing sbt-osgi
 -------------------
 
-sbt-osgi is a plugin for sbt. In order to install sbt, please refer to the [sbt documentation](http://www.scala-sbt.org/release/docs/Getting-Started/Setup.html). Please make sure that you are using a suitable version of sbt: 
+sbt-osgi is a plugin for sbt. In order to install sbt, please refer to the [sbt documentation](http://www.scala-sbt.org/release/docs/Getting-Started/Setup.html). Please make sure that you are using a suitable version of sbt:
 
 - sbt-osgi 0.5 → sbt 0.12
 - sbt-osgi 0.6 → sbt 0.13
 
-As sbt-osgi is a plugin for sbt, it is installed like any other sbt plugin, that is by mere configuration: just add sbt-osgi to your global or local plugin definition. Global plugins are defined in `~/.sbt/<SBT_VERSION>/plugins/plugins.sbt` and local plugins are defined in `project/plugins.sbt` in your project. 
+As sbt-osgi is a plugin for sbt, it is installed like any other sbt plugin, that is by mere configuration: just add sbt-osgi to your global or local plugin definition. Global plugins are defined in `~/.sbt/<SBT_VERSION>/plugins/plugins.sbt` and local plugins are defined in `project/plugins.sbt` in your project.
 
 In order to add sbt-osgi as a plugin, just add the below setting to the relevant plugin definition, paying attention to blank lines between settings:
 

build.sbt

@@ -1,11 +1,11 @@
-
 organization := "com.typesafe.sbt"
 
 name := "sbt-osgi"
 
-// TODO Move version to version.sbt in order to support sbt-release
 version := "0.6.0-SNAPSHOT"
 
+libraryDependencies ++= Dependencies.sbtOsgi
+
 scalacOptions ++= Seq(
   "-unchecked",
   "-deprecation",
@@ -15,14 +15,9 @@ scalacOptions ++= Seq(
   "-encoding", "UTF-8"
 )
 
-libraryDependencies ++= Seq(
-  "biz.aQute.bnd" % "bndlib" % "2.1.0",
-  "org.specs2" %% "specs2" % "1.14" % "test"
-)
-
 sbtPlugin := true
 
-publishTo := { 
+publishTo := {
   import Classpaths._
   val repo = if (isSnapshot.value) sbtPluginSnapshots else sbtPluginReleases
   Some(repo)

project/Dependencies.scala

@@ -0,0 +1,22 @@
+import sbt._
+
+object Library {
+
+  // Versions
+  val bndVersion = "2.1.0"
+  val specs2Version = "1.14"
+
+  // Libraries
+  val bndLib = "biz.aQute.bnd" % "bndlib" % bndVersion
+  val specs2 = "org.specs2" %% "specs2" % specs2Version
+}
+
+object Dependencies {
+
+  import Library._
+
+  val sbtOsgi = List(
+    bndLib,
+    specs2  % "test"
+  )
+}

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.0-Beta2
+sbt.version=0.13.0-RC1

project/plugins.sbt

@@ -1,4 +1,3 @@
-
 addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.1.0")
 
 libraryDependencies += ("org.scala-sbt" % "scripted-plugin" % sbtVersion.value)

scalariform.sbt

@@ -2,4 +2,4 @@ import scalariform.formatter.preferences.AlignSingleLineCaseStatements
 
 scalariformSettings
 
-ScalariformKeys.preferences <<= ScalariformKeys.preferences(_.setPreference(AlignSingleLineCaseStatements, true))
+ScalariformKeys.preferences := ScalariformKeys.preferences.value.setPreference(AlignSingleLineCaseStatements, true)