Merge pull request #152 from scala-exercises/enrique-2-12-10-update

Exercises Update and Removed Deprecation Warnings

Author: kiroco12

build.sbt

@@ -10,10 +10,10 @@ lazy val stdlib = (project in file("."))
     libraryDependencies ++= Seq(
       dep("exercise-compiler"),
       dep("definitions"),
-      %%("shapeless"),
-      %%("scalatest"),
-      %%("scalacheck"),
-      %%("scheckShapeless")
+      %%("shapeless", V.shapeless),
+      %%("scalatest", V.scalatest),
+      %%("scalacheck", V.scalacheck),
+      "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless
     )
   )
 

project/ProjectPlugin.scala

@@ -16,7 +16,11 @@ object ProjectPlugin extends AutoPlugin {
   object autoImport {
 
     lazy val V = new {
-      val scala212: String = "2.12.10"
+      val scala212: String            = "2.12.10"
+      val shapeless: String           = "2.3.3"
+      val scalatest: String           = "3.0.8"
+      val scalacheck: String          = "1.14.2"
+      val scalacheckShapeless: String = "1.2.3"
     }
   }
 
@@ -44,7 +48,7 @@ object ProjectPlugin extends AutoPlugin {
       ),
       scalacOptions := sbtorgpolicies.model.scalacCommonOptions,
       headerLicense := Some(Custom(s"""| scala-exercises - ${name.value}
-                                       | Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
+                                       | Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
                                        |
                                        |""".stripMargin))
     )

src/main/scala/stdlib/Asserts.scala

@@ -1,6 +1,6 @@
 /*
  *  scala-exercises - exercises-stdlib
- *  Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
+ *  Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
  *
  */
 

src/main/scala/stdlib/ByNameParameter.scala

@@ -1,6 +1,6 @@
 /*
  *  scala-exercises - exercises-stdlib
- *  Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
+ *  Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
  *
  */
 

src/main/scala/stdlib/CaseClasses.scala

@@ -1,6 +1,6 @@
 /*
  *  scala-exercises - exercises-stdlib
- *  Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
+ *  Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
  *
  */
 

src/main/scala/stdlib/Classes.scala

@@ -1,6 +1,6 @@
 /*
  *  scala-exercises - exercises-stdlib
- *  Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
+ *  Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
  *
  */
 

src/main/scala/stdlib/EmptyValues.scala

@@ -1,6 +1,6 @@
 /*
  *  scala-exercises - exercises-stdlib
- *  Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
+ *  Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
  *
  */
 

src/main/scala/stdlib/Enumerations.scala

@@ -1,6 +1,6 @@
 /*
  *  scala-exercises - exercises-stdlib
- *  Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
+ *  Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
  *
  */
 

src/main/scala/stdlib/Extractors.scala

@@ -1,6 +1,6 @@
 /*
  *  scala-exercises - exercises-stdlib
- *  Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
+ *  Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
  *
  */
 
@@ -71,7 +71,7 @@ object Extractors extends FlatSpec with Matchers with org.scalaexercises.definit
     class Car(val make: String, val model: String, val year: Short, val topSpeed: Short)
 
     object ChopShop {
-      def unapply(x: Car) = Some(x.make, x.model, x.year, x.topSpeed)
+      def unapply(x: Car) = Some((x.make, x.model, x.year, x.topSpeed))
     }
 
     val ChopShop(a, b, c, d) = new Car("Chevy", "Camaro", 1978, 120)
@@ -88,7 +88,7 @@ object Extractors extends FlatSpec with Matchers with org.scalaexercises.definit
     class Car(val make: String, val model: String, val year: Short, val topSpeed: Short)
 
     object ChopShop {
-      def unapply(x: Car) = Some(x.make, x.model, x.year, x.topSpeed)
+      def unapply(x: Car) = Some((x.make, x.model, x.year, x.topSpeed))
     }
 
     val x = new Car("Chevy", "Camaro", 1978, 120) match {
@@ -106,7 +106,7 @@ object Extractors extends FlatSpec with Matchers with org.scalaexercises.definit
     class Car(val make: String, val model: String, val year: Short, val topSpeed: Short)
 
     object ChopShop {
-      def unapply(x: Car) = Some(x.make, x.model, x.year, x.topSpeed)
+      def unapply(x: Car) = Some((x.make, x.model, x.year, x.topSpeed))
     }
 
     val x = new Car("Chevy", "Camaro", 1978, 120) match {
@@ -125,9 +125,9 @@ object Extractors extends FlatSpec with Matchers with org.scalaexercises.definit
     class Employee(val firstName: String, val middleName: Option[String], val lastName: String)
 
     object Tokenizer {
-      def unapply(x: Car) = Some(x.make, x.model, x.year, x.topSpeed)
+      def unapply(x: Car) = Some((x.make, x.model, x.year, x.topSpeed))
 
-      def unapply(x: Employee) = Some(x.firstName, x.lastName)
+      def unapply(x: Employee) = Some((x.firstName, x.lastName))
     }
 
     val result = new Employee("Kurt", None, "Vonnegut") match {
@@ -142,7 +142,7 @@ object Extractors extends FlatSpec with Matchers with org.scalaexercises.definit
    */
   def anyObjectExtractors(res0: String) {
     class Car(val make: String, val model: String, val year: Short, val topSpeed: Short) {
-      def unapply(x: Car) = Some(x.make, x.model)
+      def unapply(x: Car) = Some((x.make, x.model))
     }
 
     val camaro = new Car("Chevy", "Camaro", 1978, 122)
@@ -168,7 +168,7 @@ object Extractors extends FlatSpec with Matchers with org.scalaexercises.definit
       //factory methods, extractors, apply
       //Extractor: Create tokens that represent your object
       def unapply(x: Employee) =
-        Some(x.lastName, x.middleName, x.firstName)
+        Some((x.lastName, x.middleName, x.firstName))
     }
 
     val singri = new Employee("Singri", None, "Keerthi")
@@ -193,7 +193,7 @@ object Extractors extends FlatSpec with Matchers with org.scalaexercises.definit
       //factory methods, extractors, apply
       //Extractor: Create tokens that represent your object
       def unapply(x: Employee) =
-        Some(x.lastName, x.middleName, x.firstName)
+        Some((x.lastName, x.middleName, x.firstName))
     }
 
     val singri = new Employee("Singri", None, "Keerthi")

src/main/scala/stdlib/ForExpressions.scala

@@ -1,6 +1,6 @@
 /*
  *  scala-exercises - exercises-stdlib
- *  Copyright (C) 2015-2016 47 Degrees, LLC. <http://www.47deg.com>
+ *  Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
  *
  */