From e6152f097ab56eafce2102751c526c6e4066aaa8 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 7 Mar 2024 21:59:23 +0100 Subject: [PATCH] Correctly shade netty-reactive-streams --- build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 1f3381cb..7b47c002 100644 --- a/build.sbt +++ b/build.sbt @@ -191,7 +191,9 @@ lazy val `shaded-asynchttpclient` = project ShadeRule.rename("org.asynchttpclient.**" -> "play.shaded.ahc.@0").inAll, ShadeRule.rename("io.netty.**" -> "play.shaded.ahc.@0").inAll, ShadeRule.rename("javassist.**" -> "play.shaded.ahc.@0").inAll, - ShadeRule.rename("org.playframework.netty.**" -> "play.shaded.ahc.@0").inAll, + ShadeRule // asynchttpclient 2.x depends on netty-reactive-streams 2.x (v3 drops it, see async-http-client#1843 + #1819) + .rename("com.typesafe.netty.**" -> "play.shaded.ahc.@0") + .inAll, ShadeRule.rename("javax.activation.**" -> "play.shaded.ahc.@0").inAll, ShadeRule.rename("com.sun.activation.**" -> "play.shaded.ahc.@0").inAll, ShadeRule.zap("org.reactivestreams.**").inAll,