From 11a90efc4e557df56cb14a9db06bbe45af07bf21 Mon Sep 17 00:00:00 2001
From: Colin Marc <colinmarc@gmail.com>
Date: Fri, 13 Feb 2015 22:32:40 +0100
Subject: [PATCH] Make brushfire buildable in both 2.10 and 2.11

---
 brushfire-core/pom.xml                        |  9 ++++-----
 .../scala/com/stripe/brushfire/Errors.scala   |  2 +-
 .../com/stripe/brushfire/Evaluators.scala     |  2 +-
 .../com/stripe/brushfire/Splitters.scala      |  2 +-
 .../scala/com/stripe/brushfire/Voters.scala   |  4 ++--
 brushfire-finatra/pom.xml                     |  6 +++---
 brushfire-parent/pom.xml                      | 20 ++++++++++---------
 brushfire-scalding/pom.xml                    | 14 ++++++-------
 8 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/brushfire-core/pom.xml b/brushfire-core/pom.xml
index 1c3dc5a..35e04a0 100644
--- a/brushfire-core/pom.xml
+++ b/brushfire-core/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.stripe</groupId>
-  <artifactId>brushfire-core</artifactId>
+  <artifactId>brushfire-core_${scala.binary.version}</artifactId>
   <packaging>jar</packaging>
 
   <parent>
@@ -19,15 +19,15 @@
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
-      <artifactId>algebird-core_2.10</artifactId>
+      <artifactId>algebird-core_${scala.binary.version}</artifactId>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
-      <artifactId>chill-bijection_2.10</artifactId>
+      <artifactId>chill-bijection_${scala.binary.version}</artifactId>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
-      <artifactId>bijection-json_2.10</artifactId>
+      <artifactId>bijection-json_${scala.binary.version}</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
@@ -42,5 +42,4 @@
       <artifactId>jackson-jaxrs</artifactId>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/brushfire-core/src/main/scala/com/stripe/brushfire/Errors.scala b/brushfire-core/src/main/scala/com/stripe/brushfire/Errors.scala
index e13d118..88a417c 100644
--- a/brushfire-core/src/main/scala/com/stripe/brushfire/Errors.scala
+++ b/brushfire-core/src/main/scala/com/stripe/brushfire/Errors.scala
@@ -36,7 +36,7 @@ case class BrierScoreError[L, M](implicit num: Numeric[M])
   }
 }
 
-case class BinnedBinaryError[M: Monoid]
+case class BinnedBinaryError[M: Monoid]()
     extends FrequencyError[Boolean, M, Map[Int, (M, M)]] {
   lazy val monoid = implicitly[Monoid[Map[Int, (M, M)]]]
 
diff --git a/brushfire-core/src/main/scala/com/stripe/brushfire/Evaluators.scala b/brushfire-core/src/main/scala/com/stripe/brushfire/Evaluators.scala
index 5277192..3b7c4ca 100644
--- a/brushfire-core/src/main/scala/com/stripe/brushfire/Evaluators.scala
+++ b/brushfire-core/src/main/scala/com/stripe/brushfire/Evaluators.scala
@@ -41,7 +41,7 @@ case class MinWeightEvaluator[V, L, W: Monoid](minWeight: W => Boolean, wrapped:
   }
 }
 
-case class EmptySplit[V, P] extends Split[V, P] {
+case class EmptySplit[V, P]() extends Split[V, P] {
   val predicates = Nil
 }
 
diff --git a/brushfire-core/src/main/scala/com/stripe/brushfire/Splitters.scala b/brushfire-core/src/main/scala/com/stripe/brushfire/Splitters.scala
index 670c45e..0dcdc4e 100644
--- a/brushfire-core/src/main/scala/com/stripe/brushfire/Splitters.scala
+++ b/brushfire-core/src/main/scala/com/stripe/brushfire/Splitters.scala
@@ -65,7 +65,7 @@ case class QTreeSplitter[T: Monoid](k: Int)
   }
 }
 
-case class SparseBooleanSplitter[T: Group]
+case class SparseBooleanSplitter[T: Group]()
     extends Splitter[Boolean, T] {
 
   type S = T
diff --git a/brushfire-core/src/main/scala/com/stripe/brushfire/Voters.scala b/brushfire-core/src/main/scala/com/stripe/brushfire/Voters.scala
index 27796a3..923dfcd 100644
--- a/brushfire-core/src/main/scala/com/stripe/brushfire/Voters.scala
+++ b/brushfire-core/src/main/scala/com/stripe/brushfire/Voters.scala
@@ -10,7 +10,7 @@ trait FrequencyVoter[L, M] extends Voter[Map[L, M], Map[L, Double]] {
   }
 }
 
