Skip to content

chore: don't rely on Pekko Core ccompat #890

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
raboof merged 1 commit into from
Dec 11, 2025
Merged

chore: don't rely on Pekko Core ccompat #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions http-core/src/main/scala-2.13+/org/apache/pekko/http/ccompat/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

/**
Expand Down
2 changes: 2 additions & 0 deletions http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

/**
Expand Down
2 changes: 1 addition & 1 deletion http-core/src/main/scala/org/apache/pekko/http/javadsl/settings/Http2ServerSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion http-core/src/main/scala/org/apache/pekko/http/scaladsl/settings/Http2ServerSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading