Merge pull request #1 from heralight/scala-2.10

upgrade to scala 2.10
liftmodules · Jan 10, 2013 · 0240018 · 0240018
2 parents c8e2ab1 + bdeb37b
commit 0240018
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/build.sbt b/build.sbt
@@ -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,9 @@ 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 "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test"
-      case _ =>  "org.scala-tools.testing" %% "specs" % "1.6.8" % "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
 }
 

diff --git a/project/build.properties b/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.12.1
diff --git a/src/main/scala/net/liftmodules/imaging/ImageHelpers.scala b/src/main/scala/net/liftmodules/imaging/ImageHelpers.scala
@@ -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.

diff --git a/src/main/scala/net/liftmodules/imaging/ImageResizer.scala b/src/main/scala/net/liftmodules/imaging/ImageResizer.scala
@@ -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
   }
 
-}
+}
diff --git a/src/test/scala/net/liftmodules/imaging/ImageResizerSpec.scala b/src/test/scala/net/liftmodules/imaging/ImageResizerSpec.scala
@@ -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.specs2.mutable._
-import org.specs.Specification
 
 
 class ImageResizerSpec extends Specification  {