Permalink
Browse files

Update Xitrum from 3.23 to 3.24.0

  • Loading branch information...
1 parent f5d6367 commit 6cc7bff09b19d2ecc91e4f82bfeaecf5ebf5ff9e @ngocdaothanh ngocdaothanh committed Apr 6, 2015
View
@@ -1,7 +1,5 @@
organization := "tv.cntt"
-
name := "xitrum-new"
-
version := "1.0-SNAPSHOT"
scalaVersion := "2.11.6"
@@ -14,19 +12,19 @@ javacOptions ++= Seq("-source", "1.7", "-target", "1.7")
//------------------------------------------------------------------------------
-libraryDependencies += "tv.cntt" %% "xitrum" % "3.23"
+libraryDependencies += "tv.cntt" %% "xitrum" % "3.24.0"
// Xitrum uses SLF4J, an implementation of SLF4J is needed
-libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.1.2"
+libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.1.3"
// For writing condition in logback.xml
libraryDependencies += "org.codehaus.janino" % "janino" % "2.7.8"
-libraryDependencies += "org.webjars" % "bootstrap" % "3.3.2-2"
+libraryDependencies += "org.webjars" % "bootstrap" % "3.3.4"
// Scalate template engine config for Xitrum -----------------------------------
-libraryDependencies += "tv.cntt" %% "xitrum-scalate" % "2.4"
+libraryDependencies += "tv.cntt" %% "xitrum-scalate" % "2.5"
// Precompile Scalate templates
seq(scalateSettings:_*)
@@ -40,9 +38,7 @@ ScalateKeys.scalateTemplateConfig in Compile := Seq(TemplateConfig(
// xgettext i18n translation key string extractor is a compiler plugin ---------
autoCompilerPlugins := true
-
addCompilerPlugin("tv.cntt" %% "xgettext" % "1.3")
-
scalacOptions += "-P:xgettext:xitrum.I18n"
// Put config directory in classpath for easier development --------------------
View
@@ -134,7 +134,7 @@ xitrum {
# Adjust this when you use very long URL, e.g. send a lot of data with GET method.
maxInitialLineLength = 4096
- maxHeaderSize = 8192
+ maxHeaderSize = 81920
# Increase if you want to allow bigger file upload.
# (Google App Engine's limit: 32 MB)
@@ -1 +1 @@
-sbt.version=0.13.7
+sbt.version=0.13.8
View
@@ -13,4 +13,4 @@ if [[ "${java_version}" > "1.8" ]]; then
else
memopts="-XX:MaxPermSize=384M"
fi
-$java_cmd -javaagent:`dirname $0`/agent7-1.0.jar -Xms256M -Xmx512M -Xss1M -XX:+CMSClassUnloadingEnabled $memopts -jar `dirname $0`/sbt-launch-0.13.7.jar "$@"
+$java_cmd -javaagent:`dirname $0`/agent7-1.0.jar -Xms256M -Xmx512M -Xss1M -XX:+CMSClassUnloadingEnabled $memopts -jar `dirname $0`/sbt-launch-0.13.8.jar "$@"
Binary file not shown.
View
@@ -19,4 +19,4 @@ for /f "delims=. tokens=1-3" %%v in ("%JAVA_VERSION%") do (
)
)
-java -javaagent:"%SCRIPT_DIR%agent7-1.0.jar" -Xms256M -Xmx512M -Xss1M -XX:+CMSClassUnloadingEnabled %META_SIZE% -jar "%SCRIPT_DIR%sbt-launch-0.13.7.jar" %*
+java -javaagent:"%SCRIPT_DIR%agent7-1.0.jar" -Xms256M -Xmx512M -Xss1M -XX:+CMSClassUnloadingEnabled %META_SIZE% -jar "%SCRIPT_DIR%sbt-launch-0.13.8.jar" %*
@@ -11,7 +11,7 @@ html
link(rel="shortcut icon" href={publicUrl("favicon.ico")})
- link(type="text/css" rel="stylesheet" media="all" href={webJarsUrl("bootstrap/3.3.2-2/css", "bootstrap.css", "bootstrap.min.css")})
+ link(type="text/css" rel="stylesheet" media="all" href={webJarsUrl("bootstrap/3.3.4/css", "bootstrap.css", "bootstrap.min.css")})
link(type="text/css" rel="stylesheet" media="all" href={publicUrl("app.css")})
body

0 comments on commit 6cc7bff

Please sign in to comment.