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

chore: remove scala.compat.java8 in osgi (#2211)

Browse source 
* chore: remove scala.compat.java8 in osgi

* chore: Remove java 8 compat
This commit is contained in:
He-Pin(kerr) 2025-09-14 06:11:12 +08:00 • committed by GitHub
parent f2b677dfa0
commit 4d7bc6899e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
project/Dependencies.scala
View file

@ -25,9 +25,6 @@ object Dependencies {
val protocVersion = "32.0"
}
lazy val java8CompatVersion = settingKey[String]("The version of scala-java8-compat to use.")
.withRank(KeyRanks.Invisible) // avoid 'unused key' warning
val junitVersion = "4.13.2"
val junit5Version = "5.13.4"
val slf4jVersion = "2.0.17"
@ -53,9 +50,7 @@ object Dependencies {
val scalaTestScalaCheckVersion = "1-18"
val scalaCheckVersion = "1.18.0"
val Versions =
Seq(crossScalaVersions := allScalaVersions, scalaVersion := allScalaVersions.head,
java8CompatVersion := "1.0.2")
val Versions = Seq(crossScalaVersions := allScalaVersions, scalaVersion := allScalaVersions.head)
object Compile {
// Compile
@ -85,11 +80,6 @@ object Dependencies {
val junit = "junit" % "junit" % junitVersion
val junit5 = "org.junit.jupiter" % "junit-jupiter-engine" % junit5Version
// For Java 8 Conversions
lazy val java8Compat = Def.setting {
"org.scala-lang.modules" %% "scala-java8-compat" % java8CompatVersion.value
}
val aeronDriver = "io.aeron" % "aeron-driver" % aeronVersion
val aeronClient = "io.aeron" % "aeron-client" % aeronVersion
// Added explicitly for when artery tcp is used
@ -207,13 +197,7 @@ object Dependencies {
// TODO check if `l ++=` everywhere expensive?
lazy val l = libraryDependencies
lazy val actor = l ++= (CrossVersion.partialVersion(scalaVersion.value) match {
// java8-compat is only used in a couple of places for 2.13,
// it is probably possible to remove the dependency if needed.
case Some((2, n)) if n == 12 =>
List("org.scala-lang.modules" %% "scala-java8-compat" % java8CompatVersion.value)
case _ => List.empty
}) ++ Seq(config)
lazy val actor = l ++= Seq(config)
val actorTyped = l ++= Seq(slf4jApi)

8
project/OSGi.scala
View file

@ -51,7 +51,6 @@ object OSGi {
// pekko-actor packages are not imported, as contained in the CP
OsgiKeys.importPackage := (osgiOptionalImports.map(optionalResolution)) ++ Seq(
"!sun.misc",
scalaJava8CompatImport(),
scalaVersion(scalaImport).value,
configImport(),
"*"),
@ -77,7 +76,6 @@ object OSGi {
lazy val protobufV3 = osgiSettings ++ Seq(
OsgiKeys.importPackage := Seq(
"!sun.misc",
scalaJava8CompatImport(),
scalaVersion(scalaImport).value,
configImport(),
"*"),
@ -97,9 +95,7 @@ object OSGi {
lazy val stream =
exports(
packages = Seq("org.apache.pekko.stream.*"),
imports = Seq(
scalaJava8CompatImport(),
scalaParsingCombinatorImport()))
imports = Seq(scalaParsingCombinatorImport()))
lazy val streamTestkit = exports(Seq("org.apache.pekko.stream.testkit.*"))
@ -148,8 +144,6 @@ object OSGi {
val ScalaVersion(epoch, major) = version
versionedImport(packageName, s"$epoch.$major", s"$epoch.${major.toInt + 1}")
}
def scalaJava8CompatImport(packageName: String = "scala.compat.java8.*") =
versionedImport(packageName, "1.0.2", "1.0.2")
def scalaParsingCombinatorImport(packageName: String = "scala.util.parsing.combinator.*") =
versionedImport(packageName, "1.1.0", "1.2.0")
def kamonImport(packageName: String = "kamon.sigar.*") =