Ianoc/scalding 210 #1116
Ianoc/scalding 210 #1116
Conversation
|
This includes #1059 ? |
| @@ -348,7 +350,7 @@ object ScaldingBuild extends Build { | |||
| lazy val scaldingJson = module("json").settings( | |||
| libraryDependencies <++= (scalaVersion) { scalaVersion => Seq( | |||
| "org.apache.hadoop" % "hadoop-core" % hadoopVersion % "provided", | |||
| "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.2.3" | |||
| "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.4.2" | |||
There was a problem hiding this comment.
pull this up to our section on versions?
There was a problem hiding this comment.
should we do that for all versions? there is still a sprinkling of them around. I think most that are common are moved out but we haven't moved once off's before
There was a problem hiding this comment.
I guess we should for all the versions so it easy to see for a reader what things depend on.
What do you think?
There was a problem hiding this comment.
I like it, but unless you object a follow up PR? just to get this in and make that one seem clearer
|
Includes Jco's work, but disables the 2.11 repl targets/tests since there are issues there |
| "org.scalacheck" %% "scalacheck" % "1.11.5" % "test", | ||
| "org.scala-tools.testing" %% "specs" % "1.6.9" % "test", | ||
| "org.mockito" % "mockito-all" % "1.8.5" % "test" | ||
| "org.mockito" % "mockito-all" % "1.8.5" % "test", |
There was a problem hiding this comment.
didn't even know we were using this.
There was a problem hiding this comment.
Yeah, not sure why/how it got in there really. Just started appearing in all my diffs
Conflicts: .travis.yml
| @@ -296,6 +296,9 @@ trait TypedPipe[+T] extends Serializable { | |||
| def filter(f: T => Boolean): TypedPipe[T] = | |||
| flatMap { t => if (f(t)) Iterator(t) else Iterator.empty } | |||
|
|
|||
| // This is just to appease for comprehension | |||
| def withFilter(f: T => Boolean): TypedPipe[T] = filter(f) | |||
There was a problem hiding this comment.
lets check if typed pipe actually works in a for comprehension
|
This is big enough in my view. shipit. We can follow on with the issues Ian added. Alex if you think it is fine, I'll let you merge. |
Add cross compile support for scala 2.11
|
happy tears |
Brings @jcoveney and my old stuff up to date