Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #83 from xuwei-k/checkScalariform
add checkScalariform task
  • Loading branch information
tototoshi committed Jun 23, 2016
2 parents 821a840 + b63d1bb commit 1652c46
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -5,3 +5,6 @@ scala:
jdk:
- oraclejdk7
- oraclejdk8
script:
- sbt ++${TRAVIS_SCALA_VERSION} test:compile checkScalariform
- sbt ++${TRAVIS_SCALA_VERSION} test
6 changes: 6 additions & 0 deletions project/Build.scala
Expand Up @@ -11,6 +11,12 @@ object ScalaCSVProject extends Build {
version := "1.3.2",
scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.11.8", "2.10.6"),
TaskKey[Unit]("checkScalariform") := {
val diff = "git diff".!!
if(diff.nonEmpty){
sys.error("Working directory is dirty!\n" + diff)
}
},
organization := "com.github.tototoshi",
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "2.2.4" % "test",
Expand Down
1 change: 0 additions & 1 deletion src/test/scala/com/github/tototoshi/csv/CsvBenchmark.scala
Expand Up @@ -3,7 +3,6 @@ package com.github.tototoshi.csv
import org.scalameter.api._
import org.scalameter.picklers.Pickler


object CsvBenchmark extends Bench.LocalTime {

val row = Seq("a", "1", "\"hey\"", "world")
Expand Down
Expand Up @@ -3,8 +3,8 @@ package com.github.tototoshi.csv
import java.io.OutputStream

/**
* An [[OutputStream]] that writes to nowhere
*/
* An [[OutputStream]] that writes to nowhere
*/
case object NullOutputStream extends OutputStream {
override def write(b: Int): Unit = {

Expand Down

0 comments on commit 1652c46

Please sign in to comment.