Skip to content

Commit

Permalink
Updated versions and added Coveralls config
Browse files Browse the repository at this point in the history
  • Loading branch information
travisbrown committed Dec 19, 2014
1 parent 77af7f7 commit 277883f
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
sudo: false

language: scala

scala:
Expand All @@ -6,4 +8,10 @@ scala:

jdk:
- oraclejdk7
- oraclejdk8
- openjdk7

script: "sbt -sbt-version 0.13.7 clean coverage test"

after_success: "sbt -sbt-version 0.13.7 coveralls"

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.6
sbt.version=0.13.7
7 changes: 4 additions & 3 deletions project/build.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.github.tkawachi.doctest.DoctestPlugin._
import sbt._, Keys._
import sbtunidoc.Plugin.unidocSettings
import scoverage.ScoverageSbtPlugin.instrumentSettings
import org.scoverage.coveralls.CoverallsPlugin

object SyzygistBuild extends Build {
lazy val syzygist = Project(
Expand Down Expand Up @@ -35,7 +35,7 @@ object SyzygistBuild extends Build {
)
)

def commonSettings = doctestSettings ++ instrumentSettings ++ Seq(
def commonSettings = doctestSettings ++ Seq(
organization := "org.syzygist",
scalaVersion := "2.11.4",
crossScalaVersions := Seq("2.10.4", "2.11.4"),
Expand All @@ -47,11 +47,12 @@ object SyzygistBuild extends Build {
),
resolvers +=
"Scalaz Bintray Repo" at "http://dl.bintray.com/scalaz/releases",
doctestWithDependencies := false,
libraryDependencies ++= Seq(
"org.scalaz" %% "scalaz-concurrent" % "7.1.0",
"org.scalaz" %% "scalaz-core" % "7.1.0",
"org.scalaz.stream" %% "scalaz-stream" % "0.6a",
"org.scalacheck" %% "scalacheck" % "1.11.6" % "test"
"org.scalacheck" %% "scalacheck" % "1.12.1" % "test"
)
)
}
6 changes: 4 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
resolvers += Classpaths.sbtPluginReleases

addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.3.2")
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.3.4")

addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "0.99.11")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.1")

addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0.BETA1")

0 comments on commit 277883f

Please sign in to comment.