Updated project sbt settings.

randomcoder · randomcoder · commit 83b8f3d9195f · 2012-07-14T08:23:25.000+01:00
Lift 2.4 requires scala 2.9.1 not 2.9.2 so I had to
override the scala version in the lift project.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -24,9 +24,6 @@ object Dependencies {
   val jodaTime = "joda-time" % "joda-time" % "2.0"
   val jodaConvert = "org.joda" % "joda-convert" % "1.2"
 
-  // jetty
-  val jettyVersion = "8.0.3.v20111011"
-  val jetty = "org.eclipse.jetty" % "jetty-webapp" % jettyVersion % "container"
   val logback = "ch.qos.logback" % "logback-classic" % "1.0.0"
 
   val scalatest = "org.scalatest" %% "scalatest" % "1.8" % "test"
@@ -37,7 +34,6 @@ object Dependencies {
   val testDeps = Seq(scalatest)
   val liftDeps = Seq(liftUtil, liftCommon, liftWebkit, liftMongoRecord, rogue)
   val loggingDeps = Seq(logback, groovy, liftCommon)
-  val jettyDeps = Seq(jetty)
   val jodaDeps = Seq(jodaTime, jodaConvert)
 }
 
diff --git a/project/ProjectBuild.scala b/project/ProjectBuild.scala
@@ -29,12 +29,13 @@ object ProjectBuild extends Build {
   lazy val liftProject: Project = Project("lift", 
     file("scala-utilities-lift"),
     settings = buildSettings ++ Seq(libraryDependencies ++= liftProjectDeps,
-      name := "scala-utilities-lift"
+      name := "scala-utilities-lift",
+      scalaVersion := "2.9.1"
     )
-  ) dependsOn(coreProject)
+  )
 
   val commonDeps = testDeps ++ jodaDeps
   val coreProjectDeps = commonDeps
-  val liftProjectDeps = commonDeps ++ liftDeps ++ jettyDeps
+  val liftProjectDeps = commonDeps ++ liftDeps
 }
 
