Skip to content

Commit b7420f3

Browse files
SethTisueSethTisue
authored
Merge pull request #672 from SethTisue/dba-akka
Lightbend Inc. dba Akka
2 parents 776095a + ca48479 commit b7420f3

File tree

76 files changed

+155
-69
lines changed

Some content is hidden

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

76 files changed

+155
-69
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,6 @@ jobs:
6565
with:
6666
distribution: temurin
6767
java-version: ${{matrix.java}}
68+
- uses: sbt/setup-sbt@v1
6869
- name: ci
6970
run: sbt ci

‎.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
with:
1414
distribution: temurin
1515
java-version: 8
16+
- uses: sbt/setup-sbt@v1
1617
- run: sbt versionCheck ci-release
1718
env:
1819
PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}}

‎NOTICE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
scala-collection-compat
2-
Copyright (c) 2002-2023 EPFL
3-
Copyright (c) 2011-2023 Lightbend, Inc.
2+
Copyright (c) 2002-2024 EPFL
3+
Copyright (c) 2011-2024 Lightbend, Inc. dba Akka
44

55
Scala includes software developed at
66
LAMP/EPFL (https://lamp.epfl.ch/) and
7-
Lightbend, Inc. (https://www.lightbend.com/).
7+
Akka (https://akka.io/)
88

99
Licensed under the Apache License, Version 2.0 (the "License").
1010
Unless required by applicable law or agreed to in writing, software

‎binary-compat/new/src/main/scala/org.example/Lib.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎binary-compat/old/src/main/scala/org.example/Lib.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎binary-compat/test/src/test/scala/BinaryCompaTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import _root_.scalafix.sbt.BuildInfo.{scalafixVersion, scala212 => scalafixScala
33
lazy val commonSettings = Seq(
44
headerLicense := Some(HeaderLicense.Custom(s"""|Scala (https://www.scala-lang.org)
55
|
6-
|Copyright EPFL and Lightbend, Inc.
6+
|Copyright EPFL and Lightbend, Inc. dba Akka
77
|
88
|Licensed under Apache License 2.0
99
|(http://www.apache.org/licenses/LICENSE-2.0).

‎compat/jsNative/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionShape.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11/scala/annotation/nowarn.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11/scala/collection/compat/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11/scala/jdk/javaapi/CollectionConverters.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11/scala/util/Using.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/annotation/unused.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/collection/compat/RandomExtensions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/collection/compat/StringParsers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/LazyList.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/jdk/CollectionConverters.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/util/ChainingOps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/util/control/compat/ControlThrowable.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.11_2.12/scala/util/matching/compat/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.12/scala/collection/compat/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.12/scala/jdk/javaapi/CollectionConverters.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.12/scala/util/Using.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.13/scala/collection/compat/immutable/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.13/scala/collection/compat/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.13/scala/util/control/compat/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/main/scala-2.13/scala/util/matching/compat/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/test/scala-2.11_2.12/test/scala/collection/ToConserveTest.scala

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

315
import org.junit.Assert.{assertSame, assertNotSame}

‎compat/src/test/scala-js/test/scala/jdk/OptionConvertersTest.scala

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

315
import org.junit.Assert.assertEquals

‎compat/src/test/scala-jvm/test/scala/collection/LazyListGCTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎compat/src/test/scala-jvm/test/scala/collection/StringParsersJVMTest.scala

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

315
import org.junit.Test

‎compat/src/test/scala-jvm/test/scala/jdk/OptionConvertersJVMTest.scala

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

315
import org.junit.Assert.assertEquals

‎compat/src/test/scala-jvm/test/scala/jdk/javaapi/CollectionConvertersTest.java

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

315
import org.junit.Assert;

0 commit comments

Comments
 (0)