Skip to content

Commit f3a346c

Browse files
SethTisueSethTisue
authored
Merge pull request #62 from SethTisue/prepare-for-0.2.0-release
prepare for 0.2.0 release for Scala 2.13.0-RC1
2 parents dac20f2 + 118f3fe commit f3a346c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+636
-42
lines changed

‎README.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This Scala standard module contains the package
44
`scala.collection.parallel`, with all of the parallel collections that
55
used to be part of the Scala standard library.
66

7-
As of Scala 2.13.0-M1, this module is a separate JAR that can be
7+
For Scala 2.13, this module is a separate JAR that can be
88
omitted from projects that do not use parallel collections.
99

1010
## Maintenance status
@@ -13,19 +13,13 @@ This module is maintained by the Scala team at Lightbend. If you are
1313
interested in participating, please jump right in on issues and pull
1414
requests.
1515

16-
Modest, targeted improvements to the existing codebase are welcome at
17-
any time. More fundamental or sweeping changes should probably wait
18-
until after the
19-
[Scala 2.13 collections rework](http://www.scala-lang.org/blog/2017/02/28/collections-rework.html)
20-
is closer to final form.
21-
2216
## Usage
2317

2418
To depend on scala-parallel-collections in sbt, add this to your `build.sbt`:
2519

2620
```
2721
libraryDependencies +=
28-
"org.scala-lang.modules" %% "scala-parallel-collections" % "0.1.2"
22+
"org.scala-lang.modules" %% "scala-parallel-collections" % "0.2.0"
2923
```
3024

3125
In your code, adding this import:
@@ -45,7 +39,7 @@ cross-built project, the dependency should take this form:
4539
libraryDependencies ++= {
4640
CrossVersion.partialVersion(scalaVersion.value) match {
4741
case Some((2, major)) if major >= 13 =>
48-
Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "0.1.2")
42+
Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "0.2.0")
4943
case _ =>
5044
Seq()
5145
}
@@ -66,7 +60,7 @@ You may able to avoid the problem by directly constructing your
6660
parallel collections rather than going through `.par`. For other
6761
possible workarounds, see
6862
https://github.com/scala/scala-parallel-collections/issues/22,
69-
which is still under discussion (as of April 2017).
63+
which is still under discussion.
7064

7165
## Releasing
7266

‎build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import ScalaModulePlugin._
22

3-
version in ThisBuild := "0.1.3-SNAPSHOT"
3+
version in ThisBuild := "0.2.1-SNAPSHOT"
44

55
resolvers in ThisBuild += "scala-integration" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"
66

77
scalaVersionsByJvm in ThisBuild := {
8-
val v213 = "2.13.0-pre-041fc23" // Apr 2
8+
val v213 = "2.13.0-RC1"
99
Map(
1010
8 -> List(v213 -> true),
1111
11 -> List(v213 -> false),

‎core/src/main/scala/scala/collection/DebugUtils.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.collection
214

315
private[collection] object DebugUtils {

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
5-
** /____/\___/_/ |_/____/_/ | | **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package collection

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.collection.generic
214

315
import scala.language.higherKinds

‎core/src/main/scala/scala/collection/generic/HasNewBuilder.scala

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
5-
** /____/\___/_/ |_/____/_/ | | **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
813
package scala
914
package collection
1015
package generic

‎core/src/main/scala/scala/collection/generic/Signalling.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
5-
** /____/\___/_/ |_/____/_/ | | **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package collection

‎core/src/main/scala/scala/collection/generic/Sizing.scala

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
/* __ *\
2-
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
4-
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
5-
** /____/\___/_/ |_/____/_/ | | **
6-
** |/ **
7-
\* */
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
812

913
package scala
1014
package collection

‎core/src/main/scala/scala/collection/immutable/OldHashMap.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala
214
package collection.immutable
315

‎core/src/main/scala/scala/collection/immutable/OldHashSet.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala
214
package collection
315
package immutable

‎core/src/main/scala/scala/collection/immutable/TrieIterator.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala
214

315
package collection

‎junit/src/test/scala/MiscTest.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
import collection._
214
import scala.collection.parallel.CollectionConverters._
315
import org.junit.Test

‎junit/src/test/scala/scala/CollectTest.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala
214

315
import org.junit.Assert._

‎junit/src/test/scala/scala/SerializationStabilityTest.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala
214

315
import javax.xml.bind.DatatypeConverter._

‎junit/src/test/scala/scala/collection/CollectionConversionsTest.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.collection
214

315
import org.junit.Test

‎junit/src/test/scala/scala/collection/NewBuilderTest.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.collection
214

315
import scala.{collection => sc}

‎junit/src/test/scala/scala/collection/concurrent/ctries_new/ConcurrentMapSpec.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.collection.concurrent.ctries_new
214

315
import scala.collection.concurrent.TrieMap

‎junit/src/test/scala/scala/collection/concurrent/ctries_new/DumbHash.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.collection.concurrent.ctries_new
214

315
class DumbHash(val i: Int) {

‎junit/src/test/scala/scala/collection/concurrent/ctries_new/IteratorSpec.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.collection.concurrent.ctries_new
214

315
import collection._

‎junit/src/test/scala/scala/collection/concurrent/ctries_new/LNodeSpec.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.collection.concurrent.ctries_new
214

315
import collection.concurrent.TrieMap

‎junit/src/test/scala/scala/collection/concurrent/ctries_new/SnapshotSpec.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/*
2+
* Scala (https://www.scala-lang.org)
3+
*
4+
* Copyright EPFL and Lightbend, Inc.
5+
*
6+
* Licensed under Apache License 2.0
7+
* (http://www.apache.org/licenses/LICENSE-2.0).
8+
*
9+
* See the NOTICE file distributed with this work for
10+
* additional information regarding copyright ownership.
11+
*/
12+
113
package scala.collection.concurrent.ctries_new
214

315
import collection._

0 commit comments

Comments
 (0)