Skip to content

Commit fd2928b

Browse files
committed
Updating dependencies, restoring test config.
1 parent 6be1d44 commit fd2928b

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ before_cache:
1616
language: scala
1717
jdk:
1818
- oraclejdk8
19+
- oraclejdk9
1920
scala:
2021
- 2.10.6
2122
- 2.11.11
22-
- 2.12.2
23+
- 2.12.4
2324
notifications:
2425
email: false
2526
# webhooks:

build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ enablePlugins(ScalaJSPlugin)
22

33
name := "Scala miniKanren root project"
44
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.2")
5-
scalaVersion in ThisBuild := "2.12.2" // or any other Scala version >= 2.10.2 for Scala.js
5+
scalaVersion in ThisBuild := "2.12.4" // or any other Scala version >= 2.10.2 for Scala.js
66

77
// This is an application with a main method
88
scalaJSUseMainModuleInitializer := true
@@ -48,10 +48,10 @@ lazy val miniKanren = crossProject.in(file(".")).
4848
libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.13.4" % "test",
4949
libraryDependencies += "org.scala-js" %% "scalajs-stubs" % scalaJSVersion % "provided"
5050
).jvmSettings(
51-
coverageEnabled := true/*,
51+
coverageEnabled := true,
5252
fork in Test := true,
5353
javaOptions in Test += "-Xss11m",
54-
javaOptions in Test += "-Xmx3g"*/,
54+
javaOptions in Test += "-Xmx3g",
5555
scalacOptions += "-Xfatal-warnings"
5656
).jsSettings(
5757
coverageEnabled := false

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.15
1+
sbt.version=0.13.16

project/plugins.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ resolvers += Resolver.url(
1313
url("https://dl.bintray.com/content/tpolecat/sbt-plugins"))(
1414
Resolver.ivyStylePatterns)
1515

16-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.17")
16+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.21")
1717

18-
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.5.2")
18+
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.5.6")
1919

20-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
20+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
2121

2222
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")
2323

0 commit comments

Comments
 (0)