Merge pull request #69 from coursera/zzj-2.12

Upgrade courier to support 2.12

project/Build.scala

@@ -46,7 +46,7 @@ object Courier extends Build with OverridablePublishSettings {
   // In order to keep it under control we primarily concern ourselves with these two below Scala
   // version numbers:
 
-  lazy val sbtScalaVersion = "2.10.5" // the version of Scala used by the current sbt version.
+  lazy val sbtScalaVersion = "2.10.6" // the version of Scala used by the current sbt version.
   lazy val currentScalaVersion = "2.11.11" // The current scala version.
 
   // Our plugin runs as part of SBT so must use the same Scala version that SBT currently uses.
@@ -57,7 +57,7 @@ object Courier extends Build with OverridablePublishSettings {
   // We cross build our runtime to both versions.
   lazy val runtimeVersionSettings = Seq(
     scalaVersion in ThisBuild := currentScalaVersion,
-    crossScalaVersions in ThisBuild := Seq(sbtScalaVersion, currentScalaVersion))
+    crossScalaVersions in ThisBuild := Seq(sbtScalaVersion, currentScalaVersion, "2.12.4"))
 
   // Strictly speaking, our generator only needs to be built for the SBT plugin Scala version.
   // But we also cross built it to the current Scala version so that our generator-test
@@ -318,7 +318,7 @@ object Courier extends Build with OverridablePublishSettings {
     }
 
     object Scalatest {
-      val version = "2.2.3"
+      val version = "3.0.4"
       val scalatest = "org.scalatest" %% "scalatest" % version % "test"
     }
 
@@ -331,7 +331,7 @@ object Courier extends Build with OverridablePublishSettings {
     }
 
     object Scalariform {
-      val version = "0.1.6"
+      val version = "0.2.6"
       val scalariform = "org.scalariform" %% "scalariform" % version
     }
 

scala/generator/src/main/twirl/org/coursera/courier/templates/RecordClass.scala.txt

@@ -142,7 +142,12 @@
 
   override def hashCode: Int = ScalaRunTime._hashCode(this)
 
-  override def equals(that: Any): Boolean = canEqual(that) && ScalaRunTime._equals(this, that)
+  override def equals(that: Any): Boolean = canEqual(that) && (that match {
+    case that: Product if this.productArity == that.productArity =>
+      this.productIterator sameElements that.productIterator
+    case _ =>
+      false
+  })
 
   override def toString: String = ScalaRunTime._toString(this)
 

scala/generator/src/main/twirl/org/coursera/courier/templates/UnionClass.scala.txt

@@ -37,7 +37,12 @@
   // reset UnionTemplate overrides
   override def canEqual(that: Any): Boolean = that.isInstanceOf[this.type]
 
-  override def equals(that: Any): Boolean = ScalaRunTime._equals(this, that)
+  override def equals(that: Any): Boolean = (that match {
+    case that: Product if this.productArity == that.productArity =>
+      this.productIterator sameElements that.productIterator
+    case _ =>
+      false
+  })
 
   override def toString: String = ScalaRunTime._toString(this)
 

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "2.1.1"
+version in ThisBuild := "2.1.3"