Skip to content

Commit 0855fc2

Browse files
committed
bump scalikejdbc version, fix build settings
1 parent 71b52c9 commit 0855fc2

File tree

6 files changed

+14
-27
lines changed

6 files changed

+14
-27
lines changed

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
xerial.sbt.Sonatype.sonatypeSettings
2-

core/build.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
scalariformSettings
2-
3-
net.virtualvoid.sbt.graph.Plugin.graphSettings
4-

play-plugin/build.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
scalariformSettings
2-
3-
net.virtualvoid.sbt.graph.Plugin.graphSettings
4-

play-sample/build.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
scalariformSettings
2-
3-
net.virtualvoid.sbt.graph.Plugin.graphSettings
4-

project/Build.scala

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

44
object ScalikeJDBCAsyncProject extends Build {
55

6-
lazy val _version = "0.5.6-SNAPSHOT"
7-
lazy val scalikejdbcVersion = "2.2.3"
8-
lazy val mauricioVersion = "0.2.15"
6+
lazy val _version = "0.6.0-SNAPSHOT"
7+
lazy val scalikejdbcVersion = "2.2.4"
8+
lazy val mauricioVersion = "0.2.+" // provided
9+
lazy val postgresqlVersion = "9.4-1201-jdbc41"
910
lazy val defaultPlayVersion = play.core.PlayVersion.current
1011

1112
lazy val core = Project(
@@ -26,7 +27,7 @@ object ScalikeJDBCAsyncProject extends Build {
2627
"org.scalikejdbc" %% "scalikejdbc-interpolation" % scalikejdbcVersion % "compile",
2728
"com.github.mauricio" %% "postgresql-async" % mauricioVersion % "provided",
2829
"com.github.mauricio" %% "mysql-async" % mauricioVersion % "provided",
29-
"org.postgresql" % "postgresql" % "9.3-1102-jdbc41" % "test",
30+
"org.postgresql" % "postgresql" % postgresqlVersion % "test",
3031
"mysql" % "mysql-connector-java" % "5.1.+" % "test",
3132
"org.scalatest" %% "scalatest" % "2.2.+" % "test",
3233
"ch.qos.logback" % "logback-classic" % "1.1.+" % "test"
@@ -56,13 +57,12 @@ object ScalikeJDBCAsyncProject extends Build {
5657
crossScalaVersions := Seq("2.11.5", "2.10.4"),
5758
resolvers ++= _resolvers,
5859
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/",
59-
libraryDependencies <++= (scalaVersion) { scalaVersion =>
60-
Seq(
61-
"com.github.mauricio" %% "postgresql-async" % mauricioVersion % "provided",
62-
"com.github.mauricio" %% "mysql-async" % mauricioVersion % "provided",
63-
"com.typesafe.play" %% "play" % defaultPlayVersion % "provided",
64-
"com.typesafe.play" %% "play-test" % defaultPlayVersion % "test")
65-
},
60+
libraryDependencies ++= Seq(
61+
"com.github.mauricio" %% "postgresql-async" % mauricioVersion % "provided",
62+
"com.github.mauricio" %% "mysql-async" % mauricioVersion % "provided",
63+
"com.typesafe.play" %% "play" % defaultPlayVersion % "provided",
64+
"com.typesafe.play" %% "play-test" % defaultPlayVersion % "test"
65+
),
6666
testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "sequential", "true"),
6767
publishTo <<= version { (v: String) => _publishTo(v) },
6868
publishMavenStyle := true,
@@ -83,7 +83,7 @@ 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-1102-jdbc41",
86+
"org.postgresql" % "postgresql" % postgresqlVersion,
8787
"com.github.tototoshi" %% "play-flyway" % "1.2.+",
8888
"mysql" % "mysql-connector-java" % "5.1.+",
8989
"org.json4s" %% "json4s-ext" % "3.2.11",
@@ -92,9 +92,7 @@ object ScalikeJDBCAsyncProject extends Build {
9292
Project(appName, file("play-sample")).enablePlugins(play.PlayScala).settings(
9393
scalaVersion in ThisBuild := "2.11.5",
9494
libraryDependencies ++= appDependencies,
95-
resolvers ++= Seq(
96-
"sonatype releases" at "https://oss.sonatype.org/content/repositories/releases"
97-
)
95+
resolvers ++= _resolvers
9896
).dependsOn(core, playPlugin)
9997
}
10098

project/plugins.sbt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
2-
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
32
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.4")
43
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0.BETA1")
54

65
resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
7-
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.7")
6+
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.8")
87
addSbtPlugin("com.typesafe.sbt" % "sbt-coffeescript" % "1.0.0")
98

109
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")

0 commit comments

Comments
 (0)