SBT 0.12.3, dependency bumps.

melezov · Apr 5, 2013 · 4cec29c · 4cec29c
1 parent 9090854
commit 4cec29c
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 18 deletions.
diff --git a/code/core/continuous-compilation.bat b/code/core/continuous-compilation.bat
@@ -1,4 +1,4 @@
 @echo off
 
 echo Entering continuous compilation loop ...
-call "%~dp0sbt.bat" --loop --no-jrebel %* ~compile
+call "%~dp0\sbt.bat" --loop --no-jrebel %* ~compile
diff --git a/code/core/open-console.bat b/code/core/open-console.bat
@@ -1,4 +1,4 @@
 @echo off
 
 echo Firing up the Scala REPL ...
-call "%~dp0sbt.bat" %* console
+call "%~dp0\sbt.bat" %* console
diff --git a/code/core/src/main/java/org/xsbt/versions/SBTVersion.java b/code/core/src/main/java/org/xsbt/versions/SBTVersion.java
@@ -72,7 +72,8 @@ public enum SBTVersion {
   SBT_0_12_1      ("sbt-launch-0.12.1.jar",       "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.1/sbt-launch.jar",       "45c28c7c6328d6ecf8e9dc51003a0f1af71516ad", "9d832c4cfdb889103bd37a8bda3faa0e", 1349051199, 1103618, false, true,  false,     -1, false),
   SBT_0_12_2_RC1  ("sbt-launch-0.12.2-RC1.jar",   "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.2-RC1/sbt-launch.jar",   "f60fceee8e68c78ae68e3387dca6e69d1fad4e50", "990664c65dc5ee52f95edcd9231c4744", 1355424815, 1105362, true,  true,  false,     -1, false),
   SBT_0_12_2_RC2  ("sbt-launch-0.12.2-RC2.jar",   "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.2-RC2/sbt-launch.jar",   "5e33a7cfd88ca0a05fac538649e1c2ed444458cd", "db591e4ab57657591ae3ccc666f77b77", 1357243720, 1105363, true,  true,  false,     -1, false),
-  SBT_0_12_2      ("sbt-launch-0.12.2.jar",       "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.2/sbt-launch.jar",       "ef6213597489edd8d1955086924f488949dd4975", "d523ab71b5d2bcaead80d21d0af79361", 1358351073, 1105354, false, true,  false,     -1, false);
+  SBT_0_12_2      ("sbt-launch-0.12.2.jar",       "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.2/sbt-launch.jar",       "ef6213597489edd8d1955086924f488949dd4975", "d523ab71b5d2bcaead80d21d0af79361", 1358351073, 1105354, false, true,  false,     -1, false),
+  SBT_0_12_3      ("sbt-launch-0.12.3.jar",       "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.3/sbt-launch.jar",       "38d15379d20a8e8113e59285ff8a1e52b01b98b6", "d523ab71b5d2bcaead80d21d0af79361", 1364523759, 1105722, true,  true,  false,     -1, false);
 
   public final String filename;
   public final String url;

diff --git a/code/lift/continuous-compilation.bat b/code/lift/continuous-compilation.bat
@@ -1,4 +1,4 @@
 @echo off
 
 echo Entering continuous compilation loop ...
-call "%~dp0sbt.bat" --loop --no-jrebel %* ~compile
+call "%~dp0\sbt.bat" --loop --no-jrebel %* ~compile
diff --git a/code/lift/open-console.bat b/code/lift/open-console.bat
@@ -1,4 +1,4 @@
 @echo off
 
 echo Firing up the Scala REPL ...
-call "%~dp0sbt.bat" %* console
+call "%~dp0\sbt.bat" %* console
diff --git a/code/project/XOBuild.scala b/code/project/XOBuild.scala
@@ -8,7 +8,7 @@ object BuildSettings {
   val defaultSettings = Defaults.defaultSettings ++ Seq(
     organization  := "hr.element.xsbt"
 
-  , scalaVersion  := "2.9.2"
+  , scalaVersion  := "2.10.1"
   , scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "UTF-8", "-optimise", "-Yrepl-sync")
 
   , resolvers := Seq("Element Nexus" at "http://repo.element.hr/nexus/content/groups/public")
@@ -34,17 +34,17 @@ object BuildSettings {
 }
 
 object Dependencies {
-  val jetty = "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container"
+  val jetty = "org.eclipse.jetty" % "jetty-webapp" % "8.1.10.v20130312" % "container"
   val orbit = "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container" artifacts Artifact("javax.servlet", "jar", "jar")
 
-  val liftWebKit = "net.liftweb" %% "lift-webkit" % "2.5-M4"
-  val etbLift = "hr.element.etb" %% "etb-lift" % "0.1.1"
+  val liftWebKit = "net.liftweb" %% "lift-webkit" % "2.5-RC2"
+  val etbLift = "hr.element.etb" %% "etb-lift" % "0.1.2"
 
   val scalaTime = "com.github.nscala-time" %% "nscala-time" % "0.2.0"
 
   val commonsIo = "commons-io" % "commons-io" % "2.4"
 
-  val logback = "ch.qos.logback" % "logback-classic" % "1.0.9"
+  val logback = "ch.qos.logback" % "logback-classic" % "1.0.11"
 }
 
 object XOBuild extends Build {

diff --git a/code/project/build.properties b/code/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.12.3
diff --git a/code/project/plugins.sbt b/code/project/plugins.sbt
@@ -16,7 +16,7 @@ externalResolvers <<= resolvers map { r =>
 // | See also: Scala IDE downloads (http://download.scala-ide.org/)                     |
 // +------------------------------------------------------------------------------------+
 
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.1")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.2")
 
 // +-------------------------------------------------------------------------------------+
 // | XSBT Web plugin (https://github.com/JamesEarlDouglas/xsbt-web-plugin)               |

diff --git a/code/project/strap/gruj_vs_sbt-launch-0.12.3.jar b/code/project/strap/gruj_vs_sbt-launch-0.12.3.jar
diff --git a/code/project/strap/sbt.boot.properties b/code/project/strap/sbt.boot.properties
@@ -4,7 +4,7 @@
 [app]
   org: ${sbt.organization-org.scala-sbt}
   name: sbt
-  version: ${sbt.version-read(sbt.version)[0.12.2]}
+  version: ${sbt.version-read(sbt.version)[0.12.3]}
   class: ${sbt.main.class-sbt.xMain}
   components: xsbti,extra
   cross-versioned: ${sbt.cross.versioned-false}
@@ -15,7 +15,7 @@
   element-repo-ivy: http://repo.element.hr/nexus/content/groups/public/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
 
 [boot]
- directory: ../../.sbt/xsbt.org
+  directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}
 
 [ivy]
   ivy-home: ../../.ivy2/xsbt.org

diff --git a/code/sbt.bat b/code/sbt.bat
@@ -3,7 +3,7 @@ setlocal
 pushd
 cd "%~dp0"
 
-set JVM_PARAMS=-Xss2m -Xmx712m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled
+set JVM_PARAMS=-Xss2m -Xms2g -Xmx2g -XX:+TieredCompilation -XX:ReservedCodeCacheSize=256m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseNUMA -XX:+UseParallelGC -Dscalac.patmat.analysisBudget=off
 
 set LIFT_RUN_MODE=-Drun.mode=development
 set TRY_JREBEL=true
@@ -14,12 +14,22 @@ set DO_LOOP=false
 :PARSER_LOOP
 if "%~1"=="" goto :PARSER_END
 
+if "%~1"=="--jvm" (
+  echo Setting JVM param [%~2]
+  set JVM_PARAMS=%JVM_PARAMS% -D%~2
+  shift
+  goto :PARSER_CONTINUE
+)
+
 if "%~1"=="--prod" (
+  echo Setting production mode
   set LIFT_RUN_MODE=-Drun.mode=production
+  set LOG_LEVEL="set logLevel:=Level.Info"
   goto :PARSER_CONTINUE
 )
 
 if "%~1"=="--debug" (
+  echo "Setting debug mode"
   set LOG_LEVEL="set logLevel:=Level.Debug"
   goto :PARSER_CONTINUE
 )
@@ -31,16 +41,19 @@ if "%~1"=="~lift" (
 )
 
 if "%~1"=="--no-jrebel" (
+  echo Disabling JRebel for faster compilation
   set TRY_JREBEL=false
   goto :PARSER_CONTINUE
 )
 
 if "%~1"=="--loop" (
+  echo Will run SBT in loop mode
   set DO_LOOP=true
   goto :PARSER_CONTINUE
 )
 
 if "%~1"=="--no-pause" (
+  echo Will not pause in loop mode
   set NO_PAUSE=true
   goto :PARSER_CONTINUE
 )
@@ -57,7 +70,7 @@ if %TRY_JREBEL%.==true. (
   if exist "%JREBEL_HOME%\jrebel.jar" set JVM_PARAMS=%JVM_PARAMS% -noverify -javaagent:"%JREBEL_HOME%\jrebel.jar" %JREBEL_PLUGINS%
 )
 
-set GRUJ_PATH=project\strap\gruj_vs_sbt-launch-0.12.2.jar
+set GRUJ_PATH=project\strap\gruj_vs_sbt-launch-0.12.3.jar
 set RUN_CMD=java %JVM_PARAMS% -jar %GRUJ_PATH% %LOG_LEVEL% %SBT_PARAMS%
 
 :RUN_LOOP

diff --git a/code/sbt.sh b/code/sbt.sh
@@ -2,7 +2,7 @@
 cd `dirname $0`
 
 ## START JVM PARAMS
-JVM_PARAMS="-Xss2m -Xmx712m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled"
+JVM_PARAMS="-Xss2m -Xms2g -Xmx2g -XX:+TieredCompilation -XX:ReservedCodeCacheSize=256m -XX:MaxPermSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseNUMA -XX:+UseParallelGC -Dscalac.patmat.analysisBudget=off"
 
 LIFT_RUN_MODE="-Drun.mode=development"
 TRY_JREBEL=true
@@ -18,7 +18,8 @@ do
       LOG_LEVEL="\"set logLevel:=Level.Debug\""
       ;;
     "--prod")
-      echo "Set Lift mode to Production"
+      echo "Setting production mode"
+      LOG_LEVEL="\"set logLevel:=Level.Info\""
       LIFT_RUN_MODE="-Drun.mode=production"
       ;;
     "~lift")
