Skip to content

Commit 1198cac

Browse files
szeigerszeiger
authored
Merge pull request scala#9 from SethTisue/copyright
bump copyright year to 2017 and use sbt-header to standardize headers in core/src
2 parents cbdd2b5 + 8b8d3ec commit 1198cac

Some content is hidden

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

54 files changed

+75
-56
lines changed

‎LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Copyright (c) 2002-2016 EPFL
2-
Copyright (c) 2011-2016 Lightbend, Inc.
1+
Copyright (c) 2002-2017 EPFL
2+
Copyright (c) 2011-2017 Lightbend, Inc.
33

44
All rights reserved.
55

‎admin/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.
2222
openssl aes-256-cbc -K $K -iv $IV -in admin/secring.asc.enc -out admin/secring.asc -d
2323
fi
2424

25-
sbt "$publishVersion" clean update +test +publishLocal $extraTarget
25+
sbt "$publishVersion" clean update +test +checkHeaders +publishLocal $extraTarget

‎build.sbt

+14-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}
2-
31
resolvers in ThisBuild += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"
42

53
crossScalaVersions in ThisBuild := Seq("2.13.0-pre-e2a2cba") // March 16, 2017
@@ -15,7 +13,20 @@ cancelable in Global := true
1513
lazy val core = project.in(file("core")).settings(scalaModuleSettings).settings(scalaModuleOsgiSettings).settings(
1614
name := "scala-parallel-collections",
1715
OsgiKeys.exportPackage := Seq(s"scala.collection.parallel.*;version=${version.value}"),
18-
mimaPreviousVersion := None
16+
mimaPreviousVersion := None,
17+
headers := Map(
18+
"scala" ->
19+
(de.heikoseeberger.sbtheader.HeaderPattern.cStyleBlockComment,
20+
"""|/* __ *\
21+
|** ________ ___ / / ___ Scala API **
22+
|** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
23+
|** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
24+
|** /____/\___/_/ |_/____/_/ | | **
25+
|** |/ **
26+
|\* */
27+
|
28+
|""".stripMargin)
29+
)
1930
)
2031

2132
lazy val junit = project.in(file("junit")).settings(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/CollectionConverters.scala

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/* __ *\
2+
** ________ ___ / / ___ Scala API **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
4+
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
5+
** /____/\___/_/ |_/____/_/ | | **
6+
** |/ **
7+
\* */
8+
19
package scala.collection.parallel
210

311
import scala.language.implicitConversions

‎core/src/main/scala/scala/collection/parallel/Combiner.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/ParIterable.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/ParIterableLike.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/ParMap.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/ParMapLike.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/ParSeq.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/ParSeqLike.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/ParSet.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/ParSetLike.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/PreciseSplitter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/RemainsIterator.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/Splitter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/TaskSupport.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/Tasks.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/immutable/ParHashMap.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/immutable/ParHashSet.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/immutable/ParIterable.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/immutable/ParMap.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/immutable/ParRange.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/immutable/ParSeq.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/immutable/ParSet.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/immutable/ParVector.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

‎core/src/main/scala/scala/collection/parallel/immutable/package.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* __ *\
22
** ________ ___ / / ___ Scala API **
3-
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
3+
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
44
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
55
** /____/\___/_/ |_/____/_/ | | **
66
** |/ **

0 commit comments

Comments
 (0)