Skip to content

bump copyright year to 2017 and use sbt-header to standardize headers in core/src #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 20, 2017
Merged

bump copyright year to 2017 and use sbt-header to standardize headers in core/src #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e78fef
bump copyright year in license
SethTisue Mar 19, 2017
f599cf7
enable sbt-header plugin
SethTisue Mar 19, 2017
8b8d3ec
allow sbt-header to put standardized header everywhere in core/src
SethTisue Mar 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (c) 2002-2016 EPFL
Copyright (c) 2011-2016 Lightbend, Inc.
Copyright (c) 2002-2017 EPFL
Copyright (c) 2011-2017 Lightbend, Inc.

All rights reserved.

Expand Down
2 changes: 1 addition & 1 deletion admin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.
openssl aes-256-cbc -K $K -iv $IV -in admin/secring.asc.enc -out admin/secring.asc -d
fi

sbt "$publishVersion" clean update +test +publishLocal $extraTarget
sbt "$publishVersion" clean update +test +checkHeaders +publishLocal $extraTarget
17 changes: 14 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}

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

crossScalaVersions in ThisBuild := Seq("2.13.0-pre-e2a2cba") // March 16, 2017
Expand All @@ -15,7 +13,20 @@ cancelable in Global := true
lazy val core = project.in(file("core")).settings(scalaModuleSettings).settings(scalaModuleOsgiSettings).settings(
name := "scala-parallel-collections",
OsgiKeys.exportPackage := Seq(s"scala.collection.parallel.*;version=${version.value}"),
mimaPreviousVersion := None
mimaPreviousVersion := None,
headers := Map(
"scala" ->
(de.heikoseeberger.sbtheader.HeaderPattern.cStyleBlockComment,
"""|/* __ *\
|** ________ ___ / / ___ Scala API **
|** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
|** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
|** /____/\___/_/ |_/____/_/ | | **
|** |/ **
|\* */
|
|""".stripMargin)
)
)

lazy val junit = project.in(file("junit")).settings(
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/CustomParallelizable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/Parallelizable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/generic/CanCombineFrom.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/generic/GenericParCompanion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/generic/GenericParTemplate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/generic/HasNewCombiner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/generic/ParFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/generic/ParMapFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/generic/ParSetFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2010-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
8 changes: 8 additions & 0 deletions core/src/main/scala/scala/collection/parallel/CollectionConverters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
\* */

package scala.collection.parallel

import scala.language.implicitConversions
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/Combiner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/ParIterable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/ParIterableLike.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/ParMap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/ParMapLike.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/ParSeq.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/ParSeqLike.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/ParSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/ParSetLike.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/PreciseSplitter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/RemainsIterator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/Splitter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/TaskSupport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/Tasks.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/immutable/ParHashMap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/immutable/ParHashSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/immutable/ParIterable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/immutable/ParMap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/immutable/ParRange.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/immutable/ParSeq.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/immutable/ParSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/immutable/ParVector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/scala/collection/parallel/immutable/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2003-2017, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
Expand Down
Loading