@@ -51,7 +52,7 @@ if $TRY_JREBEL && [ -n "$JREBEL_HOME" ] && [ -f $JREBEL_HOME/jrebel.jar ]; then
   JVM_PARAMS="$JVM_PARAMS -noverify -javaagent:$JREBEL_HOME/jrebel.jar $JREBEL_PLUGINS"
 fi
 
-GRUJ_PATH="project/strap/gruj_vs_sbt-launch-0.12.2.jar"
+GRUJ_PATH="project/strap/gruj_vs_sbt-launch-0.12.3.jar"
 RUN_CMD="java $JVM_PARAMS -jar $GRUJ_PATH $LOG_LEVEL $SBT_PARAMS"
 
 LOOPING=true

diff --git a/...oject/strap/gruj_vs_sbt-launch-0.12.2.jar → files/gruj/gruj_vs_sbt-launch-0.12.3.jar b/...oject/strap/gruj_vs_sbt-launch-0.12.2.jar → files/gruj/gruj_vs_sbt-launch-0.12.3.jar
diff --git a/files/repo/sbt-launch-0.12.3.jar b/files/repo/sbt-launch-0.12.3.jar
diff --git a/files/repo/sbt-launch-0.12.3.jar.md5 b/files/repo/sbt-launch-0.12.3.jar.md5
@@ -0,0 +1 @@
+124fb91b398542c23cd920360580d2d7
diff --git a/files/repo/sbt-launch-0.12.3.jar.sha1 b/files/repo/sbt-launch-0.12.3.jar.sha1
@@ -0,0 +1 @@
+38d15379d20a8e8113e59285ff8a1e52b01b98b6
diff --git a/files/repo/sbt-launch-0.12.3.jar.url b/files/repo/sbt-launch-0.12.3.jar.url
@@ -0,0 +1 @@
+http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.12.3/sbt-launch.jar