Merge pull request #55 from scala-exercises/enrique-2-13-1-update

Update to Scala 2.13.1

Author: kiroco12

.scalafmt.conf

@@ -1,3 +1,4 @@
+version=2.3.2
 style = defaultWithAlign
 maxColumn = 100
 

.travis.yml

@@ -1,6 +1,6 @@
 language: scala
 scala:
-- 2.11.11
+- 2.13.1
 jdk:
 - openjdk8
 script:

build.sbt

@@ -1,6 +1,6 @@
 import ProjectPlugin.autoImport._
 
-val scalaExercisesV = "0.5.0-SNAPSHOT"
+val scalaExercisesV = "0.6.0-SNAPSHOT"
 
 def dep(artifactId: String) = "org.scala-exercises" %% artifactId % scalaExercisesV
 

project/ProjectPlugin.scala

@@ -15,11 +15,11 @@ object ProjectPlugin extends AutoPlugin {
   object autoImport {
 
     lazy val V = new {
-      val scala212: String            = "2.12.10"
+      val scala213: String            = "2.13.1"
       val shapeless: String           = "2.3.3"
       val scalatest: String           = "3.1.0"
       val scalatestplusScheck: String = "3.1.0.0-RC2"
-      val scalacheck: String          = "1.14.2"
+      val scalacheck: String          = "1.14.3"
       val scalacheckShapeless: String = "1.2.3"
     }
   }
@@ -39,7 +39,7 @@ object ProjectPlugin extends AutoPlugin {
         organizationEmail = "hello@47deg.com"
       ),
       orgLicenseSetting := ApacheLicense,
-      scalaVersion := V.scala212,
+      scalaVersion := V.scala213,
       scalaOrganization := "org.scala-lang",
       resolvers ++= Seq(
         Resolver.mavenLocal,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.7

project/plugins.sbt

@@ -2,5 +2,5 @@ resolvers ++= Seq(
   Resolver.sonatypeRepo("snapshots")
 )
 
-addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.5.0-SNAPSHOT")
+addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.6.0-SNAPSHOT")
 addSbtPlugin("com.47deg"         % "sbt-org-policies" % "0.12.0-M3")

src/main/scala/shapeless/ArityExercises.scala

@@ -13,8 +13,9 @@ import ops.function._
 import syntax.std.function._
 
 object Helper {
-  def applyProduct[P <: Product, F, L <: HList, R](p: P)(
-      f: F)(implicit gen: Generic.Aux[P, L], fp: FnToProduct.Aux[F, L ⇒ R]) =
+  def applyProduct[P <: Product, F, L <: HList, R](
+      p: P
+  )(f: F)(implicit gen: Generic.Aux[P, L], fp: FnToProduct.Aux[F, L => R]) =
     f.toProduct(gen.to(p))
 }
 

src/main/scala/shapeless/AutoTypeClassExercises.scala

@@ -50,7 +50,7 @@ object Monoid extends ProductTypeClassCompanion[Monoid] {
       def append(a: F :: T, b: F :: T) = mh.append(a.head, b.head) :: mt.append(a.tail, b.tail)
     }
 
-    def project[F, G](instance: ⇒ Monoid[G], to: F ⇒ G, from: G ⇒ F) = new Monoid[F] {
+    def project[F, G](instance: => Monoid[G], to: F => G, from: G => F) = new Monoid[F] {
       def zero               = from(instance.zero)
       def append(a: F, b: F) = from(instance.append(to(a), to(b)))
     }

src/main/scala/shapeless/CoproductExercises.scala

@@ -27,9 +27,9 @@ object CoproductExercises
     type ISB = Int :+: String :+: Boolean :+: CNil
 
     object sizeM extends Poly1 {
-      implicit def caseInt     = at[Int](i ⇒ (i, i))
-      implicit def caseString  = at[String](s ⇒ (s, s.length))
-      implicit def caseBoolean = at[Boolean](b ⇒ (b, 1))
+      implicit def caseInt     = at[Int](i => (i, i))
+      implicit def caseString  = at[String](s => (s, s.length))
+      implicit def caseBoolean = at[Boolean](b => (b, 1))
     }
 
     val isb = Coproduct[ISB]("foo")
@@ -72,11 +72,11 @@ object CoproductExercises
 
     type U = Union.`'i -> Int, 's -> String, 'b -> Boolean`.T
 
-    val u = Coproduct[U]('s ->> "foo") // Inject a String into the union at label 's
+    val u = Coproduct[U](Symbol("s") ->> "foo") // Inject a String into the union at label 's
 
-    u.get('i) should be(res0)
-    u.get('s) should be(res1)
-    u.get('b) should be(res2)
+    u.get(Symbol("i")) should be(res0)
+    u.get(Symbol("s")) should be(res1)
+    u.get(Symbol("b")) should be(res2)
   }
 
 }

src/main/scala/shapeless/GenericExercises.scala

@@ -27,7 +27,7 @@ object GenericHelper {
   // Polymorphic function which adds 1 to any Int and is the identity
   // on all other values
   // format: OFF
-  object inc extends -> ((i: Int) ⇒ i + 1)
+  object inc extends -> ((i: Int) => i + 1)
   // format: ON
   case class Book(author: String, title: String, id: Int, price: Double)
   case class ExtendedBook(author: String, title: String, id: Int, price: Double, inPrint: Boolean)
@@ -124,21 +124,19 @@ object GenericExercises
     val tapl    = Book("Benjamin Pierce", "Types and Programming Languages", 262162091, 44.11)
     val rec     = bookGen.to(tapl)
 
-    rec('price) should be(res0)
+    rec(Symbol("price")) should be(res0)
 
-    val updatedBook = bookGen.from(rec.updateWith('price)(_ + 2.0))
+    val updatedBook = bookGen.from(rec.updateWith(Symbol("price"))(_ + 2.0))
 
     updatedBook.price should be(res1)
 
-    /** {{{
-     * case class ExtendedBook(author: String, title: String, id: Int, price: Double, inPrint: Boolean)
-     * }}}
-     */
+    // case class ExtendedBook(author: String, title: String, id: Int, price: Double, inPrint: Boolean)
+
     import syntax.singleton._
 
     val bookExtGen = LabelledGeneric[ExtendedBook]
 
-    val extendedBook = bookExtGen.from(rec + ('inPrint ->> true))
+    val extendedBook = bookExtGen.from(rec + (Symbol("inPrint") ->> true))
 
     extendedBook.inPrint should be(res2)
   }