Skip to content

Commit d884540

Browse files
authored
chore: Update Scala to 2.13.13 (apache#1155)
* chore: Update Scala to 2.13.13 * chore: Remove unused imports * chore: Update Scala version to 2.13.13 in link-validator.conf
1 parent dbfdcb6 commit d884540

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala

-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ class BundleDescriptorBuilder(name: String) {
167167
}
168168

169169
def extractHeaders(file: File): HashMap[String, String] = {
170-
import scala.collection.JavaConverters.iterableAsScalaIterableConverter
171170
val headers = new HashMap[String, String]()
172171
val jis = new JarInputStream(new FileInputStream(file))
173172
try {

project/Dependencies.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ object Dependencies {
3737
val jacksonDatabindVersion = jacksonCoreVersion
3838

3939
val scala212Version = "2.12.19"
40-
val scala213Version = "2.13.12"
40+
val scala213Version = "2.13.13"
4141
val scala3Version = "3.3.1"
4242
val allScalaVersions = Seq(scala213Version, scala212Version, scala3Version)
4343

project/PekkoDisciplinePlugin.scala

+8-5
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,19 @@ object PekkoDisciplinePlugin extends AutoPlugin {
7474
"pekko-stream-tests-tck",
7575
"pekko-testkit")
7676

77-
val defaultScalaOptions = "-Wconf:cat=unused-nowarn:s,any:e"
77+
lazy val defaultScalaOptions = Def.setting(CrossVersion.partialVersion(scalaVersion.value) match {
78+
case Some((2, 12)) => "-Wconf:cat=unused-nowarn:s,any:e"
79+
case _ => "-Wconf:cat=unused-nowarn:s,cat=lint-named-booleans:s,cat=other-shadowing:s,any:e"
80+
})
7881

7982
lazy val nowarnSettings = Seq(
8083
Compile / scalacOptions ++= (
8184
if (scalaVersion.value.startsWith("3.")) Nil
82-
else Seq(defaultScalaOptions)
85+
else Seq(defaultScalaOptions.value)
8386
),
8487
Test / scalacOptions ++= (
8588
if (scalaVersion.value.startsWith("3.")) Nil
86-
else Seq(defaultScalaOptions)
89+
else Seq(defaultScalaOptions.value)
8790
),
8891
Compile / doc / scalacOptions := Seq())
8992

@@ -97,13 +100,13 @@ object PekkoDisciplinePlugin extends AutoPlugin {
97100
*/
98101
lazy val docs =
99102
Seq(
100-
Compile / scalacOptions -= defaultScalaOptions,
103+
Compile / scalacOptions -= defaultScalaOptions.value,
101104
Compile / scalacOptions ++= (
102105
if (scalaVersion.value.startsWith("3.")) Nil
103106
else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
104107
),
105108
Test / scalacOptions --= Seq("-Xlint", "-unchecked", "-deprecation"),
106-
Test / scalacOptions -= defaultScalaOptions,
109+
Test / scalacOptions -= defaultScalaOptions.value,
107110
Test / scalacOptions ++= (
108111
if (scalaVersion.value.startsWith("3.")) Nil
109112
else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")

scripts/link-validator.conf

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ site-link-validator {
6161
"http://pholser.github.com/jopt-simple"
6262
"http://pojosr.googlecode.com/"
6363
"http://team.ops4j.org/wiki/display/ops4j/Tinybundles"
64-
"https://www.scala-lang.org/api/2.13.12/scala/runtime/AbstractFunction1.html"
65-
"https://www.scala-lang.org/api/2.13.12/scala/runtime/AbstractFunction2.html"
66-
"https://www.scala-lang.org/api/2.13.12/scala/runtime/AbstractFunction3.html"
67-
"https://www.scala-lang.org/api/2.13.12/scala/runtime/AbstractPartialFunction.html"
64+
"https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction1.html"
65+
"https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction2.html"
66+
"https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction3.html"
67+
"https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractPartialFunction.html"
6868
# Bug, see https://github.com/scala/bug/issues/12807 and https://github.com/lampepfl/dotty/issues/17973
6969
"https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/nio/file/StandardOpenOption$.html"
7070
# Occasionally returns a 500 Internal Server Error

0 commit comments

Comments
 (0)