Use netty core instead of incubator artifact

Author: StefanBratanov

examples/android-chatter/build.gradle

@@ -26,9 +26,9 @@ android {
         exclude 'META-INF/INDEX.LIST'
         exclude 'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
         exclude 'META-INF/license/LICENSE.aix-netbsd.txt'
-        exclude 'META-INF/native-image/io.netty.incubator/netty-incubator-codec-native-quic/jni-config.json'
-        exclude 'META-INF/native-image/io.netty.incubator/netty-incubator-codec-native-quic/reflect-config.json'
-        exclude 'META-INF/native-image/io.netty.incubator/netty-incubator-codec-native-quic/resource-config.json'
+        exclude 'META-INF/native-image/io.netty/netty-codec-native-quic/jni-config.json'
+        exclude 'META-INF/native-image/io.netty/netty-codec-native-quic/reflect-config.json'
+        exclude 'META-INF/native-image/io.netty/netty-codec-native-quic/resource-config.json'
         exclude 'META-INF/license/LICENSE.boringssl.txt'
         exclude 'META-INF/license/LICENSE.mvn-wrapper.txt'
         exclude 'META-INF/license/LICENSE.quiche.txt'

libp2p/build.gradle.kts

@@ -15,18 +15,18 @@ dependencies {
     implementation("io.netty:netty-handler")
     implementation("io.netty:netty-codec-http")
     implementation("io.netty:netty-transport-classes-epoll")
-    implementation("io.netty.incubator:netty-incubator-codec-native-quic")
+    implementation("io.netty:netty-codec-native-quic")
     // OS-specific bindings
-    implementation("io.netty.incubator:netty-incubator-codec-native-quic::linux-x86_64")
-    implementation("io.netty.incubator:netty-incubator-codec-native-quic::linux-aarch_64")
-    implementation("io.netty.incubator:netty-incubator-codec-native-quic::osx-x86_64")
-    implementation("io.netty.incubator:netty-incubator-codec-native-quic::osx-aarch_64")
-    implementation("io.netty.incubator:netty-incubator-codec-native-quic::windows-x86_64")
-    implementation("io.netty:netty-tcnative-boringssl-static:2.0.70.Final:linux-x86_64")
-    implementation("io.netty:netty-tcnative-boringssl-static:2.0.70.Final:linux-aarch_64")
-    implementation("io.netty:netty-tcnative-boringssl-static:2.0.70.Final:osx-x86_64")
-    implementation("io.netty:netty-tcnative-boringssl-static:2.0.70.Final:osx-aarch_64")
-    implementation("io.netty:netty-tcnative-boringssl-static:2.0.70.Final:windows-x86_64")
+    implementation("io.netty:netty-codec-native-quic::linux-x86_64")
+    implementation("io.netty:netty-codec-native-quic::linux-aarch_64")
+    implementation("io.netty:netty-codec-native-quic::osx-x86_64")
+    implementation("io.netty:netty-codec-native-quic::osx-aarch_64")
+    implementation("io.netty:netty-codec-native-quic::windows-x86_64")
+    implementation("io.netty:netty-tcnative-boringssl-static:2.0.72.Final:linux-x86_64")
+    implementation("io.netty:netty-tcnative-boringssl-static:2.0.72.Final:linux-aarch_64")
+    implementation("io.netty:netty-tcnative-boringssl-static:2.0.72.Final:osx-x86_64")
+    implementation("io.netty:netty-tcnative-boringssl-static:2.0.72.Final:osx-aarch_64")
+    implementation("io.netty:netty-tcnative-boringssl-static:2.0.72.Final:windows-x86_64")
 
     api("com.google.protobuf:protobuf-java")
 

libp2p/src/main/kotlin/io/libp2p/transport/quic/QuicTransport.kt

@@ -19,7 +19,10 @@ import io.libp2p.etc.STREAM
 import io.libp2p.etc.types.*
 import io.libp2p.etc.util.MultiaddrUtils
 import io.libp2p.etc.util.netty.nettyInitializer
-import io.libp2p.security.tls.*
+import io.libp2p.security.tls.Libp2pTrustManager
+import io.libp2p.security.tls.buildCert
+import io.libp2p.security.tls.getJavaKey
+import io.libp2p.security.tls.getPublicKeyFromCert
 import io.libp2p.transport.implementation.ConnectionOverNetty
 import io.libp2p.transport.implementation.NettyTransport
 import io.libp2p.transport.implementation.StreamOverNetty
@@ -31,10 +34,10 @@ import io.netty.channel.epoll.Epoll
 import io.netty.channel.epoll.EpollDatagramChannel
 import io.netty.channel.nio.NioEventLoopGroup
 import io.netty.channel.socket.nio.NioDatagramChannel
+import io.netty.handler.codec.quic.*
 import io.netty.handler.ssl.ClientAuth
-import io.netty.incubator.codec.quic.*
-import org.slf4j.LoggerFactory
-import java.net.*
+import java.net.InetSocketAddress
+import java.net.SocketAddress
 import java.time.Duration
 import java.util.*
 import java.util.concurrent.CompletableFuture
@@ -208,7 +211,6 @@ class QuicTransport(
             .option(ChannelOption.AUTO_READ, true)
             .option(ChannelOption.ALLOCATOR, allocator)
             .remoteAddress(fromMultiaddr(addr))
-//            .handler(connHandler)
             .streamHandler(object : ChannelInboundHandlerAdapter() {
                 override fun handlerAdded(ctx: ChannelHandlerContext?) {
                     val connection = ctx!!.channel().parent().attr(CONNECTION).get() as Connection

versions.gradle

@@ -31,13 +31,14 @@ dependencyManagement {
             entry 'protobuf-java'
             entry 'protoc'
         }
-        dependencySet(group: "io.netty", version: "4.1.118.Final") {
+        dependencySet(group: "io.netty", version: "4.2.2.Final") {
             entry 'netty-common'
             entry 'netty-handler'
             entry 'netty-transport'
             entry 'netty-buffer'
             entry 'netty-codec-http'
             entry 'netty-transport-classes-epoll'
+            entry 'netty-codec-native-quic'
         }
         dependency "com.github.multiformats:java-multibase:v1.1.1"
         dependency "tech.pegasys:noise-java:22.1.0"
@@ -46,6 +47,5 @@ dependencyManagement {
             entry 'bcpkix-jdk18on'
             entry 'bctls-jdk18on'
         }
-        dependency "io.netty.incubator:netty-incubator-codec-native-quic:0.0.71.Final"
     }
 }