Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into 2.10.x

  • Loading branch information...
commit 12e26b2a545d842a505138b09a7514fe9471f9fe 2 parents fece55b + 55a1e4a
Marko Elezović authored
View
55 project/PGScalaBuild.scala
@@ -8,13 +8,13 @@ object BuildSettings {
val bsUtil = javaSettings ++ Seq(
name := "pgscala-util"
- , version := "0.3.6"
+ , version := "0.3.6-1"
, initialCommands := "import org.pgscala.util._"
)
val bsIORC = scalaSettings ++ Seq(
name := "pgscala-iorc"
- , version := "0.1.7"
+ , version := "0.1.7-1"
, initialCommands := "import org.pgscala.iorc._"
)
@@ -41,26 +41,26 @@ object BuildSettings {
val bsConvertersJava = javaSettings ++ Seq(
name := "pgscala-converters-java"
- , version := "0.2.9"
+ , version := "0.2.9-1"
, initialCommands := "import org.pgscala.converters._"
)
val bsConvertersScala = scalaSettings ++ Seq(
name := "pgscala-converters-scala"
- , version := "0.2.15"
+ , version := "0.2.15-1"
, initialCommands := "import org.pgscala.converters._"
, unmanagedSourceDirectories in Compile <<= (scalaSource in Compile, javaSource in Compile)(_ :: _ :: Nil)
)
val bsPGScala = scalaSettings ++ Seq(
name := "pgscala"
- , version := "0.7.23"
+ , version := "0.7.23-1"
, initialCommands := "import org.pgscala._"
)
val bsPool = scalaSettings ++ Seq(
name := "pgscala-pool"
- , version := "0.2.16"
+ , version := "0.2.16-1"
, initialCommands := "import org.pgscala._"
)
}
@@ -68,17 +68,17 @@ object BuildSettings {
// ---------------------------------------------------------------------------
object Dependencies {
- lazy val jodaTime = "joda-time" % "joda-time" % "2.1"
- lazy val jodaConvert = "org.joda" % "joda-convert" % "1.2"
+ lazy val jodaTime = "joda-time" % "joda-time" % "2.2"
+ lazy val jodaConvert = "org.joda" % "joda-convert" % "1.3.1"
lazy val postgres = "postgresql" % "postgresql" % "9.2-1002.jdbc4"
- lazy val c3p0 = "com.mchange" % "c3p0" % "0.9.2"
+ lazy val c3p0 = "com.mchange" % "c3p0" % "0.9.2.1"
- lazy val slf4j = "org.slf4j" % "slf4j-api" % "1.7.2"
- lazy val log4jOverSlf4j = "org.slf4j" % "log4j-over-slf4j" % "1.7.2"
+ lazy val slf4j = "org.slf4j" % "slf4j-api" % "1.7.5"
+ lazy val log4jOverSlf4j = "org.slf4j" % "log4j-over-slf4j" % "1.7.5"
- lazy val logback = "ch.qos.logback" % "logback-classic" % "1.0.9"
+ lazy val logback = "ch.qos.logback" % "logback-classic" % "1.0.11"
lazy val scalaIo = (sV: String) =>
"com.github.scala-incubator.io" % "scala-io-file_".+(sV match {
case "2.9.2" | "2.9.3" => "2.9.2"
@@ -199,13 +199,7 @@ object Publishing {
// ---------------------------------------------------------------------------
-object Default {
- //Eclipse plugin
- import com.typesafe.sbteclipse.plugin.EclipsePlugin._
-
- //Dependency graph plugin
- import net.virtualvoid.sbt.graph.Plugin._
-
+object ScalaOptions {
val scala2_8 = Seq(
"-unchecked"
, "-deprecation"
@@ -236,6 +230,21 @@ object Default {
, "-language:existentials"
)
+ def apply(version: String) = scala2_8 ++ (version match {
+ case x if (x startsWith "2.10.") => scala2_9 ++ scala2_9_1 ++ scala2_10
+ case x if (x startsWith "2.9.") && x >= "2.9.1" => scala2_9 ++ scala2_9_1
+ case x if (x startsWith "2.9.") => scala2_9
+ case _ => Nil
+ } )
+}
+
+object Default {
+ //Eclipse plugin
+ import com.typesafe.sbteclipse.plugin.EclipsePlugin._
+
+ //Dependency graph plugin
+ import net.virtualvoid.sbt.graph.Plugin._
+
lazy val scalaSettings =
Defaults.defaultSettings ++
eclipseSettings ++
@@ -248,13 +257,7 @@ object Default {
, crossScalaVersions := Seq(
"2.10.1-RC2"
)
- , scalacOptions <<= scalaVersion map ( sV => scala2_8 ++ (sV match {
- case x if (x startsWith "2.10.") => scala2_9 ++ scala2_9_1 ++ scala2_10
- case x if (x startsWith "2.9.") && x >= "2.9.1" => scala2_9 ++ scala2_9_1
- case x if (x startsWith "2.9.") => scala2_9
- case _ => Nil
- } )
- )
+ , scalacOptions <<= scalaVersion map ( ScalaOptions(_) )
, javaHome := sys.env.get("JDK16_HOME").map(file(_))
, javacOptions := Seq(
View
1  project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.12.3-RC2
View
2  project/strap/sbt.boot.properties
@@ -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/pgscala
+ directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}
[ivy]
ivy-home: ../.ivy2/pgscala
View
18 sbt.bat
@@ -5,7 +5,6 @@ cd "%~dp0"
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
set LOG_LEVEL=
set NO_PAUSE=false
@@ -14,33 +13,39 @@ set DO_LOOP=false
:PARSER_LOOP
if "%~1"=="" goto :PARSER_END
-if "%~1"=="--prod" (
- set LIFT_RUN_MODE=-Drun.mode=production
+if "%~1"=="--jvm" (
+ echo Setting JVM param [%~2]
+ set JVM_PARAMS=%JVM_PARAMS% -D%~2
+ shift
goto :PARSER_CONTINUE
)
if "%~1"=="--debug" (
+ echo "Setting debug mode"
set LOG_LEVEL="set logLevel:=Level.Debug"
goto :PARSER_CONTINUE
)
-if "%~1"=="~lift" (
- set SBT_PARAMS=%SBT_PARAMS% container:start ~compile container:stop
- set JREBEL_PLUGINS=%JREBEL_PLUGINS% -Drebel.lift_plugin=true
+if "%~1"=="--prod" (
+ echo Setting production mode
+ set LOG_LEVEL="set logLevel:=Level.Info"
goto :PARSER_CONTINUE
)
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
)
@@ -52,7 +57,6 @@ shift
goto :PARSER_LOOP
:PARSER_END
-set JVM_PARAMS=%JVM_PARAMS% %LIFT_RUN_MODE%
if %TRY_JREBEL%.==true. (
if exist "%JREBEL_HOME%\jrebel.jar" set JVM_PARAMS=%JVM_PARAMS% -noverify -javaagent:"%JREBEL_HOME%\jrebel.jar" %JREBEL_PLUGINS%
)
View
11 sbt.sh
@@ -4,7 +4,6 @@ cd `dirname $0`
## START JVM PARAMS
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
LOG_LEVEL=
NO_PAUSE=false
@@ -18,13 +17,8 @@ do
LOG_LEVEL="\"set logLevel:=Level.Debug\""
;;
"--prod")
- echo "Set Lift mode to Production"
- LIFT_RUN_MODE="-Drun.mode=production"
- ;;
- "~lift")
- echo "Firing up Jetty ..."
- SBT_PARAMS="$SBT_PARAMS container:start ~compile container:stop"
- JREBEL_PLUGINS="$JREBEL_PLUGINS -Drebel.lift_plugin=true"
+ echo "Setting production mode"
+ LOG_LEVEL="\"set logLevel:=Level.Info\""
;;
"--no-jrebel")
echo "Disabling JRebel for faster compilation"
@@ -46,7 +40,6 @@ do
done
-JVM_PARAMS="$JVM_PARAMS $LIFT_RUN_MODE"
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
Please sign in to comment.
Something went wrong with that request. Please try again.