Merge branch 'master' into update/scalacheck-shapeless_1.14-1.2.4

Author: scala-steward

README.md

@@ -1,12 +1,12 @@
 # Scala Exercises - "Functional Programming in Scala" library
 ------------------------
 
-This repository hosts a content library for the [Scala Exercises](https://www.scala-exercises.org/) platform, that includes interactive exercises related to the "Functional Programming in Scala" book by written by Paul Chiusano and Rúnar Bjarnason and published by Manning.
-This content library is meant to be used in tandem with the book, although excerpts of the theory needed to complete them have been added to guide you. For more information about "Functional Programming in Scala" please visit its [official website](https://www.manning.com/books/functional-programming-in-scala).
+This repository hosts a content library for the [Scala Exercises](https://www.scala-exercises.org/) platform that includes interactive exercises related to the "Functional Programming in Scala" book written by Paul Chiusano and Rúnar Bjarnason, and published by Manning.
+This content library is meant to be used in tandem with the book, although excerpts of the theory needed to complete them have been added to guide you. For more information about "Functional Programming in Scala," please visit its [official website](https://www.manning.com/books/functional-programming-in-scala).
 
-## About Scala exercises
+## About Scala Exercises
 
-"Scala Exercises" brings exercises for the Stdlib, Cats, Shapeless and many other great libraries for Scala to your browser. Offering hundreds of solvable exercises organized into several categories covering the basics of the Scala language and its most important libraries.
+"Scala Exercises" brings exercises for the Stdlib, Cats, Shapeless, and many other great libraries for Scala to your browser. It offers hundreds of solvable exercises organized into several categories covering the basics of the Scala language and its most important libraries.
 
 Scala Exercises is available at [scala-exercises.org](https://scala-exercises.org).
 
@@ -18,7 +18,7 @@ to get involved, or visit our [GitHub site](https://github.com/scala-exercises).
 ## License
 
 Copyright (C) 2012 Manning Publications, Co.
-Copyright (C) 2015-2016 47 Degrees, LLC.
+Copyright (C) 2015-2019 47 Degrees, LLC.
 Reactive, scalable software solutions.
 http://47deg.com
 hello@47deg.com
@@ -35,10 +35,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-
-Copyright (c) 2012, Manning Publications, Co.
-Copyright (c) 2015-16, 47 Degrees, LLC
-
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
 rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
@@ -50,4 +46,4 @@ Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
 WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

project/ProjectPlugin.scala

@@ -19,8 +19,8 @@ object ProjectPlugin extends AutoPlugin {
       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 scalacheckShapeless: String = "1.2.4"
+      val scalacheck: String          = "1.14.3"
+      val scalacheckShapeless: String = "1.2.3"
     }
   }
 

project/build.properties

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

src/main/scala/fpinscalalib/FunctionalParallelismSection.scala

@@ -72,7 +72,7 @@ object FunctionalParallelismSection
   /**
    * <b>Exercise 7.5:</b>
    *
-   * Remember, `asyncF` converts an `A => B` to an `A => Par[B`] by forking a parallel computation to produce the
+   * Remember, `asyncF` converts an `A => B` to an `A => Par[B]` by forking a parallel computation to produce the
    * result. So we can fork off our N parallel computations pretty easily, but we need some way of collecting their
    * results. Are we stuck? Well, just from inspecting the types, we can see that we need some way of converting our
    * `List[Par[B]]` to the `Par[List[B]]` required by the return type of `parMap`.