Merge pull request #863 from mkurz/shade-netty-reactive-streams

Correctly shade netty-reactive-streams
playframework · Mar 7, 2024 · 778648a · 778648a
2 parents 40ab550 + e6152f0
commit 778648a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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,