Skip to content

Commit

Permalink
Merge pull request zio#977 from golem131/dependencyUpdates
Browse files Browse the repository at this point in the history
[WIP] Dependency updates
  • Loading branch information
mentegy committed Nov 27, 2017
2 parents efabfc8 + e01d2a6 commit 38ead0c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions build.sbt
Expand Up @@ -70,7 +70,7 @@ lazy val `quill-jdbc` =
.settings(
fork in Test := true,
libraryDependencies ++= Seq(
"com.zaxxer" % "HikariCP" % "2.7.3",
"com.zaxxer" % "HikariCP" % "2.7.4",
"mysql" % "mysql-connector-java" % "5.1.42" % Test,
"com.h2database" % "h2" % "1.4.196" % Test,
"org.postgresql" % "postgresql" % "42.1.4" % Test,
Expand All @@ -85,7 +85,7 @@ lazy val `quill-spark` =
.settings(commonSettings: _*)
.settings(mimaSettings: _*)
.settings(
crossScalaVersions := Seq("2.11.11"),
crossScalaVersions := Seq("2.11.12"),
fork in Test := true,
libraryDependencies ++= Seq(
"org.apache.spark" %% "spark-sql" % "2.2.0"
Expand Down Expand Up @@ -173,7 +173,7 @@ lazy val `quill-orientdb` =
.settings(
fork in Test := true,
libraryDependencies ++= Seq(
"com.orientechnologies" % "orientdb-graphdb" % "2.2.29"
"com.orientechnologies" % "orientdb-graphdb" % "2.2.30"
)
)
.dependsOn(`quill-sql-jvm` % "compile->compile;test->test")
Expand Down Expand Up @@ -254,8 +254,8 @@ def updateWebsiteTag =

lazy val commonSettings = ReleasePlugin.extraReleaseCommands ++ Seq(
organization := "io.getquill",
scalaVersion := "2.11.11",
crossScalaVersions := Seq("2.11.11","2.12.4"),
scalaVersion := "2.11.12",
crossScalaVersions := Seq("2.11.12","2.12.4"),
libraryDependencies ++= Seq(
"org.scalamacros" %% "resetallattrs" % "1.0.0",
"org.scalatest" %%% "scalatest" % "3.0.4" % Test,
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile-sbt
Expand Up @@ -17,7 +17,7 @@ RUN apt-get update; \
curl -sL https://deb.nodesource.com/setup_8.x | bash -; \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends nodejs

ENV SBT_VERSION 1.0.3
ENV SBT_VERSION 1.0.4
ENV SBT_HOME /usr/local/sbt
ENV PATH ${PATH}:${SBT_HOME}/bin

Expand Down
2 changes: 1 addition & 1 deletion build/build.sh
Expand Up @@ -5,7 +5,7 @@ chown root ~/.ssh/config
chmod 644 ~/.ssh/config

SBT_CMD="sbt"
SBT_CMD_2_11=" -DscalaVersion=2.11.11 ++2.11.11 clean coverage test tut coverageReport coverageAggregate checkUnformattedFiles"
SBT_CMD_2_11=" -DscalaVersion=2.11.12 ++2.11.12 clean coverage test tut coverageReport coverageAggregate checkUnformattedFiles"
SBT_CMD_2_12=" -DscalaVersion=2.12.4 ++2.12.4 clean test"
SBT_PUBLISH=" coverageOff publish"

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=1.0.3
sbt.version=1.0.4

0 comments on commit 38ead0c

Please sign in to comment.