Browse files

upgrade to

scala 2.10
openid4java to 0.9.6
  • Loading branch information...
1 parent 2987b60 commit fce59b6d3830868c340a23733b251b0b04b437e8 Alexandre Richonnier committed Jan 9, 2013
View
14 build.sbt 100644 → 100755
@@ -6,11 +6,11 @@ liftVersion <<= liftVersion ?? "2.5-SNAPSHOT"
version <<= liftVersion apply { _ + "-1.1-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.10.0", "2.9.2", "2.9.1-1", "2.9.1")
resolvers += "CB Central Mirror" at "http://repo.cloudbees.com/content/groups/public"
@@ -22,15 +22,11 @@ libraryDependencies <++= liftVersion { v =>
}
libraryDependencies <++= scalaVersion { sv =>
- "org.openid4java" % "openid4java-consumer" % "0.9.5" ::
+ "org.openid4java" % "openid4java-consumer" % "0.9.6" ::
(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.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test"
+ case "2.10.0" => "org.specs2" %% "specs2" % "1.13" % "test"
}) ::
- (sv match {
- case "2.9.2" => "org.scalacheck" % "scalacheck_2.9.1" % "1.9" % "test"
- case _ => "org.scalacheck" %% "scalacheck" % "1.9" % "test"
- }) ::
Nil
}
View
2 src/main/scala/net/liftmodules/openid/Extensions.scala 100644 → 100755
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2010 WorldWide Conferencing, LLC
+ * Copyright 2008-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.
View
2 src/main/scala/net/liftmodules/openid/OpenID.scala 100644 → 100755
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2010 WorldWide Conferencing, LLC
+ * Copyright 2008-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.
View
2 src/main/scala/net/liftmodules/openid/OpenIDProtoUser.scala 100644 → 100755
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2010 WorldWide Conferencing, LLC
+ * Copyright 2008-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.
View
2 src/test/scala/net/liftmodules/openid/RawHelperSpec.scala 100644 → 100755
@@ -19,7 +19,7 @@ package openid
import java.util.{List, ArrayList}
-import org.specs.Specification
+import org.specs2.mutable._
class RawHelperSpec extends Specification {

0 comments on commit fce59b6

Please sign in to comment.