Permalink
Browse files

Update sbt to 0.11.3, lift to 2.4 and other dependencies to the lates…

…t version.
  • Loading branch information...
1 parent 615b7af commit 8b387f630c3a573a6d5d2e8d93a6d7696059b2c7 @iron9light iron9light committed Jun 24, 2012
Showing with 20 additions and 35 deletions.
  1. +17 −0 build.sbt
  2. +1 −9 project/build.properties
  3. +0 −24 project/build/LiftProject.scala
  4. +1 −1 sbt
  5. BIN sbt-launch.jar
  6. BIN sbt-launcher.jar
  7. +1 −1 sbt.bat
View
17 build.sbt
@@ -0,0 +1,17 @@
+organization := "Lift"
+
+name := "seventhings"
+
+version := "0.1"
+
+scalaVersion := "2.9.1"
+
+libraryDependencies ++= Seq(
+ "net.liftweb" %% "lift-webkit" % "2.4",
+ "net.liftweb" %% "lift-wizard" % "2.4",
+ "org.mortbay.jetty" % "jetty" % "6.1.22" % "test",
+ "junit" % "junit" % "4.10" % "test",
+ "ch.qos.logback" % "logback-classic" % "1.0.6",
+ "org.specs2" %% "specs2" % "1.11" % "test",
+ "com.h2database" % "h2" % "1.3.167"
+)
View
10 project/build.properties
@@ -1,9 +1 @@
-#Project properties
-#Fri Apr 23 11:24:20 PDT 2010
-project.organization=Lift
-project.name=seventhings
-sbt.version=0.7.4
-project.version=0.1
-def.scala.version=2.7.7
-build.scala.versions=2.8.1
-project.initialize=false
+sbt.version=0.11.3
View
24 project/build/LiftProject.scala
@@ -1,24 +0,0 @@
-import sbt._
-
-class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
- val liftVersion = "2.3-SNAPSHOT"
-
- // uncomment the following if you want to use the snapshot repo
- // val scalatoolsSnapshot = ScalaToolsSnapshots
-
- // val localMaven = "local maven" at "file:///home/dpp/.m2/repository"
-
- // If you're using JRebel for Lift development, uncomment
- // this line
- override def scanDirectories = Nil
-
- override def libraryDependencies = Set(
- "net.liftweb" %% "lift-webkit" % liftVersion % "compile",
- "net.liftweb" %% "lift-wizard" % liftVersion % "compile",
- "org.mortbay.jetty" % "jetty" % "6.1.22" % "test",
- "junit" % "junit" % "4.5" % "test",
- "ch.qos.logback" % "logback-classic" % "0.9.26",
- "org.scala-tools.testing" %% "specs" % "1.6.6" % "test",
- "com.h2database" % "h2" % "1.2.138"
- ) ++ super.libraryDependencies
-}
View
2 sbt
@@ -1 +1 @@
-java -Xmx512M -Xss2M -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launcher.jar "$@"
+java -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=384M -jar `dirname $0`/sbt-launch.jar "$@"
View
BIN sbt-launch.jar
Binary file not shown.
View
BIN sbt-launcher.jar
Binary file not shown.
View
2 sbt.bat
@@ -1,2 +1,2 @@
set SCRIPT_DIR=%~dp0
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar "%SCRIPT_DIR%\sbt-launcher.jar" %*
+java -Xmx512M -jar "%SCRIPT_DIR%sbt-launch.jar" %*

0 comments on commit 8b387f6

Please sign in to comment.