From 94060d61326f15c6576c16dc7afd430673fe2838 Mon Sep 17 00:00:00 2001
From: Peter Vlugter <pvlugter@gmail.com>
Date: Tue, 6 Nov 2012 12:30:31 +1300
Subject: [PATCH] Update build and sbt plugin to sbt 0.12.1

---
 akka-sbt-plugin/sample/project/Build.scala            | 6 +++---
 akka-sbt-plugin/sample/project/build.properties       | 2 +-
 akka-sbt-plugin/sample/project/plugins.sbt            | 2 --
 akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala | 4 ++--
 project/AkkaBuild.scala                               | 2 +-
 project/build.properties                              | 2 +-
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/akka-sbt-plugin/sample/project/Build.scala b/akka-sbt-plugin/sample/project/Build.scala
index b7c5122da3..6fbf075359 100644
--- a/akka-sbt-plugin/sample/project/Build.scala
+++ b/akka-sbt-plugin/sample/project/Build.scala
@@ -7,7 +7,7 @@ import akka.sbt.AkkaKernelPlugin.{ Dist, outputDirectory, distJvmOptions}
 object HelloKernelBuild extends Build {
   val Organization = "akka.sample"
   val Version      = "2.2-SNAPSHOT"
-  val ScalaVersion = "2.10.0-M6"
+  val ScalaVersion = "2.10.0-RC1"
 
   lazy val HelloKernel = Project(
     id = "hello-kernel",
@@ -52,7 +52,7 @@ object Dependency {
     val Akka      = "2.2-SNAPSHOT"
   }
 
-  val akkaKernel        = "com.typesafe.akka" % "akka-kernel"        % V.Akka
-  val akkaSlf4j         = "com.typesafe.akka" % "akka-slf4j"         % V.Akka
+  val akkaKernel        = "com.typesafe.akka" %% "akka-kernel"       % V.Akka cross CrossVersion.full
+  val akkaSlf4j         = "com.typesafe.akka" %% "akka-slf4j"        % V.Akka cross CrossVersion.full
   val logback           = "ch.qos.logback"    % "logback-classic"    % "1.0.0"
 }
diff --git a/akka-sbt-plugin/sample/project/build.properties b/akka-sbt-plugin/sample/project/build.properties
index f4ff7a5afa..4474a03e1a 100644
--- a/akka-sbt-plugin/sample/project/build.properties
+++ b/akka-sbt-plugin/sample/project/build.properties
@@ -1 +1 @@
-sbt.version=0.11.2
+sbt.version=0.12.1
diff --git a/akka-sbt-plugin/sample/project/plugins.sbt b/akka-sbt-plugin/sample/project/plugins.sbt
index b34eb00adb..6200abdd63 100644
--- a/akka-sbt-plugin/sample/project/plugins.sbt
+++ b/akka-sbt-plugin/sample/project/plugins.sbt
@@ -1,3 +1 @@
-resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/"
-
 addSbtPlugin("com.typesafe.akka" % "akka-sbt-plugin" % "2.2-SNAPSHOT")
diff --git a/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala b/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
index 835a596a4a..f000763a70 100644
--- a/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
+++ b/akka-sbt-plugin/src/main/scala/AkkaKernelPlugin.scala
@@ -59,7 +59,7 @@ object AkkaKernelPlugin extends Plugin {
     (distConfig, sourceDirectory, crossTarget, dependencyClasspath, projectDependencies, allDependencies, buildStructure, state) map { (conf, src, tgt, cp, projDeps, allDeps, buildStruct, st) ⇒
 
       if (isKernelProject(allDeps)) {
-        val log = logger(st)
+        val log = st.log
         val distBinPath = conf.outputDirectory / "bin"
         val distConfigPath = conf.outputDirectory / "config"
         val distDeployPath = conf.outputDirectory / "deploy"
@@ -201,7 +201,7 @@ object AkkaKernelPlugin extends Plugin {
 
     def setting[A](key: SettingKey[A], errorMessage: ⇒ String) = {
       optionalSetting(key) getOrElse {
-        logger(state).error(errorMessage);
+        state.log.error(errorMessage);
         throw new IllegalArgumentException()
       }
     }
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 000456ebdf..8c1a4a6335 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -274,7 +274,7 @@ object AkkaBuild extends Build {
       publishMavenStyle := false, // SBT Plugins should be published as Ivy
       publishTo <<= Publish.akkaPluginPublishTo,
       scalacOptions in Compile := Seq("-encoding", "UTF-8", "-deprecation", "-unchecked"),
-      scalaVersion := "2.9.1",
+      scalaVersion := "2.9.2",
       scalaBinaryVersion <<= scalaVersion
     )
   )
diff --git a/project/build.properties b/project/build.properties
index a8c2f849be..4474a03e1a 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.0
+sbt.version=0.12.1