Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
nafg committed Jul 11, 2016
1 parent 4a8069e commit 6e42e8c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ cache:
directories:
- $HOME/.ivy2
- $HOME/.sbt
script: sbt +test +coveralls
after_success: sbt +package +publish
script:
- sbt +clean coverage +test coverageReport &&
sbt coverageAggregate
after_success:
- sbt coveralls
- sbt +clean +package +publish
env:
global:
secure: APrQBWcOM2kkihTSSPIEiPEAIiM1Gi1HLNK6Sz/cBtRttXVnMUr7CHU9hbPKtJP94iYmc3gZKY5YjZVG7oKh1B3hUx7booHMPS0fyaC0bxUwRLSWIrav+c2cTzwYvoKz4smS81njrq+i4F/g/+05jqsiwSu7bpjiueiXjROXLZk=
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name := "slick-additions"

val settings = Seq(
organization := "io.github.nafg",
crossScalaVersions := Seq("2.10.5", "2.11.6"),
scalaVersion := "2.11.6",
crossScalaVersions := Seq("2.10.6", "2.11.8"),
scalaVersion := "2.11.8",
scalacOptions ++= Seq("-deprecation", "-unchecked")
)

Expand All @@ -18,8 +18,8 @@ lazy val `slick-additions` =
.settings(
libraryDependencies ++= Seq(
"com.typesafe.slick" %% "slick" % "2.1.0",
"org.scalatest" %% "scalatest" % "2.2.0" % "test",
"com.h2database" % "h2" % "1.3.170" % "test",
"ch.qos.logback" % "logback-classic" % "0.9.28" % "test"
"org.scalatest" %% "scalatest" % "2.2.6" % "test",
"com.h2database" % "h2" % "1.4.192" % "test",
"ch.qos.logback" % "logback-classic" % "1.1.7" % "test"
)
)
4 changes: 2 additions & 2 deletions project/scoverage.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
resolvers += Classpaths.sbtPluginReleases

addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "0.99.5.1")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")

addSbtPlugin("com.sksamuel.scoverage" %% "sbt-coveralls" % "0.0.5")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")
10 changes: 1 addition & 9 deletions scoverage.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
import CoverallsPlugin.CoverallsKeys._

instrumentSettings

CoverallsPlugin.coverallsSettings

ScoverageKeys.highlighting := true

sys.props.get("coveralls-repo-token").toList.map(coverallsToken := _)
sys.props.get("coveralls-repo-token").toList.map(s => CoverallsKeys.coverallsToken := Some(s))
2 changes: 1 addition & 1 deletion src/test/scala/scala/slick/additions/KeyedTableTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class KeyedTableTests extends FunSuite with Matchers with BeforeAndAfter {
}
}

val db = Database.forURL("jdbc:h2:test", driver = "org.h2.Driver")
val db = Database.forURL("jdbc:h2:./test", driver = "org.h2.Driver")

val ddl = Phones.ddl ++ People.ddl

Expand Down

0 comments on commit 6e42e8c

Please sign in to comment.