Skip to content
Browse files

Merge pull request #3 from heralight/scala-2.10

Scala 2.10
  • Loading branch information...
2 parents 90d95b6 + bb814e4 commit 1a207e7a7ef8c0eff7344affdb4823bd11891b37 @d6y d6y committed
View
19 build.sbt 100644 → 100755
@@ -4,13 +4,13 @@ organization := "net.liftmodules"
liftVersion <<= liftVersion ?? "2.5-SNAPSHOT"
-version <<= liftVersion apply { _ + "-1.2-SNAPSHOT" }
+version <<= liftVersion apply { _ + "-1.3-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,18 @@ libraryDependencies <++= liftVersion { v =>
}
libraryDependencies <++= scalaVersion { sv =>
- "org.fusesource.scalate" % "scalate-core" % "1.5.3" ::
"javax.servlet" % "servlet-api" % "2.5" % "provided" ::
(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"
+ case "2.10.0" => "org.fusesource.scalate" %% "scalate-core" % "1.6.1"
+ case _ => "org.fusesource.scalate" % "scalate-core" % "1.5.3"
+ }) ::
+ (sv match {
+ case "2.10.0" => "org.fusesource.scalamd" %% "scalamd" % "1.6"
+ case _ => "org.fusesource.scalamd" % "scalamd" % "1.5"
}) ::
Nil
}
View
1 project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.12.1
View
2 src/main/scala/net/liftmodules/scalate/LiftTemplateEngine.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.
View
4 src/main/scala/net/liftmodules/scalate/ScalateView.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.
@@ -98,4 +98,4 @@ class ScalateView(engine: LiftTemplateEngine = new LiftTemplateEngine()) extends
InMemoryResponse(bytes, ("Content-Length", bytes.length.toString) :: ("Content-Type", contentType) :: headers, Nil, code)
}
}
-}
+}

0 comments on commit 1a207e7

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