From c337fdd7d9b258457de8dee9aa861ee09dd9f95b Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Tue, 22 Mar 2011 14:21:03 +0100
Subject: [PATCH] Updating to Scala 2.9.0, SJSON still needs to be released for
 2.9.0-SNAPSHOT tho

---
 akka-actor/src/main/scala/akka/AkkaException.scala | 12 +++++-------
 project/build.properties                           |  2 +-
 project/build/AkkaProject.scala                    |  8 ++++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/AkkaException.scala b/akka-actor/src/main/scala/akka/AkkaException.scala
index 5c8948c6a4..fdc5601e4f 100644
--- a/akka-actor/src/main/scala/akka/AkkaException.scala
+++ b/akka-actor/src/main/scala/akka/AkkaException.scala
@@ -19,15 +19,13 @@ import java.net.{InetAddress, UnknownHostException}
  *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-@serializable abstract class AkkaException(message: String) extends RuntimeException(message) {
-  import AkkaException._
+@serializable abstract class AkkaException(message: String) extends {
   val exceptionName = getClass.getName
-
-  val uuid = "%s_%s".format(hostname, newUuid)
-
-  override val toString = "%s\n\t[%s]\n\t%s\n\t%s".format(exceptionName, uuid, message, {
+  val uuid = "%s_%s".format(AkkaException.hostname, newUuid)
+} with RuntimeException(message) {
+  override lazy val toString = "%s\n\t[%s]\n\t%s\n\t%s".format(exceptionName, uuid, message, {
     val sw = new StringWriter
-    printStackTrace(new PrintWriter(sw))
+    this.printStackTrace(new PrintWriter(sw))
     sw.toString
   })
 }
diff --git a/project/build.properties b/project/build.properties
index c5b83d798f..be1c7fa22f 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -5,4 +5,4 @@ project.name=akka
 sbt.version=0.7.5.RC0
 project.version=1.1-SNAPSHOT
 def.scala.version=2.7.7
-build.scala.versions=2.8.1
+build.scala.versions=2.9.0-SNAPSHOT
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 9af72ae674..e42fa407e8 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -19,8 +19,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   val scalaCompileSettings =
     Seq("-deprecation",
         "-Xmigration",
-        //"-Xcheckinit",
-        //"-optimise",
+        //"-Xcheckinit", //Only use occasionally, should never be used for production jars
+        "-optimise",
         "-Xwarninit",
         "-encoding", "utf8")
 
@@ -98,7 +98,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   lazy val jerseyModuleConfig      = ModuleConfiguration("com.sun.jersey", JavaNetRepo)
   lazy val multiverseModuleConfig  = ModuleConfiguration("org.multiverse", CodehausRepo)
   lazy val nettyModuleConfig       = ModuleConfiguration("org.jboss.netty", JBossRepo)
-  lazy val scalaTestModuleConfig   = ModuleConfiguration("org.scalatest", ScalaToolsRelRepo)
+  lazy val scalaTestModuleConfig   = ModuleConfiguration("org.scalatest", ScalaToolsSnapshotRepo)
   lazy val spdeModuleConfig        = ModuleConfiguration("us.technically.spde", DatabinderRepo)
   lazy val processingModuleConfig  = ModuleConfiguration("org.processing", DatabinderRepo)
   lazy val scalaModuleConfig       = ModuleConfiguration("org.scala-lang", ScalaToolsSnapshotRepo)
@@ -115,7 +115,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   lazy val JACKSON_VERSION       = "1.7.1"
   lazy val JERSEY_VERSION        = "1.3"
   lazy val MULTIVERSE_VERSION    = "0.6.2"
-  lazy val SCALATEST_VERSION     = "1.3"
+  lazy val SCALATEST_VERSION     = "1.4-SNAPSHOT"
   lazy val JETTY_VERSION         = "7.2.2.v20101205"
   lazy val JAVAX_SERVLET_VERSION = "3.0"