Skip to content

Commit 1862746

Browse files
committed
Merge branch 'release/0.5.3'
2 parents 9574229 + 3fae6cc commit 1862746

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

project/Build.scala

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import Keys._
33

44
object ScalikeJDBCAsyncProject extends Build {
55

6-
lazy val _version = "0.5.2"
7-
lazy val scalikejdbcVersion = "2.1.4"
6+
lazy val _version = "0.5.3"
7+
lazy val scalikejdbcVersion = "2.2.0"
88
lazy val mauricioVersion = "0.2.15"
99
lazy val defaultPlayVersion = play.core.PlayVersion.current
1010

@@ -26,10 +26,10 @@ object ScalikeJDBCAsyncProject extends Build {
2626
"org.scalikejdbc" %% "scalikejdbc-interpolation" % scalikejdbcVersion % "compile",
2727
"com.github.mauricio" %% "postgresql-async" % mauricioVersion % "provided",
2828
"com.github.mauricio" %% "mysql-async" % mauricioVersion % "provided",
29-
"org.postgresql" % "postgresql" % "9.3-1101-jdbc41" % "test",
30-
"mysql" % "mysql-connector-java" % "5.1.+" % "test",
31-
"org.scalatest" %% "scalatest" % "2.1.+" % "test",
32-
"ch.qos.logback" % "logback-classic" % "1.1.+" % "test"
29+
"org.postgresql" % "postgresql" % "9.3-1102-jdbc41" % "test",
30+
"mysql" % "mysql-connector-java" % "5.1.34" % "test",
31+
"org.scalatest" %% "scalatest" % "2.2.1" % "test",
32+
"ch.qos.logback" % "logback-classic" % "1.1.2" % "test"
3333
)
3434
},
3535
sbtPlugin := false,
@@ -83,10 +83,10 @@ object ScalikeJDBCAsyncProject extends Build {
8383
"org.scalikejdbc" %% "scalikejdbc-interpolation" % scalikejdbcVersion,
8484
"com.github.mauricio" %% "postgresql-async" % mauricioVersion,
8585
"com.github.mauricio" %% "mysql-async" % mauricioVersion,
86-
"org.postgresql" % "postgresql" % "9.3-1101-jdbc41",
87-
"com.github.tototoshi" %% "play-flyway" % "1.1.0",
88-
"mysql" % "mysql-connector-java" % "5.1.+",
89-
"org.json4s" %% "json4s-ext" % "3.2.+",
86+
"org.postgresql" % "postgresql" % "9.3-1102-jdbc41",
87+
"com.github.tototoshi" %% "play-flyway" % "1.1.2",
88+
"mysql" % "mysql-connector-java" % "5.1.34",
89+
"org.json4s" %% "json4s-ext" % "3.2.11",
9090
"com.github.tototoshi" %% "play-json4s-native" % "0.3.0"
9191
)
9292
Project(appName, file("play-sample")).enablePlugins(play.PlayScala).settings(

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
sbt.version=0.13.7-RC2
1+
sbt.version=0.13.7-RC3
22

0 commit comments

Comments
 (0)