Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

upgrade to scala 2.10

  • Loading branch information...
commit edd63a8c48cad08206d41af9635ab968add7363a 1 parent c8e2ab1
Alexandre Richonnier authored
View
15 build.sbt 100644 → 100755
@@ -2,13 +2,13 @@ name := "imaging"
liftVersion <<= liftVersion ?? "2.5-SNAPSHOT"
-version <<= liftVersion apply { _ + "-1.1-SNAPSHOT" }
+version <<= liftVersion apply { _ + "-1.2-SNAPSHOT" }
organization := "net.liftmodules"
-scalaVersion := "2.9.2"
+scalaVersion := "2.10.0"
-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"
@@ -24,13 +24,10 @@ libraryDependencies <++= liftVersion { v =>
libraryDependencies <++= scalaVersion { sv =>
"org.apache.sanselan" % "sanselan" % "0.97-incubator" ::
(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"
+ case "2.9.0-1" | "2.9.0" => "org.specs2" %% "specs2" % "1.7.1" % "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
1  project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.12.1
View
2  src/main/scala/net/liftmodules/imaging/ImageHelpers.scala 100644 → 100755
@@ -1,5 +1,5 @@
/*
- * Copyright 2010 WorldWide Conferencing, LLC
+ * Copyright 2010-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
4 src/main/scala/net/liftmodules/imaging/ImageResizer.scala 100644 → 100755
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 WorldWide Conferencing, LLC
+ * Copyright 2010-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.
@@ -246,4 +246,4 @@ class ImageResizer(renderingHintsMap:Map[java.awt.RenderingHints.Key,Any], multi
ret
}
-}
+}
View
5 src/test/scala/net/liftmodules/imaging/ImageResizerSpec.scala 100644 → 100755
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 WorldWide Conferencing, LLC
+ * Copyright 2010-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.
@@ -17,8 +17,7 @@
package net.liftmodules
package imaging
-
-import org.specs.Specification
+import org.specs2.mutable._
class ImageResizerSpec extends Specification {

0 comments on commit edd63a8

Please sign in to comment.
Something went wrong with that request. Please try again.