This is an automated email from the ASF dual-hosted git repository.
hepin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko.git
The following commit(s) were added to refs/heads/main by this push:
new 4d7bc6899e chore: remove scala.compat.java8 in osgi (#2211)
4d7bc6899e is described below
commit 4d7bc6899ee4bddcf9db86010e2a7c7943961ca5
Author: He-Pin(kerr) <[email protected]>
AuthorDate: Sun Sep 14 06:11:12 2025 +0800
chore: remove scala.compat.java8 in osgi (#2211)
* chore: remove scala.compat.java8 in osgi
* chore: Remove java 8 compat
---
project/Dependencies.scala | 20 ++------------------
project/OSGi.scala | 8 +-------
2 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 14d13caf02..5396321cc4 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -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)
diff --git a/project/OSGi.scala b/project/OSGi.scala
index 21e9571074..19e5edea50 100644
--- a/project/OSGi.scala
+++ b/project/OSGi.scala
@@ -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.*") =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