-case class SoftVoter[L, M: Numeric] extends FrequencyVoter[L, M] {
+case class SoftVoter[L, M: Numeric]() extends FrequencyVoter[L, M] {
   def combine(targets: Iterable[Map[L, M]]) =
     if (targets.isEmpty)
       Map.empty[L, Double]
@@ -18,7 +18,7 @@ case class SoftVoter[L, M: Numeric] extends FrequencyVoter[L, M] {
       Monoid.sum(targets.map { m => normalize(m) }).mapValues { _ / targets.size }
 }
 
-case class ModeVoter[L, M: Ordering] extends FrequencyVoter[L, M] {
+case class ModeVoter[L, M: Ordering]() extends FrequencyVoter[L, M] {
   def mode(m: Map[L, M]): L = m.maxBy { _._2 }._1
 
   def combine(targets: Iterable[Map[L, M]]) =
diff --git a/brushfire-finatra/pom.xml b/brushfire-finatra/pom.xml
index 4e0fbf1..2b77767 100644
--- a/brushfire-finatra/pom.xml
+++ b/brushfire-finatra/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.stripe</groupId>
-  <artifactId>brushfire-finatra</artifactId>
+  <artifactId>brushfire-finatra_${scala.binary.version}</artifactId>
   <packaging>jar</packaging>
 
   <parent>
@@ -19,11 +19,11 @@
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
-      <artifactId>finatra_2.10</artifactId>
+      <artifactId>finatra_${scala.binary.version}</artifactId>
     </dependency>
     <dependency>
       <groupId>com.stripe</groupId>
-      <artifactId>brushfire-core</artifactId>
+      <artifactId>brushfire-core_${scala.binary.version}</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
diff --git a/brushfire-parent/pom.xml b/brushfire-parent/pom.xml
index 5055f8c..3f42f87 100644
--- a/brushfire-parent/pom.xml
+++ b/brushfire-parent/pom.xml
@@ -11,6 +11,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <scala.version>2.11.4</scala.version>
+    <scala.binary.version>2.11</scala.binary.version>
   </properties>
 
   <dependencyManagement>
@@ -18,16 +20,16 @@
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-library</artifactId>
-        <version>2.10.4</version>
+        <version>${scala.version}</version>
       </dependency>
       <dependency>
         <groupId>com.twitter</groupId>
-        <artifactId>scalding-core_2.10</artifactId>
-        <version>0.12.0</version>
+        <artifactId>scalding-core_${scala.binary.version}</artifactId>
+        <version>0.13.1</version>
       </dependency>
       <dependency>
         <groupId>com.twitter</groupId>
-        <artifactId>algebird-core_2.10</artifactId>
+        <artifactId>algebird-core_${scala.binary.version}</artifactId>
         <version>0.9.0</version>
       </dependency>
       <dependency>
@@ -37,12 +39,12 @@
       </dependency>
       <dependency>
         <groupId>com.twitter</groupId>
-        <artifactId>chill-bijection_2.10</artifactId>
-        <version>0.4.0</version>
+        <artifactId>chill-bijection_${scala.binary.version}</artifactId>
+        <version>0.5.2</version>
       </dependency>
       <dependency>
         <groupId>com.twitter</groupId>
-        <artifactId>bijection-json_2.10</artifactId>
+        <artifactId>bijection-json_${scala.binary.version}</artifactId>
         <version>0.7.0</version>
       </dependency>
       <dependency>
@@ -62,7 +64,7 @@
       </dependency>
       <dependency>
         <groupId>com.twitter</groupId>
-        <artifactId>finatra_2.10</artifactId>
+        <artifactId>finatra_${scala.binary.version}</artifactId>
         <version>1.6.0</version>
       </dependency>
     </dependencies>
@@ -144,7 +146,7 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>3.1.5</version>
+        <version>3.2.0</version>
         <configuration>
           <recompileMode>incremental</recompileMode>
           <useZincServer>true</useZincServer>
diff --git a/brushfire-scalding/pom.xml b/brushfire-scalding/pom.xml
index a5ff452..e1be130 100644
--- a/brushfire-scalding/pom.xml
+++ b/brushfire-scalding/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.stripe</groupId>
-  <artifactId>brushfire-scalding</artifactId>
+  <artifactId>brushfire-scalding_${scala.binary.version}</artifactId>
   <packaging>jar</packaging>
 
   <parent>
@@ -19,15 +19,15 @@
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
-      <artifactId>scalding-core_2.10</artifactId>
+      <artifactId>scalding-core_${scala.binary.version}</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client</artifactId>
     </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop</groupId>
-        <artifactId>hadoop-client</artifactId>
-      </dependency>
     <dependency>
       <groupId>com.stripe</groupId>
-      <artifactId>brushfire-core</artifactId>
+      <artifactId>brushfire-core_${scala.binary.version}</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>