Permalink
Browse files

* Upgraded sbt launchers to 0.12.1

* Upgraded templates to Lift 2.5-M4
  • Loading branch information...
1 parent ca205be commit b867d55f6575216974d8ec8a608e10177de7b73a @fmpwizard fmpwizard committed Jan 12, 2013
@@ -17,11 +17,11 @@ unmanagedResourceDirectories in Test <+= (baseDirectory) { _ / "src/main/webapp"
scalacOptions ++= Seq("-deprecation", "-unchecked")
libraryDependencies ++= {
- val liftVersion = "2.5-M3"
+ val liftVersion = "2.5-M4"
Seq(
"net.liftweb" %% "lift-webkit" % liftVersion % "compile",
"net.liftweb" %% "lift-mapper" % liftVersion % "compile",
- "net.liftmodules" %% "lift-jquery-module" % (liftVersion + "-2.0"),
+ "net.liftmodules" %% "lift-jquery-module" % (liftVersion + "-2.1"),
"org.eclipse.jetty" % "jetty-webapp" % "8.1.7.v20120910" % "container,test",
"org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container,test" artifacts Artifact("javax.servlet", "jar", "jar"),
"ch.qos.logback" % "logback-classic" % "1.0.6",
View
@@ -1 +1 @@
-java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.jar "$@"
+java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.1.jar "$@"
@@ -1,2 +1,2 @@
set SCRIPT_DIR=%~dp0
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.jar" %*
+java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.1.jar" %*
@@ -17,10 +17,10 @@ unmanagedResourceDirectories in Test <+= (baseDirectory) { _ / "src/main/webapp"
scalacOptions ++= Seq("-deprecation", "-unchecked")
libraryDependencies ++= {
- val liftVersion = "2.5-M3"
+ val liftVersion = "2.5-M4"
Seq(
"net.liftweb" %% "lift-webkit" % liftVersion % "compile",
- "net.liftmodules" %% "lift-jquery-module" % (liftVersion + "-2.0"),
+ "net.liftmodules" %% "lift-jquery-module" % (liftVersion + "-2.1"),
"org.eclipse.jetty" % "jetty-webapp" % "8.1.7.v20120910" % "container,test",
"org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container,test" artifacts Artifact("javax.servlet", "jar", "jar"),
"ch.qos.logback" % "logback-classic" % "1.0.6",
View
@@ -1 +1 @@
-java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.jar "$@"
+java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.1.jar "$@"
@@ -1,2 +1,2 @@
set SCRIPT_DIR=%~dp0
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.jar" %*
+java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.1.jar" %*
@@ -13,7 +13,7 @@ resolvers ++= Seq("snapshots" at "http://oss.sonatype.org/content/repositori
scalacOptions ++= Seq("-deprecation", "-unchecked")
libraryDependencies ++= {
- val liftVersion = "2.5-M3"
+ val liftVersion = "2.5-M4"
Seq(
"net.liftweb" %% "lift-json" % liftVersion % "compile",
"ch.qos.logback" % "logback-classic" % "1.0.6",
View
@@ -1 +1 @@
-java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.jar "$@"
+java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.1.jar "$@"
@@ -1,2 +1,2 @@
set SCRIPT_DIR=%~dp0
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.jar" %*
+java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.1.jar" %*
@@ -17,11 +17,11 @@ unmanagedResourceDirectories in Test <+= (baseDirectory) { _ / "src/main/webapp"
scalacOptions ++= Seq("-deprecation", "-unchecked")
libraryDependencies ++= {
- val liftVersion = "2.5-M3"
+ val liftVersion = "2.5-M4"
Seq(
"net.liftweb" %% "lift-webkit" % liftVersion % "compile",
"net.liftweb" %% "lift-mapper" % liftVersion % "compile",
- "net.liftmodules" %% "lift-jquery-module" % (liftVersion + "-2.0"),
+ "net.liftmodules" %% "lift-jquery-module" % (liftVersion + "-2.1"),
"org.eclipse.jetty" % "jetty-webapp" % "8.1.7.v20120910" % "container,test",
"org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container,test" artifacts Artifact("javax.servlet", "jar", "jar"),
"ch.qos.logback" % "logback-classic" % "1.0.6",
View
@@ -1 +1 @@
-java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.jar "$@"
+java -Xmx1024M -Xss2M -XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -jar `dirname $0`/sbt-launch-0.12.1.jar "$@"
@@ -1,2 +1,2 @@
set SCRIPT_DIR=%~dp0
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.jar" %*
+java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx1024M -Xss2M -jar "%SCRIPT_DIR%\sbt-launch-0.12.1.jar" %*

0 comments on commit b867d55

Please sign in to comment.