Skip to content

Commit

Permalink
Upgraded lift to 2.4-M1 and scala 2.9.0-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Nelson committed Jul 8, 2011
1 parent 85102dc commit b592ce8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions project/build.properties
Expand Up @@ -3,6 +3,6 @@
project.name=Lift MongoDB Protouser Record
project.organization=Lift
project.version=0.1
sbt.version=0.7.4
build.scala.versions=2.8.0
sbt.version=0.7.7
build.scala.versions=2.9.0-1
project.initialize=false
10 changes: 5 additions & 5 deletions project/build/LiftProject.scala
Expand Up @@ -2,14 +2,14 @@ import sbt._

class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {

val liftVersion = "2.2-M1"
val liftVersion = "2.4-M1"

override def libraryDependencies = Set(
"net.liftweb" %% "lift-webkit" % liftVersion % "compile->default",
"net.liftweb" %% "lift-mongodb-record" % liftVersion % "compile->default",
"net.liftweb" %% "lift-testkit" % liftVersion % "compile->default",
"net.liftweb" %% "lift-webkit" % liftVersion,
"net.liftweb" %% "lift-mongodb-record" % liftVersion,
"net.liftweb" %% "lift-testkit" % liftVersion,
"org.mortbay.jetty" % "jetty" % "6.1.22" % "test->default",
"junit" % "junit" % "4.5" % "test->default",
"org.scala-tools.testing" %% "specs" % "1.6.5" % "test->default"
"org.scala-tools.testing" %% "specs" % "1.6.8" % "test->default"
) ++ super.libraryDependencies
}
2 changes: 1 addition & 1 deletion src/main/scala/code/model/User.scala
Expand Up @@ -18,7 +18,7 @@ object User extends User with MetaMegaProtoUser[User] {
override def collectionName = "users" // define the MongoDB collection name
override def screenWrap = Full(<lift:surround with="default" at="content">
<lift:bind /></lift:surround>)
//override def skipEmailValidation = true // uncomment this line to skip email validations
override def skipEmailValidation = true // uncomment this line to skip email validations

override def localForm(user: User, ignorePassword: Boolean): NodeSeq = {
/* This doesn't work either
Expand Down

0 comments on commit b592ce8

Please sign in to comment.