Skip to content

Commit

Permalink
Merge pull request folone#58 from rhyskeepence/master
Browse files Browse the repository at this point in the history
Build against 2.12
  • Loading branch information
folone authored Dec 15, 2016
2 parents c3c7447 + 50fb84e commit 06d7f57
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
language: scala
jdk:
- oraclejdk8
install: /bin/true
script: sbt ";clean;+compile;+test"
10 changes: 5 additions & 5 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ object Build extends Build {

lazy val buildSettings = Seq(
organization := "info.folone",
scalaVersion := "2.11.8",
crossScalaVersions := Seq(scalaVersion.value, "2.10.6"),
scalaVersion := "2.12.1",
crossScalaVersions := Seq(scalaVersion.value, "2.11.8", "2.10.6"),

scalacOptions := Seq(
"-encoding", "UTF-8",
Expand Down Expand Up @@ -37,9 +37,9 @@ object Build extends Build {
}
}

val scalazVersion = "7.2.1"
val scalazVersion = "7.2.8"
val poiVersion = "3.14"
val specsVersion = "3.7.2"
val specsVersion = "3.8.6"

lazy val standardSettings = super.settings ++
Defaults.defaultSettings ++
Expand All @@ -57,7 +57,7 @@ object Build extends Build {
"org.scalaz" %% "scalaz-effect" % scalazVersion,
"org.specs2" %% "specs2-core" % specsVersion % "test",
"org.specs2" %% "specs2-scalacheck" % specsVersion % "test",
"org.scalacheck" %% "scalacheck" % "1.13.0" % "test",
"org.scalacheck" %% "scalacheck" % "1.13.4" % "test",
"org.scalaz" %% "scalaz-scalacheck-binding" % scalazVersion % "test"
)
},
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.11
sbt.version=0.13.13

0 comments on commit 06d7f57

Please sign in to comment.