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

=sbt Upgrade to Scala 2.12.18 and 2.13.11.

Browse source
This commit is contained in:
He-Pin 2023-05-27 14:31:35 +08:00 • committed by kerr
parent 9aa4e1d904
commit 008bdd5190
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala
View file

@ -50,7 +50,7 @@ class HillClimbingAdmissionOptimizerSpec extends AnyWordSpec with Matchers {
val optimizer = create(initialStep = step, stepDecay = decay)
for (i <- 1 to 100) {
optimizer.recordPassive()
if (i % 10 == 0) optimizer.calculateAdjustment() shouldBe math.pow(decay, i / 10 - 1) * -step
if (i % 10 == 0) optimizer.calculateAdjustment() shouldBe math.pow(decay, i.toDouble / 10 - 1) * -step
}
}
@ -63,7 +63,7 @@ class HillClimbingAdmissionOptimizerSpec extends AnyWordSpec with Matchers {
if (i > 40) optimizer.recordActive() else optimizer.recordPassive()
if (i % 10 == 0) {
val shift = if (i < 60) 1 else 6
optimizer.calculateAdjustment() shouldBe math.pow(decay, i / 10 - shift) * -step
optimizer.calculateAdjustment() shouldBe math.pow(decay, i.toDouble / 10 - shift) * -step
}
}
}

2
docs/src/test/scala/docs/stream/cookbook/RecipeSplitter.scala
View file

@ -23,7 +23,7 @@ import org.scalatest.wordspec.AnyWordSpec
class RecipeSplitter extends AnyWordSpec with BeforeAndAfterAll with Matchers with ScalaFutures {
implicit val system = ActorSystem("Test")
implicit val system: ActorSystem = ActorSystem("Test")
"Splitter" should {
" simple split " in {

4
project/Dependencies.scala
View file

@ -37,8 +37,8 @@ object Dependencies {
val jacksonCoreVersion = "2.14.3"
val jacksonDatabindVersion = jacksonCoreVersion
val scala212Version = "2.12.17"
val scala213Version = "2.13.10"
val scala212Version = "2.12.18"
val scala213Version = "2.13.11"
// To get the fix for https://github.com/lampepfl/dotty/issues/13106
// and restored static forwarders
val scala3Version = "3.3.0"

7
remote/src/main/scala/org/apache/pekko/remote/transport/netty/NettyTransport.scala
View file

@ -21,6 +21,7 @@ import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.Executors
import java.util.concurrent.atomic.AtomicInteger
import scala.annotation.nowarn
import scala.concurrent.ExecutionContext
import scala.concurrent.Future
import scala.concurrent.Promise
@ -30,8 +31,8 @@ import scala.util.Try
import scala.util.control.NoStackTrace
import scala.util.control.NonFatal
import scala.annotation.nowarn
import com.typesafe.config.Config
import org.apache.pekko
import org.jboss.netty.bootstrap.Bootstrap
import org.jboss.netty.bootstrap.ClientBootstrap
import org.jboss.netty.bootstrap.ConnectionlessBootstrap
@ -50,8 +51,6 @@ import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder
import org.jboss.netty.handler.codec.frame.LengthFieldPrepender
import org.jboss.netty.handler.ssl.SslHandler
import org.jboss.netty.util.HashedWheelTimer
import org.apache.pekko
import pekko.ConfigurationException
import pekko.OnlyCauseStackTrace
import pekko.actor.ActorSystem
@ -124,7 +123,6 @@ class NettyTransportExceptionNoStack(msg: String, cause: Throwable)
class NettyTransportSettings(config: Config) {
import config._
import pekko.util.Helpers.ConfigOps
val EnableSsl: Boolean = getBoolean("enable-ssl")
@ -318,6 +316,7 @@ private[transport] object NettyTransport {
// 4 bytes will be used to represent the frame length. Used by netty LengthFieldPrepender downstream handler.
val FrameLengthFieldLength = 4
def gracefulClose(channel: Channel)(implicit ec: ExecutionContext): Unit = {
@nowarn("msg=deprecated")
def always(c: ChannelFuture) = NettyFutureBridge(c).recover { case _ => c.getChannel }
for {
_ <- always { channel.write(ChannelBuffers.buffer(0)) } // Force flush by waiting on a final dummy write