From e5df67c536cbb3a6d0f19f4cfda7d5578c6879ff Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Sat, 26 Mar 2011 20:02:33 +0100 Subject: [PATCH] Upgrading to Scala 2.9.0-RC1 --- akka-actor/src/main/scala/akka/AkkaException.scala | 3 +-- project/build.properties | 2 +- project/build/AkkaProject.scala | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/akka-actor/src/main/scala/akka/AkkaException.scala b/akka-actor/src/main/scala/akka/AkkaException.scala index 33ff34599b..5246b3fe9f 100644 --- a/akka-actor/src/main/scala/akka/AkkaException.scala +++ b/akka-actor/src/main/scala/akka/AkkaException.scala @@ -19,8 +19,7 @@ import java.net.{InetAddress, UnknownHostException} * * @author Jonas Bonér */ -@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(AkkaException.hostname, newUuid) } with RuntimeException(message) { diff --git a/project/build.properties b/project/build.properties index be1c7fa22f..2ec97c06be 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.9.0-SNAPSHOT +build.scala.versions=2.9.0.RC1 diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 8d30289365..056d285a83 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -101,7 +101,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { 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) lazy val sjsonModuleConfig = ModuleConfiguration("net.debasishg", ScalaToolsRelRepo) lazy val lzfModuleConfig = ModuleConfiguration("voldemort.store.compress", "h2-lzf", AkkaRepo) lazy val vscaladocModuleConfig = ModuleConfiguration("org.scala-tools", "vscaladoc", "1.1-md-3", AkkaRepo) @@ -158,8 +157,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) { lazy val protobuf = "com.google.protobuf" % "protobuf-java" % "2.3.0" % "compile" //New BSD - lazy val sjson = "net.debasishg" % "sjson_2.8.1" % "0.10" % "compile" //ApacheV2 - lazy val sjson_test = "net.debasishg" % "sjson_2.8.1" % "0.10" % "test" //ApacheV2 + lazy val sjson = "net.debasishg" % "sjson_2.9.0.RC1" % "0.10" % "compile" //ApacheV2 + lazy val sjson_test = "net.debasishg" % "sjson_2.9.0.RC1" % "0.10" % "test" //ApacheV2 lazy val slf4j = "org.slf4j" % "slf4j-api" % "1.6.0" lazy val logback = "ch.qos.logback" % "logback-classic" % "0.9.24"