Permalink
Browse files

updated to scala 2.10

  • Loading branch information...
1 parent adcdbd0 commit eecc93661c031cdeb23ffdb8ac6c7a51eb4da6de @kjozsa kjozsa committed Jan 11, 2013
View
@@ -4,13 +4,13 @@ organization := "net.liftmodules"
liftVersion <<= liftVersion ?? "2.5-SNAPSHOT"
-version <<= liftVersion apply { _ + "-1.1-SNAPSHOT" }
+version <<= liftVersion apply { _ + "-1.2-SNAPSHOT" }
-scalaVersion := "2.9.2"
+scalaVersion := "2.10.0"
scalacOptions ++= Seq("-unchecked", "-deprecation")
-crossScalaVersions := Seq("2.9.2", "2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0")
+crossScalaVersions := Seq("2.9.2", "2.9.1-1", "2.9.1")
resolvers += "CB Central Mirror" at "http://repo.cloudbees.com/content/groups/public"
@@ -24,17 +24,12 @@ libraryDependencies <++= liftVersion { v =>
libraryDependencies <++= scalaVersion { sv =>
(sv match {
- case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.scala-tools.testing" % "specs_2.9.1" % "1.6.9" % "test"
- case _ => "org.scala-tools.testing" %% "specs" % "1.6.8" % "test"
+ case "2.10.0" => "org.specs2" %% "specs2" % "1.13" % "test"
+ case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test"
}) ::
- (sv match {
- case "2.9.2" => "org.scalacheck" % "scalacheck_2.9.1" % "1.9" % "test"
- case _ => "org.scalacheck" %% "scalacheck" % "1.9" % "test"
- }) ::
Nil
}
-
publishTo <<= version { _.endsWith("SNAPSHOT") match {
case true => Some("snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
case false => Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
View
@@ -0,0 +1 @@
+sbt.version=0.12.1
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2011 WorldWide Conferencing, LLC
+ * Copyright 2006-2013 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -340,7 +340,7 @@ trait MetaProtoStateMachine [MyType <: ProtoStateMachine[MyType, StateType],
timedEventHandler ! (stateItem, event)
}
} catch {
- case e => logger.error("State machine loop", e)
+ case e: Throwable => logger.error("State machine loop", e)
}
Schedule.schedule(this, Ping, TimeSpan(timedEventPeriodicWait))
}
@@ -355,7 +355,7 @@ trait MetaProtoStateMachine [MyType <: ProtoStateMachine[MyType, StateType],
try {
item.processEvent(event)
} catch {
- case e => logger.error("Timed Event Handler"+e)
+ case e: Throwable => logger.error("Timed Event Handler"+e)
}
}
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2010 WorldWide Conferencing, LLC
+ * Copyright 2007-2013 WorldWide Conferencing, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

0 comments on commit eecc936

Please sign in to comment.