Merge pull request #102 from SethTisue/scala-2.13.2

bump Scala version to 2.13.2 & enable -Werror

Author: SethTisue

.travis.yml

@@ -5,7 +5,7 @@ import: scala/scala-dev:travis/default.yml
 language: scala
 
 scala:
-  - 2.13.0
+  - 2.13.2
 
 env:
   - ADOPTOPENJDK=8

build.sbt

@@ -1,45 +1,40 @@
-resolvers in ThisBuild += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"
+Global / cancelable := true
+publish / skip := true // in root
 
-scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature"/*, "-Xfatal-warnings"*/)
-
-cancelable in Global := true
-
-skip in publish := true // in root
-
-lazy val commonSettings: Seq[Setting[_]] = Seq()
-
-commonSettings  // in root
+lazy val commonSettings: Seq[Setting[_]] =
+  ScalaModulePlugin.scalaModuleSettings ++ Seq(
+    Compile / compile / scalacOptions += "-Werror"
+  )
 
 lazy val core = project.in(file("core"))
-  .settings(ScalaModulePlugin.scalaModuleSettings)
   .settings(commonSettings)
   .settings(
-  name := "scala-parallel-collections"
-)
+    name := "scala-parallel-collections"
+  )
 
 lazy val junit = project.in(file("junit"))
   .settings(commonSettings)
   .settings(
-  libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
-  // for javax.xml.bind.DatatypeConverter, used in SerializationStabilityTest
-  libraryDependencies += "javax.xml.bind" % "jaxb-api" % "2.3.1" % Test,
-  testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
-  fork in Test := true,
-  skip in publish := true
-).dependsOn(testmacros, core)
+    libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
+    // for javax.xml.bind.DatatypeConverter, used in SerializationStabilityTest
+    libraryDependencies += "javax.xml.bind" % "jaxb-api" % "2.3.1" % Test,
+    testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
+    Test / fork := true,
+    publish / skip := true
+  ).dependsOn(testmacros, core)
 
 lazy val scalacheck = project.in(file("scalacheck"))
   .settings(commonSettings)
   .settings(
-  libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.3",
-  fork in Test := true,
-  testOptions in Test += Tests.Argument(TestFrameworks.ScalaCheck, "-workers", "1", "-minSize", "0", "-maxSize", "4000", "-minSuccessfulTests", "5"),
-  skip in publish := true
-).dependsOn(core)
+    libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.14.3",
+    Test / fork := true,
+    Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-workers", "1", "-minSize", "0", "-maxSize", "4000", "-minSuccessfulTests", "5"),
+    publish / skip := true
+  ).dependsOn(core)
 
 lazy val testmacros = project.in(file("testmacros"))
   .settings(commonSettings)
   .settings(
-  libraryDependencies += scalaOrganization.value % "scala-compiler" % scalaVersion.value,
-  skip in publish := true
-)
+    libraryDependencies += scalaOrganization.value % "scala-compiler" % scalaVersion.value,
+    publish / skip := true
+  )

core/src/main/scala/scala/collection/Parallel.scala

@@ -14,8 +14,5 @@ package scala
 package collection
 
 /** A marker trait for collections which have their operations parallelised.
- *
- *  @since 2.9
- *  @author Aleksandar Prokopec
  */
 trait Parallel

core/src/main/scala/scala/collection/generic/CanCombineFrom.scala

@@ -22,7 +22,6 @@ import scala.collection.parallel._
  *                builder to be created.
  *  @tparam Elem  the element type of the collection to be created.
  *  @tparam To    the type of the collection to be created.
