Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 13, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07d36a7
chore: remove scala.compat.java8 in osgi
He-Pin Sep 13, 2025
6464744
chore: Remove java 8 compat
He-Pin Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
8 changes: 1 addition & 7 deletions project/OSGi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
"*"),
Expand All @@ -77,7 +76,6 @@ object OSGi {
lazy val protobufV3 = osgiSettings ++ Seq(
OsgiKeys.importPackage := Seq(
"!sun.misc",
scalaJava8CompatImport(),
scalaVersion(scalaImport).value,
configImport(),
"*"),
Expand All @@ -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.*"))

Expand Down Expand Up @@ -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.*") =
Expand Down