Conflicts: build.sbt core/markdown/src/main/scala/net/liftweb/markdown/BaseParsers.scala core/markdown/src/test/scala/net/liftweb/markdown/LineTokenizerTest.scala core/util/src/test/scala/net/liftweb/util/BindHelpersSpec.scala core/util/src/test/scala/net/liftweb/util/CssSelectorSpec.scala core/util/src/test/scala/net/liftweb/util/TimeHelpersSpec.scala core/util/src/test/scala/net/liftweb/util/VCardParserSpec.scala persistence/mapper/src/main/scala/net/liftweb/mapper/MetaMapper.scala persistence/mongodb/src/main/scala/net/liftweb/mongodb/Mongo.scala persistence/mongodb/src/test/scala/net/liftweb/mongodb/MongoDirectSpec.scala persistence/mongodb/src/test/scala/net/liftweb/mongodb/MongoDocumentExamplesSpec.scala persistence/record/src/test/scala/net/liftweb/record/RecordSpec.scala project/Build.scala project/Dependencies.scala web/webkit/src/main/scala/net/liftweb/http/CometActor.scala web/webkit/src/main/scala/net/liftweb/http/LiftRules.scala web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
This was happening because we were calling dependOn on the webkit project, which apparently modifies it rather than returning a version with the new dependency. We now make webkit_pre_211 a full-fledged project of its own.
Scala 2.10 introduced the collection.concurrent.Map package and class that supersedes ConcurrentMap, and then 2.11 removed ConcurrentMap altogether. 2.10 also introduced JavaConversions for the new type, and 2.11 removed the old ones. To properly compile in 2.9, we need a thin layer that provides the new APIs in 2.9 and transparently calls the old stuff. Also mucks about thoroughly with the project setup so that we have a pre-2.11 project that does all the nasty 2.9 slicing and dicing and a regular project that does everything 2.11-style.
…alaz by default. Added a new project, `lift-framework-with-scalaz6` which adds json_scalaz and can be used when you need lift json scalaz that uses scalaz 6 To use it you need to: 1. ++2.10.4 2. project lift-framework-with-scalaz6 3. compile //or any task you need, test, publish-local, etc This means that from now one, if you work as you used to, you will not be comppiling lift-json-scalaz based on scalaz 6, but instead you will be using lift-json-scalz7 based on scalaz7
Conflicts: build.sbt contributors.md liftsh project/Dependencies.scala web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala web/webkit/src/main/scala/net/liftweb/http/S.scala web/webkit/src/main/scala/net/liftweb/http/processing/LiftServlet.scala web/webkit/src/main/scala/net/liftweb/sitemap/XmlMenu.scala
commit aeb44de3bc42f86324a6242b6b8037dd4cb8fbc3 Author: David Pollak <email@example.com> Date: Tue Mar 5 11:48:56 2013 -0800 Squashed commit of the following: commit 24ff1d946cb1f80630e747a7793ba3f574fe7202 Author: David Pollak <firstname.lastname@example.org> Date: Tue Mar 5 11:47:24 2013 -0800 Removed external bcrypt depedency because the code is already in Lift commit 09980e8263723f978784666d467e8256118d2446 Author: David Pollak <email@example.com> Date: Tue Mar 5 11:32:01 2013 -0800 MappedPassword now uses bcrypt, but is backward compatible with existing passwords and schemas
…owrap templates in surround if there's no surround
… they run and pass * Some mongodb/mongodb-record tests were failing because of the change to S.??