This is an automated email from the ASF dual-hosted git repository.
engelen pushed a commit to branch 1.4.x
in repository https://gitbox.apache.org/repos/asf/pekko-http.git
The following commit(s) were added to refs/heads/1.4.x by this push:
new 8e1a89f92 chore: don't rely on Pekko Core `ccompat` (#890)
8e1a89f92 is described below
commit 8e1a89f925e46a27ba79167eac90d70284e80c3e
Author: Arnout Engelen <[email protected]>
AuthorDate: Thu Dec 11 15:20:28 2025 +0100
chore: don't rely on Pekko Core `ccompat` (#890)
ccompat was intentionally never `@InternalStableApi`
to allow modules to evolve them more independently
---
.../main/scala-2.13+/org/apache/pekko/http/ccompat/package.scala | 6 ++++++
.../main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala | 2 ++
.../apache/pekko/http/javadsl/settings/Http2ServerSettings.scala | 2 +-
.../apache/pekko/http/scaladsl/settings/Http2ServerSettings.scala | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git
a/http-core/src/main/scala-2.13+/org/apache/pekko/http/ccompat/package.scala
b/http-core/src/main/scala-2.13+/org/apache/pekko/http/ccompat/package.scala
index f256f79bf..adfbdafad 100644
--- a/http-core/src/main/scala-2.13+/org/apache/pekko/http/ccompat/package.scala
+++ b/http-core/src/main/scala-2.13+/org/apache/pekko/http/ccompat/package.scala
@@ -19,6 +19,12 @@ package org.apache.pekko.http
package object ccompat {
type Builder[-A, +To] = scala.collection.mutable.Builder[A, To]
+
+ // When we drop support for 2.12 we can delete this concept
+ // and import scala.jdk.CollectionConverters.Ops._ instead
+ object JavaConverters
+ extends scala.collection.convert.AsJavaExtensions
+ with scala.collection.convert.AsScalaExtensions
}
/**
diff --git
a/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala
b/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala
index 478ca1f19..5078bd9ba 100644
--- a/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala
+++ b/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala
@@ -53,6 +53,8 @@ package object ccompat {
// missing in 2.12
def -=(element: T): Unit = queue.dequeueAll(_ == element)
}
+
+ object JavaConverters extends scala.collection.convert.DecorateAsJava with
scala.collection.convert.DecorateAsScala
}
/**
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/Http2ServerSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/Http2ServerSettings.scala
index d50942023..e9830fb6b 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/Http2ServerSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/Http2ServerSettings.scala
@@ -17,8 +17,8 @@ import java.time.Duration
import org.apache.pekko
import pekko.annotation.DoNotInherit
+import pekko.http.ccompat.JavaConverters._
import pekko.http.scaladsl
-import pekko.util.ccompat.JavaConverters._
import com.typesafe.config.Config
import scala.concurrent.duration.DurationLong
diff --git
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/Http2ServerSettings.scala
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/Http2ServerSettings.scala
index 692fbd462..e2c7eac5d 100644
---
a/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/Http2ServerSettings.scala
+++
b/http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/Http2ServerSettings.scala
@@ -17,9 +17,9 @@ import org.apache.pekko
import pekko.annotation.ApiMayChange
import pekko.annotation.DoNotInherit
import pekko.annotation.InternalApi
+import pekko.http.ccompat.JavaConverters._
import pekko.http.impl.util._
import pekko.http.javadsl
-import pekko.util.ccompat.JavaConverters._
import com.typesafe.config.Config
import scala.concurrent.duration.Duration
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
