Upgraded to Akka 2.1.2 and Scala 2.10.1

henrikengstrom · Mar 15, 2013 · 4f1b82e · 4f1b82e
1 parent 5334a7f
commit 4f1b82e
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This repository contains an Akka kata that can be used whenever you feel like do
 * A computer
 * An installed OS
 * Java
-* [SBT 0.12.0](http://www.scala-sbt.org/download.html)
+* [SBT 0.12.2](http://www.scala-sbt.org/download.html)
 * [Git](http://git-scm.com/downloads) _(not mandatory)_
 
 ## Getting Started (Git installed)

diff --git a/client/src/main/scala/com/typesafe/akkademo/client/BetClient.scala b/client/src/main/scala/com/typesafe/akkademo/client/BetClient.scala
@@ -1,11 +1,11 @@
 /**
- * Copyright (C) 2011-2012 Typesafe <http://typesafe.com/>
+ * Copyright (C) 2011-2013 Typesafe <http://typesafe.com/>
  */
 package com.typesafe.akkademo.client
 
 import akka.actor.ActorSystem
-import akka.dispatch.Await
-import akka.util.duration._
+import scala.concurrent.duration._
+import scala.concurrent.Await
 import akka.util.Timeout
 import akka.pattern.ask
 import com.typesafe.config.ConfigFactory

diff --git a/common/src/main/scala/com/typesafe/akkademo/common/Message.scala b/common/src/main/scala/com/typesafe/akkademo/common/Message.scala
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2011-2012 Typesafe <http://typesafe.com/>
+ *  Copyright (C) 2011-2013 Typesafe <http://typesafe.com/>
  */
 package com.typesafe.akkademo.common
 

diff --git a/processor/src/main/scala/com/typesafe/akkademo/processor/BettingProcessorApplication.scala b/processor/src/main/scala/com/typesafe/akkademo/processor/BettingProcessorApplication.scala
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2011-2012 Typesafe <http://typesafe.com/>
+ *  Copyright (C) 2011-2013 Typesafe <http://typesafe.com/>
  */
 package com.typesafe.akkademo.processor
 

diff --git a/processor/src/main/scala/com/typesafe/akkademo/processor/repository/UnstableResource.scala b/processor/src/main/scala/com/typesafe/akkademo/processor/repository/UnstableResource.scala
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2011-2012 Typesafe <http://typesafe.com/>
+ *  Copyright (C) 2011-2013 Typesafe <http://typesafe.com/>
  */
 package com.typesafe.akkademo.processor.repository
 
@@ -22,7 +22,7 @@ class ReallyUnstableResource extends UnstableResource {
       case (id, player, game, amount) ⇒ if (!bets.contains(id)) bets.put(id, Bet(player, game, amount))
     })
   } catch {
-    case _ ⇒
+    case _: Exception ⇒
   }
 
   def save(id: Int, player: String, game: Int, amount: Int) = {
@@ -51,7 +51,7 @@ class ReallyUnstableResource extends UnstableResource {
         try {
           Option((id.toInt, player, game.toInt, amount.toInt))
         } catch {
-          case _ ⇒ None
+          case _: Exception ⇒ None
         }
       case _ ⇒ None
     }

diff --git a/processor/src/main/scala/com/typesafe/akkademo/processor/service/BettingProcessor.scala b/processor/src/main/scala/com/typesafe/akkademo/processor/service/BettingProcessor.scala
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2011-2012 Typesafe <http://typesafe.com/>
+ *  Copyright (C) 2011-2013 Typesafe <http://typesafe.com/>
  */
 package com.typesafe.akkademo.processor.service
 

diff --git a/project/Build.scala b/project/Build.scala
@@ -1,13 +1,13 @@
 import sbt._
 import sbt.Keys._
 import com.typesafe.startscript.StartScriptPlugin
-import com.typesafe.sbtscalariform.ScalariformPlugin
-import com.typesafe.sbtscalariform.ScalariformPlugin.ScalariformKeys
+import com.typesafe.sbt.SbtScalariform
+import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 
 object AkkaDemoBuild extends Build {
   val Organization = "akkademo"
   val Version      = "1.0-SNAPSHOT"
-  val ScalaVersion = "2.9.2"
+  val ScalaVersion = "2.10.1"
 
   lazy val akkademo = Project(
     id = "akkademo",
@@ -51,7 +51,13 @@ object AkkaDemoBuild extends Build {
       Seq(libraryDependencies ++= Dependencies.akkademo)
   )
 
-  lazy val defaultSettings = Defaults.defaultSettings ++ formatSettings ++ Seq(
+  lazy val buildSettings = Seq(
+    organization := Organization,
+    version      := Version,
+    scalaVersion := ScalaVersion
+  )
+
+  lazy val defaultSettings = Defaults.defaultSettings ++ formatSettings ++ buildSettings ++ Seq(
     resolvers += "Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases/",
 
     // compile options
@@ -62,17 +68,17 @@ object AkkaDemoBuild extends Build {
     parallelExecution in Test := false
   )
 
-  lazy val formatSettings = ScalariformPlugin.scalariformSettings ++ Seq(
+  lazy val formatSettings = SbtScalariform.scalariformSettings ++ Seq(
     ScalariformKeys.preferences in Compile := formattingPreferences,
     ScalariformKeys.preferences in Test    := formattingPreferences
   )
 
   def formattingPreferences = {
     import scalariform.formatter.preferences._
     FormattingPreferences()
-      .setPreference(RewriteArrowSymbols, true)
-      .setPreference(AlignParameters, true)
-      .setPreference(AlignSingleLineCaseStatements, true)
+    .setPreference(RewriteArrowSymbols, true)
+    .setPreference(AlignParameters, true)
+    .setPreference(AlignSingleLineCaseStatements, true)
   }
 }
 
@@ -83,15 +89,15 @@ object Dependencies {
 
 object Dependency {
   object Version {
-    val Akka      = "2.0.3"
+    val Akka      = "2.1.2"
     val Scalatest = "1.6.1"
     val JUnit     = "4.5"
   }
 
   // ---- Application dependencies ----
 
-  val akkaActor   = "com.typesafe.akka"   % "akka-actor"              % Version.Akka
-  val akkaRemote  = "com.typesafe.akka"   % "akka-remote"             % Version.Akka
+  val akkaActor   = "com.typesafe.akka"   %% "akka-actor"              % Version.Akka
+  val akkaRemote  = "com.typesafe.akka"   %% "akka-remote"             % Version.Akka
 
   // ---- Test dependencies ----
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,9 +1,9 @@
 resolvers += Classpaths.typesafeResolver
 
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.2")
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.1.0")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.2.0")
 
 addSbtPlugin("com.typesafe.startscript" % "xsbt-start-script-plugin" % "0.5.3")
 
-addSbtPlugin("com.typesafe.sbtscalariform" % "sbtscalariform" % "0.4.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.0.0")
diff --git a/service/src/main/scala/com/typesafe/akkademo/service/BettingService.scala b/service/src/main/scala/com/typesafe/akkademo/service/BettingService.scala
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2011-2012 Typesafe <http://typesafe.com/>
+ *  Copyright (C) 2011-2013 Typesafe <http://typesafe.com/>
  */
 package com.typesafe.akkademo.service
 

diff --git a/service/src/main/scala/com/typesafe/akkademo/service/BettingServiceApplication.scala b/service/src/main/scala/com/typesafe/akkademo/service/BettingServiceApplication.scala
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2011-2012 Typesafe <http://typesafe.com/>
+ *  Copyright (C) 2011-2013 Typesafe <http://typesafe.com/>
  */
 package com.typesafe.akkademo.service