Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade to scala 2.10 #1

Merged
merged 2 commits into from Jan 10, 2013
Merged

upgrade to scala 2.10 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edd63a8
upgrade to scala 2.10
Jan 9, 2013
bdeb37b
remove 2.9.0
Jan 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 5 additions & 9 deletions build.sbt 100644 → 100755
View file
Open in desktop
Expand Up @@ -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"

Expand All @@ -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 _ => "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
}

Expand Down
1 change: 1 addition & 0 deletions project/build.properties
View file
Open in desktop
@@ -0,0 +1 @@
sbt.version=0.12.1
2 changes: 1 addition & 1 deletion src/main/scala/net/liftmodules/imaging/ImageHelpers.scala 100644 → 100755
View file
Open in desktop
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/net/liftmodules/imaging/ImageResizer.scala 100644 → 100755
View file
Open in desktop
@@ -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.
Expand Down Expand Up @@ -246,4 +246,4 @@ class ImageResizer(renderingHintsMap:Map[java.awt.RenderingHints.Key,Any], multi
ret
}

}
}
5 changes: 2 additions & 3 deletions src/test/scala/net/liftmodules/imaging/ImageResizerSpec.scala 100644 → 100755
View file
Open in desktop
@@ -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.
Expand All @@ -17,8 +17,7 @@
package net.liftmodules
package imaging


import org.specs.Specification
import org.specs2.mutable._


class ImageResizerSpec extends Specification {
Expand Down