From 1340a7ee894a7167d424b643277ddecba9b87cc0 Mon Sep 17 00:00:00 2001 From: Diego Medina Date: Sat, 7 Jun 2014 01:30:18 -0400 Subject: [PATCH 1/2] build for scala 2.11 --- README.md | 6 +++++- build.sbt | 12 ++++++------ .../scala/net/liftmodules/textile/TextileSpec.scala | 3 ++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 1a2f225..3d9bdf3 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,15 @@ To include this module in your Lift project, update your `libraryDependencies` i "net.liftmodules" %% "textile_2.6" % "1.3" +*Lift 2.6.x* for Scala 2.11: + + "net.liftmodules" %% "textile_2.6" % "1.3-SNAPSHOT" + *Lift 2.5.x* for Scala 2.9 and 2.10: "net.liftmodules" %% "textile_2.5" % "1.3" -*Lift 3.0.x* for Scala 2.10: +*Lift 3.0.x* for Scala 2.10 and 2.11: "net.liftmodules" %% "textile_3.0" % "1.3-SNAPSHOT" diff --git a/build.sbt b/build.sbt index 25394af..eceff91 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ scalaVersion := "2.10.3" scalacOptions ++= Seq("-unchecked", "-deprecation") -crossScalaVersions := Seq("2.10.0", "2.9.2", "2.9.1-1", "2.9.1") +crossScalaVersions := Seq("2.11.0", "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" @@ -26,11 +26,11 @@ libraryDependencies <++= liftVersion { v => } libraryDependencies <++= scalaVersion { sv => - (sv match { - case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test" - case _ => "org.specs2" %% "specs2" % "1.13" % "test" - }) :: - Nil + sv match { + case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test" :: Nil + case "2.11.0" | "2.11.1" => "org.specs2" %% "specs2" % "2.3.12" % "test" :: "org.specs2" %% "specs2-matcher-extra" % "2.3.12" % "test" :: Nil + case _ => "org.specs2" %% "specs2" % "1.13" % "test" :: Nil + } } publishTo <<= version { _.endsWith("SNAPSHOT") match { diff --git a/src/test/scala/net/liftmodules/textile/TextileSpec.scala b/src/test/scala/net/liftmodules/textile/TextileSpec.scala index 61f5c00..b12b4fa 100644 --- a/src/test/scala/net/liftmodules/textile/TextileSpec.scala +++ b/src/test/scala/net/liftmodules/textile/TextileSpec.scala @@ -18,12 +18,13 @@ package net.liftmodules package textile import org.specs2.mutable._ +import org.specs2.matcher._ import net.liftweb._ import util._ -class TextileSpec extends Specification { +class TextileSpec extends Specification with XmlMatchers{ val shouldRelax = (java.lang.Boolean.getBoolean("textile.relax")) From 8901f0041917cd0e4abf4dcfc26027bb32d247bc Mon Sep 17 00:00:00 2001 From: Diego Medina Date: Sat, 7 Jun 2014 10:56:04 -0400 Subject: [PATCH 2/2] removed extra specs2 dep and use 2.11.1 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index eceff91..7f7a350 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ scalaVersion := "2.10.3" scalacOptions ++= Seq("-unchecked", "-deprecation") -crossScalaVersions := Seq("2.11.0", "2.10.0", "2.9.2", "2.9.1-1", "2.9.1") +crossScalaVersions := Seq("2.11.1", "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" @@ -28,7 +28,7 @@ libraryDependencies <++= liftVersion { v => libraryDependencies <++= scalaVersion { sv => sv match { case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test" :: Nil - case "2.11.0" | "2.11.1" => "org.specs2" %% "specs2" % "2.3.12" % "test" :: "org.specs2" %% "specs2-matcher-extra" % "2.3.12" % "test" :: Nil + case "2.11.0" | "2.11.1" => "org.specs2" %% "specs2" % "2.3.12" % "test" :: Nil case _ => "org.specs2" %% "specs2" % "1.13" % "test" :: Nil } }