Initial attempt on scala 2.9 port

Fashionbase · Mar 28, 2011 · d9a3bd3 · d9a3bd3
1 parent 3040d97
commit d9a3bd3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/project/build.properties b/project/build.properties
@@ -3,5 +3,5 @@ project.organization=net.liftweb
 project.name=lift-framework
 sbt.version=0.7.5.RC1
 project.version=2.3-SNAPSHOT
-build.scala.versions=2.8.1 2.8.0
+build.scala.versions=2.9.0.RC1 2.8.1 2.8.0
 project.initialize=false
diff --git a/project/build/LiftFrameworkProject.scala b/project/build/LiftFrameworkProject.scala
@@ -31,7 +31,8 @@ class LiftFrameworkProject(info: ProjectInfo) extends ParentProject(info) with L
   lazy val common      = coreProject("common", slf4j_api, logback, log4j)()
   lazy val actor       = coreProject("actor")(common)
   lazy val json        = coreProject("json", paranamer)()
-  lazy val json_scalaz = coreProject("json-scalaz", scalaz)(json)
+// FIXME: Scala 2.9.0.RC1
+//  lazy val json_scalaz = coreProject("json-scalaz", scalaz)(json)
   lazy val json_ext    = coreProject("json-ext", commons_codec, joda_time)(common, json)
   lazy val util        = coreProject("util", joda_time, commons_codec, javamail, log4j, htmlparser)(actor, json)
 
@@ -47,12 +48,14 @@ class LiftFrameworkProject(info: ProjectInfo) extends ParentProject(info) with L
   // --------------------
   lazy val db             = persistenceProject("db")(util)
   lazy val proto          = persistenceProject("proto")(webkit)
-  lazy val jpa            = persistenceProject("jpa", scalajpa, persistence_api)(webkit)
+// FIXME: Scala 2.9.0.RC1
+//  lazy val jpa            = persistenceProject("jpa", scalajpa, persistence_api)(webkit)
   lazy val mapper         = persistenceProject("mapper", RuntimeScope.h2database, RuntimeScope.derby)(db, proto)
   lazy val record         = persistenceProject("record")(mapper)
   lazy val ldap           = persistenceProject("ldap", TestScope.apacheds)(mapper)
   lazy val couchdb        = persistenceProject("couchdb", dispatch_http)(record)
-  lazy val squeryl_record = persistenceProject("squeryl-record", RuntimeScope.h2database, squeryl)(record)
+// FIXME: Scala 2.9.0.RC1
+//  lazy val squeryl_record = persistenceProject("squeryl-record", RuntimeScope.h2database, squeryl)(record)
   lazy val mongodb        = persistenceProject("mongodb", mongo_driver)(json_ext)
   lazy val mongodb_record = persistenceProject("mongodb-record", dispatch_http)(record, mongodb)