raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

chore: Update Scala to 2.13.13 (#1155)

Browse source 
* chore: Update Scala to 2.13.13

* chore: Remove unused imports

* chore: Update Scala version to 2.13.13 in link-validator.conf
This commit is contained in:
He-Pin(kerr) 2024-02-28 12:53:22 +08:00 • committed by GitHub
parent dbfdcb678d
commit d884540c92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala
View file

@ -167,7 +167,6 @@ class BundleDescriptorBuilder(name: String) {
} }
def extractHeaders(file: File): HashMap[String, String] = { def extractHeaders(file: File): HashMap[String, String] = {
import scala.collection.JavaConverters.iterableAsScalaIterableConverter
val headers = new HashMap[String, String]() val headers = new HashMap[String, String]()
val jis = new JarInputStream(new FileInputStream(file)) val jis = new JarInputStream(new FileInputStream(file))
try { try {

2
project/Dependencies.scala
View file

@ -37,7 +37,7 @@ object Dependencies {
val jacksonDatabindVersion = jacksonCoreVersion val jacksonDatabindVersion = jacksonCoreVersion
val scala212Version = "2.12.19" val scala212Version = "2.12.19"
val scala213Version = "2.13.12" val scala213Version = "2.13.13"
val scala3Version = "3.3.1" val scala3Version = "3.3.1"
val allScalaVersions = Seq(scala213Version, scala212Version, scala3Version) val allScalaVersions = Seq(scala213Version, scala212Version, scala3Version)

13
project/PekkoDisciplinePlugin.scala
View file

@ -74,16 +74,19 @@ object PekkoDisciplinePlugin extends AutoPlugin {
"pekko-stream-tests-tck", "pekko-stream-tests-tck",
"pekko-testkit") "pekko-testkit")
val defaultScalaOptions = "-Wconf:cat=unused-nowarn:s,any:e" lazy val defaultScalaOptions = Def.setting(CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 12)) => "-Wconf:cat=unused-nowarn:s,any:e"
case _ => "-Wconf:cat=unused-nowarn:s,cat=lint-named-booleans:s,cat=other-shadowing:s,any:e"
})
lazy val nowarnSettings = Seq( lazy val nowarnSettings = Seq(
Compile / scalacOptions ++= ( Compile / scalacOptions ++= (
if (scalaVersion.value.startsWith("3.")) Nil if (scalaVersion.value.startsWith("3.")) Nil
else Seq(defaultScalaOptions) else Seq(defaultScalaOptions.value)
), ),
Test / scalacOptions ++= ( Test / scalacOptions ++= (
if (scalaVersion.value.startsWith("3.")) Nil if (scalaVersion.value.startsWith("3.")) Nil
else Seq(defaultScalaOptions) else Seq(defaultScalaOptions.value)
), ),
Compile / doc / scalacOptions := Seq()) Compile / doc / scalacOptions := Seq())
@ -97,13 +100,13 @@ object PekkoDisciplinePlugin extends AutoPlugin {
*/ */
lazy val docs = lazy val docs =
Seq( Seq(
Compile / scalacOptions -= defaultScalaOptions, Compile / scalacOptions -= defaultScalaOptions.value,
Compile / scalacOptions ++= ( Compile / scalacOptions ++= (
if (scalaVersion.value.startsWith("3.")) Nil if (scalaVersion.value.startsWith("3.")) Nil
else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e") else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
), ),
Test / scalacOptions --= Seq("-Xlint", "-unchecked", "-deprecation"), Test / scalacOptions --= Seq("-Xlint", "-unchecked", "-deprecation"),
Test / scalacOptions -= defaultScalaOptions, Test / scalacOptions -= defaultScalaOptions.value,
Test / scalacOptions ++= ( Test / scalacOptions ++= (
if (scalaVersion.value.startsWith("3.")) Nil if (scalaVersion.value.startsWith("3.")) Nil
else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e") else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")

8
scripts/link-validator.conf
View file

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