Skip to content

Commit d910401

Browse files
SethTisueSethTisue
authored
Merge pull request #318 from scala-steward/update/sbt-scala-module-3.2.2
Update sbt-scala-module to 3.2.2
2 parents 753549e + c6e1dd9 commit d910401

File tree

57 files changed

+59
-58
lines changed

Some content is hidden

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

57 files changed

+59
-58
lines changed

‎NOTICE

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
scala-java8-compat
2-
Copyright (c) 2002-2023 EPFL
3-
Copyright (c) 2011-2023 Lightbend, Inc.
2+
Copyright (c) 2002-2025 EPFL
3+
Copyright (c) 2011-2025 Lightbend, Inc. dba Akka
44

55
scala-java8-compat 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

‎README.md

+1-1

‎build.sbt

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ lazy val commonSettings = Seq(
4646

4747
lazy val scalaJava8Compat = (project in file("."))
4848
.settings(ScalaModulePlugin.scalaModuleSettings)
49+
.enablePlugins(SbtOsgi)
4950
.settings(ScalaModulePlugin.scalaModuleOsgiSettings)
5051
.settings(commonSettings)
5152
.settings(

‎project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.1.0")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.2")

‎src/main/java-2.13+/scala/compat/java8/ScalaStreamSupport.java

+1-1
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).

‎src/main/java-2.13-/scala/compat/java8/ScalaStreamSupport.java

+1-1
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).

‎src/main/java-2.13-/scala/compat/java8/runtime/CollectionInternals.java

+1-1
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).

‎src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveDoubleWrapper.java

+1-1
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).

‎src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveIntWrapper.java

+1-1
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).

‎src/main/java/scala/compat/java8/wrappers/IteratorPrimitiveLongWrapper.java

+1-1
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).

‎src/main/scala-2.11/scala/compat/java8/runtime/LambdaDeserializer.scala

+1-1
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).

‎src/main/scala-2.13+/scala/compat/java8/StreamConverters.scala

+1-1
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).

‎src/main/scala-2.13+/scala/compat/java8/collectionImpl/package.scala

+1-1
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).

‎src/main/scala-2.13+/scala/compat/java8/converterImpl/Accumulates.scala

+1-1
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).

‎src/main/scala-2.13+/scala/compat/java8/converterImpl/AccumulatorConverters.scala

+1-1
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).

‎src/main/scala-2.13+/scala/compat/java8/converterImpl/StepperExtensions.scala

+1-1
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).

‎src/main/scala-2.13+/scala/concurrent/java8/FuturesConvertersImplCompat.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/SpliteratorConverters.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/StreamConverters.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/collectionImpl/Accumulator.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/collectionImpl/AccumulatorLike.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/collectionImpl/DoubleAccumulator.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/collectionImpl/IntAccumulator.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/collectionImpl/LongAccumulator.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/collectionImpl/Stepper.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/Accumulates.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/AccumulatorConverters.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/MakesSteppers.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepConverters.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsArray.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsBitSet.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsFlatHashTable.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsHashTable.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsImmHashMap.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsImmHashSet.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsIndexedSeq.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsIterable.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsIterator.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsLikeGapped.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsLikeImmHashMap.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsLikeIndexed.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsLikeIterator.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsLikeSliced.scala

+1-1
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).

‎src/main/scala-2.13-/scala/compat/java8/converterImpl/StepsLikeTrieIterator.scala

+1-1
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).

0 commit comments

Comments
 (0)