- *  @since 2.8
  */
 trait CanCombineFrom[-From, -Elem, +To] extends Parallel {
   def apply(from: From): Combiner[Elem, To]

core/src/main/scala/scala/collection/generic/GenericParCompanion.scala

@@ -17,7 +17,7 @@ package generic
 import scala.collection.parallel.Combiner
 import scala.collection.parallel.ParIterable
 import scala.collection.parallel.ParMap
-import scala.language.{higherKinds, implicitConversions}
+import scala.language.implicitConversions
 
 /** A template class for companion objects of parallel collection classes.
  *  They should be mixed in together with `GenericCompanion` type.
@@ -108,4 +108,4 @@ object GenericParMapCompanion {
     def newBuilder: mutable.Builder[(K, V), CC[K, V]] = parFactory.newCombiner
   }
 
-}
+}

core/src/main/scala/scala/collection/generic/GenericParTemplate.scala

@@ -19,14 +19,11 @@ import scala.collection.parallel.ParIterable
 import scala.collection.parallel.ParMap
 
 import scala.annotation.unchecked.uncheckedVariance
-import scala.language.higherKinds
 
 /** A template trait for collections having a companion.
  *
  *  @tparam A    the element type of the collection
  *  @tparam CC   the type constructor representing the collection class
- *  @author Aleksandar Prokopec
- *  @since 2.8
  */
 trait GenericParTemplate[+A, +CC[X] <: ParIterable[X]]
   extends GenericTraversableTemplate[A, CC]

core/src/main/scala/scala/collection/generic/GenericTraversableTemplate.scala

@@ -12,7 +12,6 @@
 
 package scala.collection.generic
 
-import scala.language.higherKinds
 import scala.annotation.migration
 import scala.annotation.unchecked.uncheckedVariance
 import scala.collection.mutable.Builder
@@ -23,8 +22,6 @@ import scala.collection.parallel.ParIterable
  *
  *  @tparam  A    The type of the collection elements.
  *  @tparam  CC   The type constructor representing the collection class.
- *  @author Martin Odersky
- *  @since 2.8
  *  @define coll  collection
  */
 // TODO inline in GenericParTemplate or ParIterable

core/src/main/scala/scala/collection/generic/HasNewCombiner.scala

@@ -16,9 +16,6 @@ package generic
 
 import scala.collection.parallel.Combiner
 
-/**
- *  @since 2.8
- */
 trait HasNewCombiner[+T, +Repr] {
   protected[this] def newCombiner: Combiner[T, Repr]
 }

core/src/main/scala/scala/collection/generic/ParFactory.scala

@@ -15,7 +15,6 @@ package collection
 package generic
 
 import scala.collection.parallel.ParIterable
-import scala.language.higherKinds
 
 /** A template class for companion objects of `ParIterable` and subclasses
  *  thereof. This class extends `TraversableFactory` and provides a set of
@@ -25,7 +24,6 @@ import scala.language.higherKinds
  *    This object provides a set of operations needed to create `$Coll` values.
  *  @define coll parallel collection
  *  @define Coll `ParIterable`
- *  @since 2.8
  */
 abstract class ParFactory[CC[X] <: ParIterable[X] with GenericParTemplate[X, CC]]
 extends GenericParCompanion[CC] {

core/src/main/scala/scala/collection/generic/ParMapFactory.scala

@@ -17,7 +17,6 @@ package generic
 import scala.collection.parallel.ParMap
 import scala.collection.parallel.ParMapLike
 import scala.collection.parallel.Combiner
-import scala.language.higherKinds
 
 /** A template class for companion objects of `ParMap` and subclasses thereof.
  *  This class extends `TraversableFactory` and provides a set of operations
@@ -27,8 +26,6 @@ import scala.language.higherKinds
  *  @define Coll `ParMap`
  *  @define factoryInfo
  *    This object provides a set of operations needed to create `$Coll` values.
- *  @author Aleksandar Prokopec
- *  @since 2.8
  */
 abstract class ParMapFactory[CC[X, Y] <: ParMap[X, Y] with ParMapLike[X, Y, CC, CC[X, Y], _]]
 extends GenericParMapCompanion[CC] {
@@ -67,4 +64,4 @@ extends GenericParMapCompanion[CC] {
     def apply() = newCombiner[K, V]
   }
 
-}
+}