From 39c4081981d254d957916813f0f124068bfdec68 Mon Sep 17 00:00:00 2001 From: David Pollak Date: Thu, 28 Jun 2012 09:53:07 -0700 Subject: [PATCH] WIP for CSS Selectors --- build.sbt | 1 + core/util/src/main/scala/net/liftweb/util/CssSel.scala | 4 ++-- project/Build.scala | 2 +- project/Dependencies.scala | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 09f73571c5..9b82164410 100644 --- a/build.sbt +++ b/build.sbt @@ -14,6 +14,7 @@ organizationName in ThisBuild := "WorldWide Conferencing, LLC" crossScalaVersions in ThisBuild := Seq("2.9.2", "2.9.1-1", "2.9.1", "2.9.0-1", "2.9.0") + libraryDependencies in ThisBuild ++= Seq(specs2, scalacheck) // Settings for Sonatype compliance diff --git a/core/util/src/main/scala/net/liftweb/util/CssSel.scala b/core/util/src/main/scala/net/liftweb/util/CssSel.scala index de821cce8a..9affe4b238 100644 --- a/core/util/src/main/scala/net/liftweb/util/CssSel.scala +++ b/core/util/src/main/scala/net/liftweb/util/CssSel.scala @@ -37,9 +37,9 @@ trait CssSel extends Function1[NodeSeq, NodeSeq] { /** * promote a String to a ToCssBindPromotor */ + /* private implicit def strToCssBindPromoter(str: String): ToCssBindPromoter = - new ToCssBindPromoter(Full(str), CssSelectorParser.parse(str)) - + new ToCssBindPromoter(Full(str), CssSelectorParser.parse(str)) */ } /** diff --git a/project/Build.scala b/project/Build.scala index 190b6e19fa..aee0a723f9 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -70,7 +70,7 @@ object BuildDef extends Build { .dependsOn(actor, json) .settings(description := "Utilities Library", parallelExecution in Test := false, - libraryDependencies ++= Seq(joda_time, commons_codec, javamail, log4j, htmlparser)) + libraryDependencies <++= scalaVersion {sv => Seq(scala_compiler(sv), joda_time, commons_codec, javamail, log4j, htmlparser)}) // Web Projects diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fad08470d2..6fb5be5f2d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -44,6 +44,7 @@ object Dependencies { lazy val paranamer = "com.thoughtworks.paranamer" % "paranamer" % "2.4.1" lazy val scalajpa = "org.scala-libs" % "scalajpa" % "1.4" cross CVMappingAll lazy val scalap: ModuleMap = "org.scala-lang" % "scalap" % _ + lazy val scala_compiler: ModuleMap = "org.scala-lang" % "scala-compiler" % _ lazy val scalaz_core: ModuleMap = sv => scalazGroup(sv) % "scalaz-core" % scalazVersion(sv) cross CVMappingAll lazy val slf4j_api = "org.slf4j" % "slf4j-api" % slf4jVersion lazy val squeryl = "org.squeryl" % "squeryl" % "0.9.5-1" cross crossMapped("2.9.1-1" -> "2.9.1", "2.8.2" -> "2.8.1")