Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #8 from liftmodules/diego_scala_2.11
build for scala 2.11
  • Loading branch information
fmpwizard committed Jun 11, 2014
2 parents 5247057 + 8901f00 commit 819ae90
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
6 changes: 5 additions & 1 deletion README.md
Expand Up @@ -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"

Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Expand Up @@ -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.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"

Expand All @@ -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" :: Nil
case _ => "org.specs2" %% "specs2" % "1.13" % "test" :: Nil
}
}

publishTo <<= version { _.endsWith("SNAPSHOT") match {
Expand Down
3 changes: 2 additions & 1 deletion src/test/scala/net/liftmodules/textile/TextileSpec.scala
Expand Up @@ -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"))

Expand Down

0 comments on commit 819ae90

Please sign in to comment.