Permalink
Browse files

Fixes build for 2.9.1, disable Travis for 2.8.2

  • Loading branch information...
1 parent c0817de commit 2d422ca590061fdbc909198c5b51acc8526734a3 @johnynek johnynek committed Feb 22, 2012
View
1 .travis.yml
@@ -1,5 +1,4 @@
language: scala
scala:
- 2.8.1
- - 2.8.2
- 2.9.1
View
6 src/main/scala/com/twitter/scalding/Source.scala
@@ -43,7 +43,7 @@ import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.RecordReader;
import collection.mutable.{Buffer, MutableList}
-import collection.JavaConversions.asJavaList
+import scala.collection.JavaConverters._
/**
* thrown when validateTaps fails
@@ -152,7 +152,7 @@ abstract class Source extends java.io.Serializable {
protected def createHadoopTestReadTap(buffer : Iterable[Tuple]) :
Tap[HadoopFlowProcess, JobConf, RecordReader[_,_], OutputCollector[_,_]] = {
- new MemorySourceTap(buffer.toList, hdfsScheme.getSourceFields())
+ new MemorySourceTap(buffer.toList.asJava, hdfsScheme.getSourceFields())
}
protected def hadoopTestPath = "/tmp/scalding/" + hdfsWritePath
@@ -214,7 +214,7 @@ abstract class Source extends java.io.Serializable {
// If there are no matching paths, this is still an error, we need at least something:
hdfsPaths.filter{ pathIsGood(_, hdfsMode.config) }
}
- val taps = goodPaths.map(new Hfs(hdfsScheme, _, SinkMode.KEEP))
+ val taps = goodPaths.map { new Hfs(hdfsScheme, _, SinkMode.KEEP) }
taps.size match {
case 0 => {
// This case is going to result in an error, but we don't want to throw until
View
1 src/test/scala/com/twitter/scalding/CoreTest.scala
@@ -453,6 +453,7 @@ class TakeJob(args : Args) extends Job(args) {
}
class TakeTest extends Specification with TupleConversions {
+ noDetailedDiffs()
"A TakeJob" should {
JobTest("com.twitter.scalding.TakeJob")
.source(Tsv("in"), List((3,0,1),(3,1,10),(3,5,100)) )
View
1 src/test/scala/com/twitter/scalding/DateTest.scala
@@ -5,6 +5,7 @@ import DateOps._
import java.util.Calendar
class DateTest extends Specification {
+ noDetailedDiffs()
implicit val tz = DateOps.PACIFIC
"A RichDate" should {

0 comments on commit 2d422ca

Please sign in to comment.