From ca33dfb778d81e44f34359284d4b7f52db6b2884 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 17 Dec 2024 19:27:22 -0800 Subject: [PATCH 01/11] adjust MiMa settings, post-1.1.0 (#281) --- build.sbt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 7bfdbd1..198c956 100644 --- a/build.sbt +++ b/build.sbt @@ -1,19 +1,13 @@ ThisBuild / crossScalaVersions := Seq("2.13.15", "3.3.4") ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head -// we can remove this after we ship 1.0.5; see #273 for gory details -import com.typesafe.tools.mima.core._ -ThisBuild / mimaBinaryIssueFilters ++= Seq( - ProblemFilters.exclude[IncompatibleSignatureProblem]("*"), -) - Global / cancelable := true publish / skip := true // in root lazy val commonSettings: Seq[Setting[_]] = Seq(scalaModuleAutomaticModuleName := Some("scala.collection.parallel")) ++ ScalaModulePlugin.scalaModuleSettings ++ Seq( - versionPolicyIntention := Compatibility.BinaryCompatible, + versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, Compile / compile / scalacOptions --= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => Seq("-Xlint") case _ => Seq() From c6ec43d22011f0dcbb1736b63a835e1f21e92f81 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Fri, 20 Dec 2024 01:07:54 +0100 Subject: [PATCH 02/11] Cross build with Scala Native --- build.sbt | 67 +++++++++++++++++++++++++++++++++++---------- project/plugins.sbt | 2 ++ 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/build.sbt b/build.sbt index 198c956..093fe4e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,8 @@ -ThisBuild / crossScalaVersions := Seq("2.13.15", "3.3.4") +val scalaVersions = Seq("2.13.15", "3.3.4") +ThisBuild / crossScalaVersions := scalaVersions ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head +Global / concurrentRestrictions += Tags.limit(NativeTags.Link, 1) Global / cancelable := true publish / skip := true // in root @@ -18,43 +20,78 @@ lazy val commonSettings: Seq[Setting[_]] = }), ) -lazy val core = project.in(file("core")) +lazy val testNativeSettings: Seq[Setting[_]] = Seq( + // Required by Scala Native testing infrastructure + Test / fork := false, +) + +lazy val core = projectMatrix.in(file("core")) .settings(commonSettings) .settings( name := "scala-parallel-collections", Compile / doc / autoAPIMappings := true, ) + .jvmPlatform(scalaVersions) + .nativePlatform(scalaVersions, settings = testNativeSettings ++ Seq( + versionPolicyPreviousArtifacts := Nil, // TODO: not yet published , + mimaPreviousArtifacts := Set.empty + )) -lazy val junit = project.in(file("junit")) +lazy val junit = projectMatrix.in(file("junit")) .settings(commonSettings) .settings( - libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test, - libraryDependencies += "junit" % "junit" % "4.13.2" % 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) + .jvmPlatform(scalaVersions, + settings = Seq( + libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test, + libraryDependencies += "junit" % "junit" % "4.13.2" % Test, + // for javax.xml.bind.DatatypeConverter, used in SerializationStabilityTest + libraryDependencies += "javax.xml.bind" % "jaxb-api" % "2.3.1" % Test, + Test / fork := true, + ) + ) + .nativePlatform(scalaVersions = scalaVersions, + axisValues = Nil, + configure = _ + .enablePlugins(ScalaNativeJUnitPlugin) + .settings( + Test/unmanagedSources/excludeFilter ~= { _ || + "SerializationTest.scala" || // requires ObjectOutputStream + "SerializationStability.scala" || // requires jaxb-api + "SerializationStabilityBase.scala" || + "SerializationStabilityTest.scala" + }, + Test / fork := false + ) + ) -lazy val scalacheck = project.in(file("scalacheck")) +lazy val scalacheck = projectMatrix.in(file("scalacheck")) .settings(commonSettings) .settings( - libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.18.1", - Test / fork := true, + libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.18.1", Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-workers", "1", "-minSize", "0", "-maxSize", "4000", "-minSuccessfulTests", "5"), publish / skip := true ).dependsOn(core) + .jvmPlatform(scalaVersions, + settings = Seq( + Test / fork := true + ) + ) + .nativePlatform(scalaVersions, settings = testNativeSettings) -lazy val testmacros = project.in(file("testmacros")) +lazy val testmacros = projectMatrix.in(file("testmacros")) .settings(commonSettings) .settings( - libraryDependencies += (CrossVersion.partialVersion(scalaVersion.value) match { - case Some((3, _)) => scalaOrganization.value %% "scala3-compiler" % scalaVersion.value - case _ => scalaOrganization.value % "scala-compiler" % scalaVersion.value + libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match { + case Some((3, _)) => Nil + case _ => List(scalaOrganization.value % "scala-compiler" % scalaVersion.value) }), publish / skip := true, ) + .jvmPlatform(scalaVersions) + .nativePlatform(scalaVersions, settings = testNativeSettings) commands += Command.single("setScalaVersion") { (state, arg) => val command = arg match { diff --git a/project/plugins.sbt b/project/plugins.sbt index a985cc4..9b6525c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1,3 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.0") +addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.1") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6") From 350a2bed169f8be3698a5b03bb284e48782a2e57 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Fri, 20 Dec 2024 12:38:07 +0100 Subject: [PATCH 03/11] Don't create Scala binary specific subprojects --- build.sbt | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/build.sbt b/build.sbt index 093fe4e..a96177b 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,11 @@ val scalaVersions = Seq("2.13.15", "3.3.4") +val defaultScalaVersion = scalaVersions.head + +// When defining JVM / Scala Native matrix we don't want duplicated projects for Scala 2/3 +val matrixScalaVersions = Seq(defaultScalaVersion) + ThisBuild / crossScalaVersions := scalaVersions -ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head +ThisBuild / scalaVersion := defaultScalaVersion Global / concurrentRestrictions += Tags.limit(NativeTags.Link, 1) Global / cancelable := true @@ -10,6 +15,7 @@ lazy val commonSettings: Seq[Setting[_]] = Seq(scalaModuleAutomaticModuleName := Some("scala.collection.parallel")) ++ ScalaModulePlugin.scalaModuleSettings ++ Seq( versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, + crossScalaVersions := scalaVersions, Compile / compile / scalacOptions --= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => Seq("-Xlint") case _ => Seq() @@ -31,9 +37,9 @@ lazy val core = projectMatrix.in(file("core")) name := "scala-parallel-collections", Compile / doc / autoAPIMappings := true, ) - .jvmPlatform(scalaVersions) - .nativePlatform(scalaVersions, settings = testNativeSettings ++ Seq( - versionPolicyPreviousArtifacts := Nil, // TODO: not yet published , + .jvmPlatform(matrixScalaVersions) + .nativePlatform(matrixScalaVersions, settings = testNativeSettings ++ Seq( + versionPolicyPreviousArtifacts := Nil, // TODO: not yet published mimaPreviousArtifacts := Set.empty )) @@ -43,7 +49,7 @@ lazy val junit = projectMatrix.in(file("junit")) testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"), publish / skip := true, ).dependsOn(testmacros, core) - .jvmPlatform(scalaVersions, + .jvmPlatform(matrixScalaVersions, settings = Seq( libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test, libraryDependencies += "junit" % "junit" % "4.13.2" % Test, @@ -52,18 +58,18 @@ lazy val junit = projectMatrix.in(file("junit")) Test / fork := true, ) ) - .nativePlatform(scalaVersions = scalaVersions, + .nativePlatform(matrixScalaVersions, axisValues = Nil, configure = _ .enablePlugins(ScalaNativeJUnitPlugin) .settings( - Test/unmanagedSources/excludeFilter ~= { _ || - "SerializationTest.scala" || // requires ObjectOutputStream - "SerializationStability.scala" || // requires jaxb-api - "SerializationStabilityBase.scala" || - "SerializationStabilityTest.scala" - }, - Test / fork := false + Test/unmanagedSources/excludeFilter ~= { _ || + "SerializationTest.scala" || // requires ObjectOutputStream + "SerializationStability.scala" || // requires jaxb-api + "SerializationStabilityBase.scala" || + "SerializationStabilityTest.scala" + }, + Test / fork := false ) ) @@ -73,13 +79,14 @@ lazy val scalacheck = projectMatrix.in(file("scalacheck")) libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.18.1", Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-workers", "1", "-minSize", "0", "-maxSize", "4000", "-minSuccessfulTests", "5"), publish / skip := true - ).dependsOn(core) - .jvmPlatform(scalaVersions, - settings = Seq( - Test / fork := true - ) + ) + .dependsOn(core) + .jvmPlatform(matrixScalaVersions, + settings = Seq( + Test / fork := true ) - .nativePlatform(scalaVersions, settings = testNativeSettings) + ) + .nativePlatform(matrixScalaVersions, settings = testNativeSettings) lazy val testmacros = projectMatrix.in(file("testmacros")) .settings(commonSettings) @@ -90,8 +97,8 @@ lazy val testmacros = projectMatrix.in(file("testmacros")) }), publish / skip := true, ) - .jvmPlatform(scalaVersions) - .nativePlatform(scalaVersions, settings = testNativeSettings) + .jvmPlatform(matrixScalaVersions) + .nativePlatform(matrixScalaVersions, settings = testNativeSettings) commands += Command.single("setScalaVersion") { (state, arg) => val command = arg match { From 9e9b8c9298d1933b4ef646b3b983bbad7e122cf7 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Fri, 20 Dec 2024 12:54:39 +0100 Subject: [PATCH 04/11] Add command for JVM/Native tests, use them in the CI --- .github/workflows/ci.yml | 8 +++++--- build.sbt | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47e6162..d9ad3c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,8 +25,10 @@ jobs: distribution: temurin java-version: ${{matrix.java}} - uses: sbt/setup-sbt@v1 - - name: Test - run: sbt "setScalaVersion ${{matrix.scala}}" test core/headerCheck package + - name: Test JVM + run: sbt "setScalaVersion ${{matrix.scala}}" testJVM core/headerCheck package + - name: Test Native + run: sbt "setScalaVersion ${{matrix.scala}}" testNative test-rc: strategy: @@ -52,4 +54,4 @@ jobs: java-version: ${{matrix.java}} - uses: sbt/setup-sbt@v1 - name: Test - run: sbt "setScalaVersion ${{matrix.scala}}" test core/headerCheck package + run: sbt "setScalaVersion ${{matrix.scala}}" testJVM core/headerCheck package diff --git a/build.sbt b/build.sbt index a96177b..db274f0 100644 --- a/build.sbt +++ b/build.sbt @@ -107,3 +107,14 @@ commands += Command.single("setScalaVersion") { (state, arg) => } command :: state } + +def testPlatformCommand(name: String, selector: ProjectMatrix => sbt.internal.ProjectFinder): Command = + Command.command(name) { state => + List(junit, scalacheck, testmacros) + .flatMap(selector(_).get) + .map{ project => s"${project.id}/test"} + .toList ::: state + } + +commands += testPlatformCommand("testNative", _.native) +commands += testPlatformCommand("testJVM", _.jvm) From 8a0501e59873934d898cae628c7c17d6dc637d38 Mon Sep 17 00:00:00 2001 From: Wojciech Mazur Date: Fri, 20 Dec 2024 12:58:14 +0100 Subject: [PATCH 05/11] Fix compilation --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index db274f0..6e5ecae 100644 --- a/build.sbt +++ b/build.sbt @@ -108,7 +108,8 @@ commands += Command.single("setScalaVersion") { (state, arg) => command :: state } -def testPlatformCommand(name: String, selector: ProjectMatrix => sbt.internal.ProjectFinder): Command = +import sbt.internal.{ProjectMatrix, ProjectFinder} +def testPlatformCommand(name: String, selector: ProjectMatrix => ProjectFinder): Command = Command.command(name) { state => List(junit, scalacheck, testmacros) .flatMap(selector(_).get) From 3edb9dd3341db444fbe64b4b929a4f341f368ef8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 25 Dec 2024 22:23:39 +0000 Subject: [PATCH 06/11] Update sbt-scala-module to 3.2.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9b6525c..5a35ece 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.0") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.2") addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6") From 3e4eca41f75d027f91c663bdb58a03a05d7c7fa4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 25 Dec 2024 22:23:48 +0000 Subject: [PATCH 07/11] Update sbt, scripted-plugin to 1.10.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e88a0d8..73df629 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.6 +sbt.version=1.10.7 From 6bc64aa3b24af13fcd8b7df3d94c0b9ccc25d344 Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Tue, 7 Jan 2025 17:57:54 +0100 Subject: [PATCH 08/11] Extend copyright into 2025 (#288) --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index c190911..438b720 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,6 @@ Scala parallel collections -Copyright (c) 2002-2024 EPFL -Copyright (c) 2011-2024 Lightbend, Inc. dba Akka +Copyright (c) 2002-2025 EPFL +Copyright (c) 2011-2025 Lightbend, Inc. dba Akka Scala includes software developed at LAMP/EPFL (https://lamp.epfl.ch/) and From 7dc7f6b223174e85244be1cf17584706ec5e0e10 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jan 2025 08:59:53 -0800 Subject: [PATCH 09/11] update copyright notices --- core/src/main/scala/scala/collection/CustomParallelizable.scala | 2 +- core/src/main/scala/scala/collection/DebugUtils.scala | 2 +- core/src/main/scala/scala/collection/Parallel.scala | 2 +- core/src/main/scala/scala/collection/Parallelizable.scala | 2 +- .../main/scala/scala/collection/generic/CanCombineFrom.scala | 2 +- .../scala/scala/collection/generic/GenericParCompanion.scala | 2 +- .../scala/scala/collection/generic/GenericParTemplate.scala | 2 +- .../scala/collection/generic/GenericTraversableTemplate.scala | 2 +- .../src/main/scala/scala/collection/generic/HasNewBuilder.scala | 2 +- .../main/scala/scala/collection/generic/HasNewCombiner.scala | 2 +- core/src/main/scala/scala/collection/generic/ParFactory.scala | 2 +- .../src/main/scala/scala/collection/generic/ParMapFactory.scala | 2 +- .../src/main/scala/scala/collection/generic/ParSetFactory.scala | 2 +- core/src/main/scala/scala/collection/generic/Signalling.scala | 2 +- core/src/main/scala/scala/collection/generic/Sizing.scala | 2 +- core/src/main/scala/scala/collection/immutable/OldHashMap.scala | 2 +- core/src/main/scala/scala/collection/immutable/OldHashSet.scala | 2 +- .../main/scala/scala/collection/immutable/TrieIterator.scala | 2 +- .../src/main/scala/scala/collection/mutable/FlatHashTable.scala | 2 +- .../scala/scala/collection/parallel/CollectionConverters.scala | 2 +- core/src/main/scala/scala/collection/parallel/Combiner.scala | 2 +- core/src/main/scala/scala/collection/parallel/ParIterable.scala | 2 +- .../main/scala/scala/collection/parallel/ParIterableLike.scala | 2 +- core/src/main/scala/scala/collection/parallel/ParMap.scala | 2 +- core/src/main/scala/scala/collection/parallel/ParMapLike.scala | 2 +- core/src/main/scala/scala/collection/parallel/ParSeq.scala | 2 +- core/src/main/scala/scala/collection/parallel/ParSeqLike.scala | 2 +- core/src/main/scala/scala/collection/parallel/ParSet.scala | 2 +- core/src/main/scala/scala/collection/parallel/ParSetLike.scala | 2 +- .../main/scala/scala/collection/parallel/PreciseSplitter.scala | 2 +- .../main/scala/scala/collection/parallel/RemainsIterator.scala | 2 +- core/src/main/scala/scala/collection/parallel/Splitter.scala | 2 +- core/src/main/scala/scala/collection/parallel/TaskSupport.scala | 2 +- core/src/main/scala/scala/collection/parallel/Tasks.scala | 2 +- .../scala/scala/collection/parallel/immutable/ParHashMap.scala | 2 +- .../scala/scala/collection/parallel/immutable/ParHashSet.scala | 2 +- .../scala/scala/collection/parallel/immutable/ParIterable.scala | 2 +- .../main/scala/scala/collection/parallel/immutable/ParMap.scala | 2 +- .../scala/scala/collection/parallel/immutable/ParRange.scala | 2 +- .../main/scala/scala/collection/parallel/immutable/ParSeq.scala | 2 +- .../main/scala/scala/collection/parallel/immutable/ParSet.scala | 2 +- .../scala/scala/collection/parallel/immutable/ParVector.scala | 2 +- .../scala/scala/collection/parallel/immutable/package.scala | 2 +- .../scala/scala/collection/parallel/mutable/LazyCombiner.scala | 2 +- .../main/scala/scala/collection/parallel/mutable/ParArray.scala | 2 +- .../scala/collection/parallel/mutable/ParFlatHashTable.scala | 2 +- .../scala/scala/collection/parallel/mutable/ParHashMap.scala | 2 +- .../scala/scala/collection/parallel/mutable/ParHashSet.scala | 2 +- .../scala/scala/collection/parallel/mutable/ParHashTable.scala | 2 +- .../scala/scala/collection/parallel/mutable/ParIterable.scala | 2 +- .../main/scala/scala/collection/parallel/mutable/ParMap.scala | 2 +- .../scala/scala/collection/parallel/mutable/ParMapLike.scala | 2 +- .../main/scala/scala/collection/parallel/mutable/ParSeq.scala | 2 +- .../main/scala/scala/collection/parallel/mutable/ParSet.scala | 2 +- .../scala/scala/collection/parallel/mutable/ParSetLike.scala | 2 +- .../scala/scala/collection/parallel/mutable/ParTrieMap.scala | 2 +- .../collection/parallel/mutable/ResizableParArrayCombiner.scala | 2 +- .../collection/parallel/mutable/UnrolledParArrayCombiner.scala | 2 +- .../main/scala/scala/collection/parallel/mutable/package.scala | 2 +- core/src/main/scala/scala/collection/parallel/package.scala | 2 +- junit/src/test/scala-2/scala/SerializationStabilityTest.scala | 2 +- junit/src/test/scala/MiscTest.scala | 2 +- junit/src/test/scala/SerializationStabilityBase.scala | 2 +- junit/src/test/scala/scala/CollectTest.scala | 2 +- .../test/scala/scala/collection/CollectionConversionsTest.scala | 2 +- junit/src/test/scala/scala/collection/NewBuilderTest.scala | 2 +- .../collection/concurrent/ctries_new/ConcurrentMapSpec.scala | 2 +- .../scala/scala/collection/concurrent/ctries_new/DumbHash.scala | 2 +- .../scala/collection/concurrent/ctries_new/IteratorSpec.scala | 2 +- .../scala/collection/concurrent/ctries_new/LNodeSpec.scala | 2 +- .../scala/collection/concurrent/ctries_new/SnapshotSpec.scala | 2 +- .../scala/scala/collection/concurrent/ctries_new/Spec.scala | 2 +- .../scala/scala/collection/concurrent/ctries_new/Wrap.scala | 2 +- .../collection/concurrent/ctries_old/ConcurrentMapSpec.scala | 2 +- .../scala/scala/collection/concurrent/ctries_old/DumbHash.scala | 2 +- .../scala/collection/concurrent/ctries_old/IteratorSpec.scala | 2 +- .../scala/collection/concurrent/ctries_old/LNodeSpec.scala | 2 +- .../scala/collection/concurrent/ctries_old/SnapshotSpec.scala | 2 +- .../scala/scala/collection/concurrent/ctries_old/Spec.scala | 2 +- .../scala/scala/collection/concurrent/ctries_old/Wrap.scala | 2 +- junit/src/test/scala/scala/collection/parallel/ParMapTest.scala | 2 +- .../scala/scala/collection/parallel/ParSeqConversionsTest.scala | 2 +- .../scala/scala/collection/parallel/SerializationTest.scala | 2 +- junit/src/test/scala/scala/collection/parallel/TaskTest.scala | 2 +- .../scala/collection/parallel/immutable/ParRangeTest.scala | 2 +- .../scala/scala/collection/parallel/mutable/ParArrayTest.scala | 2 +- .../scala/collection/parallel/mutable/ParHashSetTest.scala | 2 +- scalacheck/src/test/scala/IntOperators.scala | 2 +- scalacheck/src/test/scala/IntValues.scala | 2 +- scalacheck/src/test/scala/Operators.scala | 2 +- scalacheck/src/test/scala/PairOperators.scala | 2 +- scalacheck/src/test/scala/PairValues.scala | 2 +- scalacheck/src/test/scala/ParallelArrayCheck.scala | 2 +- scalacheck/src/test/scala/ParallelCtrieCheck.scala | 2 +- scalacheck/src/test/scala/ParallelHashMapCheck.scala | 2 +- scalacheck/src/test/scala/ParallelHashSetCheck.scala | 2 +- scalacheck/src/test/scala/ParallelHashTrieCheck.scala | 2 +- scalacheck/src/test/scala/ParallelIterableCheck.scala | 2 +- scalacheck/src/test/scala/ParallelMapCheck1.scala | 2 +- scalacheck/src/test/scala/ParallelRangeCheck.scala | 2 +- scalacheck/src/test/scala/ParallelSeqCheck.scala | 2 +- scalacheck/src/test/scala/ParallelSetCheck.scala | 2 +- scalacheck/src/test/scala/ParallelVectorCheck.scala | 2 +- scalacheck/src/test/scala/pc.scala | 2 +- testmacros/src/main/scala-2/testutil/ShouldNotTypecheck.scala | 2 +- 105 files changed, 105 insertions(+), 105 deletions(-) diff --git a/core/src/main/scala/scala/collection/CustomParallelizable.scala b/core/src/main/scala/scala/collection/CustomParallelizable.scala index 51dbec3..b57caa7 100644 --- a/core/src/main/scala/scala/collection/CustomParallelizable.scala +++ b/core/src/main/scala/scala/collection/CustomParallelizable.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/DebugUtils.scala b/core/src/main/scala/scala/collection/DebugUtils.scala index 7638996..a81ab45 100644 --- a/core/src/main/scala/scala/collection/DebugUtils.scala +++ b/core/src/main/scala/scala/collection/DebugUtils.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/Parallel.scala b/core/src/main/scala/scala/collection/Parallel.scala index 8b2ff4a..64c1555 100644 --- a/core/src/main/scala/scala/collection/Parallel.scala +++ b/core/src/main/scala/scala/collection/Parallel.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/Parallelizable.scala b/core/src/main/scala/scala/collection/Parallelizable.scala index 0825f6f..6465ef7 100644 --- a/core/src/main/scala/scala/collection/Parallelizable.scala +++ b/core/src/main/scala/scala/collection/Parallelizable.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/CanCombineFrom.scala b/core/src/main/scala/scala/collection/generic/CanCombineFrom.scala index 16367d0..6b827ac 100644 --- a/core/src/main/scala/scala/collection/generic/CanCombineFrom.scala +++ b/core/src/main/scala/scala/collection/generic/CanCombineFrom.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/GenericParCompanion.scala b/core/src/main/scala/scala/collection/generic/GenericParCompanion.scala index ab79b60..194ae65 100644 --- a/core/src/main/scala/scala/collection/generic/GenericParCompanion.scala +++ b/core/src/main/scala/scala/collection/generic/GenericParCompanion.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/GenericParTemplate.scala b/core/src/main/scala/scala/collection/generic/GenericParTemplate.scala index e98e1a9..6ad72d6 100644 --- a/core/src/main/scala/scala/collection/generic/GenericParTemplate.scala +++ b/core/src/main/scala/scala/collection/generic/GenericParTemplate.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/GenericTraversableTemplate.scala b/core/src/main/scala/scala/collection/generic/GenericTraversableTemplate.scala index c541bc5..838aff9 100644 --- a/core/src/main/scala/scala/collection/generic/GenericTraversableTemplate.scala +++ b/core/src/main/scala/scala/collection/generic/GenericTraversableTemplate.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/HasNewBuilder.scala b/core/src/main/scala/scala/collection/generic/HasNewBuilder.scala index 7c407dc..84bf47f 100644 --- a/core/src/main/scala/scala/collection/generic/HasNewBuilder.scala +++ b/core/src/main/scala/scala/collection/generic/HasNewBuilder.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/HasNewCombiner.scala b/core/src/main/scala/scala/collection/generic/HasNewCombiner.scala index 568e6d9..c7afe2c 100644 --- a/core/src/main/scala/scala/collection/generic/HasNewCombiner.scala +++ b/core/src/main/scala/scala/collection/generic/HasNewCombiner.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/ParFactory.scala b/core/src/main/scala/scala/collection/generic/ParFactory.scala index 56a2fad..7f9af5d 100644 --- a/core/src/main/scala/scala/collection/generic/ParFactory.scala +++ b/core/src/main/scala/scala/collection/generic/ParFactory.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/ParMapFactory.scala b/core/src/main/scala/scala/collection/generic/ParMapFactory.scala index 0aea7fc..3c69907 100644 --- a/core/src/main/scala/scala/collection/generic/ParMapFactory.scala +++ b/core/src/main/scala/scala/collection/generic/ParMapFactory.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/ParSetFactory.scala b/core/src/main/scala/scala/collection/generic/ParSetFactory.scala index 89dfa7b..65e17ea 100644 --- a/core/src/main/scala/scala/collection/generic/ParSetFactory.scala +++ b/core/src/main/scala/scala/collection/generic/ParSetFactory.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/Signalling.scala b/core/src/main/scala/scala/collection/generic/Signalling.scala index 886295c..3e1ebe6 100644 --- a/core/src/main/scala/scala/collection/generic/Signalling.scala +++ b/core/src/main/scala/scala/collection/generic/Signalling.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/generic/Sizing.scala b/core/src/main/scala/scala/collection/generic/Sizing.scala index 43be8cb..b586c45 100644 --- a/core/src/main/scala/scala/collection/generic/Sizing.scala +++ b/core/src/main/scala/scala/collection/generic/Sizing.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/immutable/OldHashMap.scala b/core/src/main/scala/scala/collection/immutable/OldHashMap.scala index 46b6ff6..f4d0a61 100644 --- a/core/src/main/scala/scala/collection/immutable/OldHashMap.scala +++ b/core/src/main/scala/scala/collection/immutable/OldHashMap.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/immutable/OldHashSet.scala b/core/src/main/scala/scala/collection/immutable/OldHashSet.scala index a0857b7..bb5160b 100644 --- a/core/src/main/scala/scala/collection/immutable/OldHashSet.scala +++ b/core/src/main/scala/scala/collection/immutable/OldHashSet.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/immutable/TrieIterator.scala b/core/src/main/scala/scala/collection/immutable/TrieIterator.scala index 30e2f2f..95ff457 100644 --- a/core/src/main/scala/scala/collection/immutable/TrieIterator.scala +++ b/core/src/main/scala/scala/collection/immutable/TrieIterator.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/mutable/FlatHashTable.scala b/core/src/main/scala/scala/collection/mutable/FlatHashTable.scala index ee72643..cad4df2 100644 --- a/core/src/main/scala/scala/collection/mutable/FlatHashTable.scala +++ b/core/src/main/scala/scala/collection/mutable/FlatHashTable.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/CollectionConverters.scala b/core/src/main/scala/scala/collection/parallel/CollectionConverters.scala index 2b14ffc..5e24052 100644 --- a/core/src/main/scala/scala/collection/parallel/CollectionConverters.scala +++ b/core/src/main/scala/scala/collection/parallel/CollectionConverters.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/Combiner.scala b/core/src/main/scala/scala/collection/parallel/Combiner.scala index 271c610..3fad9f4 100644 --- a/core/src/main/scala/scala/collection/parallel/Combiner.scala +++ b/core/src/main/scala/scala/collection/parallel/Combiner.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/ParIterable.scala b/core/src/main/scala/scala/collection/parallel/ParIterable.scala index 424d82d..3d640b1 100644 --- a/core/src/main/scala/scala/collection/parallel/ParIterable.scala +++ b/core/src/main/scala/scala/collection/parallel/ParIterable.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/ParIterableLike.scala b/core/src/main/scala/scala/collection/parallel/ParIterableLike.scala index 44a3e11..c0142ec 100644 --- a/core/src/main/scala/scala/collection/parallel/ParIterableLike.scala +++ b/core/src/main/scala/scala/collection/parallel/ParIterableLike.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/ParMap.scala b/core/src/main/scala/scala/collection/parallel/ParMap.scala index 70cb0af..0c9cd93 100644 --- a/core/src/main/scala/scala/collection/parallel/ParMap.scala +++ b/core/src/main/scala/scala/collection/parallel/ParMap.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/ParMapLike.scala b/core/src/main/scala/scala/collection/parallel/ParMapLike.scala index d1bf09f..71f5221 100644 --- a/core/src/main/scala/scala/collection/parallel/ParMapLike.scala +++ b/core/src/main/scala/scala/collection/parallel/ParMapLike.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/ParSeq.scala b/core/src/main/scala/scala/collection/parallel/ParSeq.scala index 94ef883..6ff8559 100644 --- a/core/src/main/scala/scala/collection/parallel/ParSeq.scala +++ b/core/src/main/scala/scala/collection/parallel/ParSeq.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/ParSeqLike.scala b/core/src/main/scala/scala/collection/parallel/ParSeqLike.scala index bc1400a..3190b68 100644 --- a/core/src/main/scala/scala/collection/parallel/ParSeqLike.scala +++ b/core/src/main/scala/scala/collection/parallel/ParSeqLike.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/ParSet.scala b/core/src/main/scala/scala/collection/parallel/ParSet.scala index da07b3d..66e2165 100644 --- a/core/src/main/scala/scala/collection/parallel/ParSet.scala +++ b/core/src/main/scala/scala/collection/parallel/ParSet.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/ParSetLike.scala b/core/src/main/scala/scala/collection/parallel/ParSetLike.scala index 0f38a6a..aabb695 100644 --- a/core/src/main/scala/scala/collection/parallel/ParSetLike.scala +++ b/core/src/main/scala/scala/collection/parallel/ParSetLike.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/PreciseSplitter.scala b/core/src/main/scala/scala/collection/parallel/PreciseSplitter.scala index 17b0077..0f1bece 100644 --- a/core/src/main/scala/scala/collection/parallel/PreciseSplitter.scala +++ b/core/src/main/scala/scala/collection/parallel/PreciseSplitter.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/RemainsIterator.scala b/core/src/main/scala/scala/collection/parallel/RemainsIterator.scala index 6e81e8e..27bcf0f 100644 --- a/core/src/main/scala/scala/collection/parallel/RemainsIterator.scala +++ b/core/src/main/scala/scala/collection/parallel/RemainsIterator.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/Splitter.scala b/core/src/main/scala/scala/collection/parallel/Splitter.scala index de33481..003bc88 100644 --- a/core/src/main/scala/scala/collection/parallel/Splitter.scala +++ b/core/src/main/scala/scala/collection/parallel/Splitter.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/TaskSupport.scala b/core/src/main/scala/scala/collection/parallel/TaskSupport.scala index 9ba2c94..b88c2e5 100644 --- a/core/src/main/scala/scala/collection/parallel/TaskSupport.scala +++ b/core/src/main/scala/scala/collection/parallel/TaskSupport.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/Tasks.scala b/core/src/main/scala/scala/collection/parallel/Tasks.scala index 5a32262..e560a10 100644 --- a/core/src/main/scala/scala/collection/parallel/Tasks.scala +++ b/core/src/main/scala/scala/collection/parallel/Tasks.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/immutable/ParHashMap.scala b/core/src/main/scala/scala/collection/parallel/immutable/ParHashMap.scala index 2952a50..da58d6f 100644 --- a/core/src/main/scala/scala/collection/parallel/immutable/ParHashMap.scala +++ b/core/src/main/scala/scala/collection/parallel/immutable/ParHashMap.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/immutable/ParHashSet.scala b/core/src/main/scala/scala/collection/parallel/immutable/ParHashSet.scala index eef08ff..741b7bf 100644 --- a/core/src/main/scala/scala/collection/parallel/immutable/ParHashSet.scala +++ b/core/src/main/scala/scala/collection/parallel/immutable/ParHashSet.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/immutable/ParIterable.scala b/core/src/main/scala/scala/collection/parallel/immutable/ParIterable.scala index e916d98..53c20c4 100644 --- a/core/src/main/scala/scala/collection/parallel/immutable/ParIterable.scala +++ b/core/src/main/scala/scala/collection/parallel/immutable/ParIterable.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/immutable/ParMap.scala b/core/src/main/scala/scala/collection/parallel/immutable/ParMap.scala index 5252d4b..584ed46 100644 --- a/core/src/main/scala/scala/collection/parallel/immutable/ParMap.scala +++ b/core/src/main/scala/scala/collection/parallel/immutable/ParMap.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/immutable/ParRange.scala b/core/src/main/scala/scala/collection/parallel/immutable/ParRange.scala index fb28a32..98be11e 100644 --- a/core/src/main/scala/scala/collection/parallel/immutable/ParRange.scala +++ b/core/src/main/scala/scala/collection/parallel/immutable/ParRange.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/immutable/ParSeq.scala b/core/src/main/scala/scala/collection/parallel/immutable/ParSeq.scala index 5958ebc..6cd0a36 100644 --- a/core/src/main/scala/scala/collection/parallel/immutable/ParSeq.scala +++ b/core/src/main/scala/scala/collection/parallel/immutable/ParSeq.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/immutable/ParSet.scala b/core/src/main/scala/scala/collection/parallel/immutable/ParSet.scala index 5f8e591..d2011fe 100644 --- a/core/src/main/scala/scala/collection/parallel/immutable/ParSet.scala +++ b/core/src/main/scala/scala/collection/parallel/immutable/ParSet.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/immutable/ParVector.scala b/core/src/main/scala/scala/collection/parallel/immutable/ParVector.scala index 5c3d944..610a080 100644 --- a/core/src/main/scala/scala/collection/parallel/immutable/ParVector.scala +++ b/core/src/main/scala/scala/collection/parallel/immutable/ParVector.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/immutable/package.scala b/core/src/main/scala/scala/collection/parallel/immutable/package.scala index 43a5d11..72bdc05 100644 --- a/core/src/main/scala/scala/collection/parallel/immutable/package.scala +++ b/core/src/main/scala/scala/collection/parallel/immutable/package.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/LazyCombiner.scala b/core/src/main/scala/scala/collection/parallel/mutable/LazyCombiner.scala index a7b13d6..d149a5c 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/LazyCombiner.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/LazyCombiner.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParArray.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParArray.scala index 7f037b8..698d72a 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParArray.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParArray.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParFlatHashTable.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParFlatHashTable.scala index 7b1d212..1ba70f7 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParFlatHashTable.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParFlatHashTable.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParHashMap.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParHashMap.scala index a7d10dd..25f80d9 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParHashMap.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParHashMap.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParHashSet.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParHashSet.scala index f49a142..57abee5 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParHashSet.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParHashSet.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParHashTable.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParHashTable.scala index 5385799..e7caf75 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParHashTable.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParHashTable.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParIterable.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParIterable.scala index 4718527..8e34d20 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParIterable.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParIterable.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParMap.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParMap.scala index 4900ebc..7ac4e6a 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParMap.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParMap.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParMapLike.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParMapLike.scala index 88ebf97..8986b13 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParMapLike.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParMapLike.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParSeq.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParSeq.scala index 08bac95..b135ee4 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParSeq.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParSeq.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParSet.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParSet.scala index 0c10c14..911f80e 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParSet.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParSet.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParSetLike.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParSetLike.scala index f8f2b3c..0af9e4c 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParSetLike.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParSetLike.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ParTrieMap.scala b/core/src/main/scala/scala/collection/parallel/mutable/ParTrieMap.scala index 04d5513..431b7da 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ParTrieMap.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ParTrieMap.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala b/core/src/main/scala/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala index 9c16f10..dafd777 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/ResizableParArrayCombiner.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala b/core/src/main/scala/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala index c2bdb44..f09b934 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/UnrolledParArrayCombiner.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/mutable/package.scala b/core/src/main/scala/scala/collection/parallel/mutable/package.scala index b289df2..b442b08 100644 --- a/core/src/main/scala/scala/collection/parallel/mutable/package.scala +++ b/core/src/main/scala/scala/collection/parallel/mutable/package.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/core/src/main/scala/scala/collection/parallel/package.scala b/core/src/main/scala/scala/collection/parallel/package.scala index 3cb7133..826c696 100644 --- a/core/src/main/scala/scala/collection/parallel/package.scala +++ b/core/src/main/scala/scala/collection/parallel/package.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala-2/scala/SerializationStabilityTest.scala b/junit/src/test/scala-2/scala/SerializationStabilityTest.scala index a74723e..97f7574 100644 --- a/junit/src/test/scala-2/scala/SerializationStabilityTest.scala +++ b/junit/src/test/scala-2/scala/SerializationStabilityTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/MiscTest.scala b/junit/src/test/scala/MiscTest.scala index 5c33f06..a8371cb 100644 --- a/junit/src/test/scala/MiscTest.scala +++ b/junit/src/test/scala/MiscTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/SerializationStabilityBase.scala b/junit/src/test/scala/SerializationStabilityBase.scala index 503031c..4f9b36f 100644 --- a/junit/src/test/scala/SerializationStabilityBase.scala +++ b/junit/src/test/scala/SerializationStabilityBase.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/CollectTest.scala b/junit/src/test/scala/scala/CollectTest.scala index 77ef2de..3f49c89 100644 --- a/junit/src/test/scala/scala/CollectTest.scala +++ b/junit/src/test/scala/scala/CollectTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/CollectionConversionsTest.scala b/junit/src/test/scala/scala/collection/CollectionConversionsTest.scala index 9dfc8b6..79f6ecc 100644 --- a/junit/src/test/scala/scala/collection/CollectionConversionsTest.scala +++ b/junit/src/test/scala/scala/collection/CollectionConversionsTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/NewBuilderTest.scala b/junit/src/test/scala/scala/collection/NewBuilderTest.scala index 8f82bc9..4466f91 100644 --- a/junit/src/test/scala/scala/collection/NewBuilderTest.scala +++ b/junit/src/test/scala/scala/collection/NewBuilderTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_new/ConcurrentMapSpec.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_new/ConcurrentMapSpec.scala index 4464d29..2673962 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_new/ConcurrentMapSpec.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_new/ConcurrentMapSpec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_new/DumbHash.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_new/DumbHash.scala index a830c4f..90c08d2 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_new/DumbHash.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_new/DumbHash.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_new/IteratorSpec.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_new/IteratorSpec.scala index 58fe5da..ca8aad7 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_new/IteratorSpec.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_new/IteratorSpec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_new/LNodeSpec.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_new/LNodeSpec.scala index 01a1efa..7e3ae68 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_new/LNodeSpec.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_new/LNodeSpec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_new/SnapshotSpec.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_new/SnapshotSpec.scala index 2a1654a..082d5cf 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_new/SnapshotSpec.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_new/SnapshotSpec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_new/Spec.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_new/Spec.scala index 3010649..1b8cea6 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_new/Spec.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_new/Spec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_new/Wrap.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_new/Wrap.scala index c567cf7..ca8d36c 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_new/Wrap.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_new/Wrap.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_old/ConcurrentMapSpec.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_old/ConcurrentMapSpec.scala index 3357f70..210c8fa 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_old/ConcurrentMapSpec.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_old/ConcurrentMapSpec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_old/DumbHash.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_old/DumbHash.scala index ad21d09..3315b24 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_old/DumbHash.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_old/DumbHash.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_old/IteratorSpec.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_old/IteratorSpec.scala index b46edfd..48a55d0 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_old/IteratorSpec.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_old/IteratorSpec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_old/LNodeSpec.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_old/LNodeSpec.scala index a40186b..e69ee14 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_old/LNodeSpec.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_old/LNodeSpec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_old/SnapshotSpec.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_old/SnapshotSpec.scala index 1bf4b17..01d79b8 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_old/SnapshotSpec.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_old/SnapshotSpec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_old/Spec.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_old/Spec.scala index 6b5f0e4..c077681 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_old/Spec.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_old/Spec.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/concurrent/ctries_old/Wrap.scala b/junit/src/test/scala/scala/collection/concurrent/ctries_old/Wrap.scala index f3cb387..15e16b9 100644 --- a/junit/src/test/scala/scala/collection/concurrent/ctries_old/Wrap.scala +++ b/junit/src/test/scala/scala/collection/concurrent/ctries_old/Wrap.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/parallel/ParMapTest.scala b/junit/src/test/scala/scala/collection/parallel/ParMapTest.scala index 475dc5b..8071c80 100644 --- a/junit/src/test/scala/scala/collection/parallel/ParMapTest.scala +++ b/junit/src/test/scala/scala/collection/parallel/ParMapTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/parallel/ParSeqConversionsTest.scala b/junit/src/test/scala/scala/collection/parallel/ParSeqConversionsTest.scala index a7637d8..2e7c487 100644 --- a/junit/src/test/scala/scala/collection/parallel/ParSeqConversionsTest.scala +++ b/junit/src/test/scala/scala/collection/parallel/ParSeqConversionsTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/parallel/SerializationTest.scala b/junit/src/test/scala/scala/collection/parallel/SerializationTest.scala index c30ee2f..5833c55 100644 --- a/junit/src/test/scala/scala/collection/parallel/SerializationTest.scala +++ b/junit/src/test/scala/scala/collection/parallel/SerializationTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/parallel/TaskTest.scala b/junit/src/test/scala/scala/collection/parallel/TaskTest.scala index da2b8b1..666bca7 100644 --- a/junit/src/test/scala/scala/collection/parallel/TaskTest.scala +++ b/junit/src/test/scala/scala/collection/parallel/TaskTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/parallel/immutable/ParRangeTest.scala b/junit/src/test/scala/scala/collection/parallel/immutable/ParRangeTest.scala index c96ad58..f4ad75c 100644 --- a/junit/src/test/scala/scala/collection/parallel/immutable/ParRangeTest.scala +++ b/junit/src/test/scala/scala/collection/parallel/immutable/ParRangeTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/parallel/mutable/ParArrayTest.scala b/junit/src/test/scala/scala/collection/parallel/mutable/ParArrayTest.scala index 12eb868..fba9590 100644 --- a/junit/src/test/scala/scala/collection/parallel/mutable/ParArrayTest.scala +++ b/junit/src/test/scala/scala/collection/parallel/mutable/ParArrayTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/junit/src/test/scala/scala/collection/parallel/mutable/ParHashSetTest.scala b/junit/src/test/scala/scala/collection/parallel/mutable/ParHashSetTest.scala index 346d7fe..dc12366 100644 --- a/junit/src/test/scala/scala/collection/parallel/mutable/ParHashSetTest.scala +++ b/junit/src/test/scala/scala/collection/parallel/mutable/ParHashSetTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/IntOperators.scala b/scalacheck/src/test/scala/IntOperators.scala index 46edec9..236414c 100644 --- a/scalacheck/src/test/scala/IntOperators.scala +++ b/scalacheck/src/test/scala/IntOperators.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/IntValues.scala b/scalacheck/src/test/scala/IntValues.scala index 66f8db8..0a408fe 100644 --- a/scalacheck/src/test/scala/IntValues.scala +++ b/scalacheck/src/test/scala/IntValues.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/Operators.scala b/scalacheck/src/test/scala/Operators.scala index 05c74c7..61ec1c2 100644 --- a/scalacheck/src/test/scala/Operators.scala +++ b/scalacheck/src/test/scala/Operators.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/PairOperators.scala b/scalacheck/src/test/scala/PairOperators.scala index a5aafb5..b03dbab 100644 --- a/scalacheck/src/test/scala/PairOperators.scala +++ b/scalacheck/src/test/scala/PairOperators.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/PairValues.scala b/scalacheck/src/test/scala/PairValues.scala index 0e7be87..fad3dbf 100644 --- a/scalacheck/src/test/scala/PairValues.scala +++ b/scalacheck/src/test/scala/PairValues.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelArrayCheck.scala b/scalacheck/src/test/scala/ParallelArrayCheck.scala index 6267481..47dbcaf 100644 --- a/scalacheck/src/test/scala/ParallelArrayCheck.scala +++ b/scalacheck/src/test/scala/ParallelArrayCheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelCtrieCheck.scala b/scalacheck/src/test/scala/ParallelCtrieCheck.scala index f6aae85..75272d3 100644 --- a/scalacheck/src/test/scala/ParallelCtrieCheck.scala +++ b/scalacheck/src/test/scala/ParallelCtrieCheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelHashMapCheck.scala b/scalacheck/src/test/scala/ParallelHashMapCheck.scala index 91ac1ac..c627488 100644 --- a/scalacheck/src/test/scala/ParallelHashMapCheck.scala +++ b/scalacheck/src/test/scala/ParallelHashMapCheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelHashSetCheck.scala b/scalacheck/src/test/scala/ParallelHashSetCheck.scala index 480d151..83df143 100644 --- a/scalacheck/src/test/scala/ParallelHashSetCheck.scala +++ b/scalacheck/src/test/scala/ParallelHashSetCheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelHashTrieCheck.scala b/scalacheck/src/test/scala/ParallelHashTrieCheck.scala index cc3d43e..5c4a3b8 100644 --- a/scalacheck/src/test/scala/ParallelHashTrieCheck.scala +++ b/scalacheck/src/test/scala/ParallelHashTrieCheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelIterableCheck.scala b/scalacheck/src/test/scala/ParallelIterableCheck.scala index 2af34fb..04f6678 100644 --- a/scalacheck/src/test/scala/ParallelIterableCheck.scala +++ b/scalacheck/src/test/scala/ParallelIterableCheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelMapCheck1.scala b/scalacheck/src/test/scala/ParallelMapCheck1.scala index 904e943..19bc35d 100644 --- a/scalacheck/src/test/scala/ParallelMapCheck1.scala +++ b/scalacheck/src/test/scala/ParallelMapCheck1.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelRangeCheck.scala b/scalacheck/src/test/scala/ParallelRangeCheck.scala index 1f1d8d7..f49f8d4 100644 --- a/scalacheck/src/test/scala/ParallelRangeCheck.scala +++ b/scalacheck/src/test/scala/ParallelRangeCheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelSeqCheck.scala b/scalacheck/src/test/scala/ParallelSeqCheck.scala index 008fce3..66d4341 100644 --- a/scalacheck/src/test/scala/ParallelSeqCheck.scala +++ b/scalacheck/src/test/scala/ParallelSeqCheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelSetCheck.scala b/scalacheck/src/test/scala/ParallelSetCheck.scala index 15f4114..e212dcd 100644 --- a/scalacheck/src/test/scala/ParallelSetCheck.scala +++ b/scalacheck/src/test/scala/ParallelSetCheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/ParallelVectorCheck.scala b/scalacheck/src/test/scala/ParallelVectorCheck.scala index 49feac2..d0ba403 100644 --- a/scalacheck/src/test/scala/ParallelVectorCheck.scala +++ b/scalacheck/src/test/scala/ParallelVectorCheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/scalacheck/src/test/scala/pc.scala b/scalacheck/src/test/scala/pc.scala index e1fffe8..0ec5111 100644 --- a/scalacheck/src/test/scala/pc.scala +++ b/scalacheck/src/test/scala/pc.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/testmacros/src/main/scala-2/testutil/ShouldNotTypecheck.scala b/testmacros/src/main/scala-2/testutil/ShouldNotTypecheck.scala index 6c6ff09..1b9eba8 100644 --- a/testmacros/src/main/scala-2/testutil/ShouldNotTypecheck.scala +++ b/testmacros/src/main/scala-2/testutil/ShouldNotTypecheck.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). From 7c268596ea34ce521dcce6bc475ca2b7ccb61d44 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jan 2025 10:17:53 -0800 Subject: [PATCH 10/11] adjust version policy for 1.2.0 release --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6e5ecae..8cfc988 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ publish / skip := true // in root lazy val commonSettings: Seq[Setting[_]] = Seq(scalaModuleAutomaticModuleName := Some("scala.collection.parallel")) ++ ScalaModulePlugin.scalaModuleSettings ++ Seq( - versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, + versionPolicyIntention := Compatibility.BinaryCompatible, crossScalaVersions := scalaVersions, Compile / compile / scalacOptions --= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((3, _)) => Seq("-Xlint") From 4a67a6e7658dc59f66aaef88966d0751a03c40ee Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jan 2025 10:18:06 -0800 Subject: [PATCH 11/11] clean up trailing whitespace --- build.sbt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 8cfc988..d42967e 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ lazy val testNativeSettings: Seq[Setting[_]] = Seq( // Required by Scala Native testing infrastructure Test / fork := false, ) - + lazy val core = projectMatrix.in(file("core")) .settings(commonSettings) .settings( @@ -49,7 +49,7 @@ lazy val junit = projectMatrix.in(file("junit")) testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"), publish / skip := true, ).dependsOn(testmacros, core) - .jvmPlatform(matrixScalaVersions, + .jvmPlatform(matrixScalaVersions, settings = Seq( libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % Test, libraryDependencies += "junit" % "junit" % "4.13.2" % Test, @@ -58,12 +58,12 @@ lazy val junit = projectMatrix.in(file("junit")) Test / fork := true, ) ) - .nativePlatform(matrixScalaVersions, + .nativePlatform(matrixScalaVersions, axisValues = Nil, configure = _ .enablePlugins(ScalaNativeJUnitPlugin) .settings( - Test/unmanagedSources/excludeFilter ~= { _ || + Test/unmanagedSources/excludeFilter ~= { _ || "SerializationTest.scala" || // requires ObjectOutputStream "SerializationStability.scala" || // requires jaxb-api "SerializationStabilityBase.scala" || @@ -71,7 +71,7 @@ lazy val junit = projectMatrix.in(file("junit")) }, Test / fork := false ) - ) + ) lazy val scalacheck = projectMatrix.in(file("scalacheck")) .settings(commonSettings) @@ -109,7 +109,7 @@ commands += Command.single("setScalaVersion") { (state, arg) => } import sbt.internal.{ProjectMatrix, ProjectFinder} -def testPlatformCommand(name: String, selector: ProjectMatrix => ProjectFinder): Command = +def testPlatformCommand(name: String, selector: ProjectMatrix => ProjectFinder): Command = Command.command(name) { state => List(junit, scalacheck, testmacros) .flatMap(selector(_).get)