Skip to content
This repository was archived by the owner on Dec 10, 2025. It is now read-only.

Commit a95ccb4

Browse files
committed
refactor: update Netty version and organize dependencies in build configuration
1 parent 00f71b5 commit a95ccb4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

gradle/libs.versions.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[versions]
22
velocity-version = "3.4.0-SNAPSHOT"
33
aide-reflection = "1.3"
4-
netty = "4.1.117.Final"
4+
netty = "4.2.0.Final"
5+
netty-tcnative = "2.0.70.Final"
56
nbt = "6.1"
67
datafixerupper = "8.0.16"
78
byte-buddy = "1.15.10"
@@ -29,6 +30,7 @@ jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" }
2930
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin" }
3031
aide-reflection = { module = "tech.hiddenproject:aide-reflection", version.ref = "aide-reflection" }
3132
netty-all = { module = "io.netty:netty-all", version.ref = "netty" }
33+
netty-tcnative = { module = "io.netty:netty-tcnative", version.ref = "netty-tcnative" }
3234
nbt = { module = "com.github.Querz:NBT", version.ref = "nbt" }
3335
spring-data-jpa = { module = "org.springframework.data:spring-data-jpa" }
3436
datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "datafixerupper" }
@@ -73,6 +75,7 @@ kotlin-byte-buf-serializer = { module = "dev.slne.surf:kotlin-byte-buf-serialize
7375
spring-boot = { id = "org.springframework.boot" }
7476

7577
[bundles]
78+
netty-all = ["netty-all", "netty-tcnative"]
7679
spring-aop = ["spring-aop", "aspectjweaver", "aspectjrt", "spring-aspects"]
7780
spring-api-common = ["spring-boot-starter", "spring-boot-starter-cache"]
7881
jackson-api-common = ["jackson-core", "jackson-databind", "jackson-module-kotlin"]

surf-cloud-api/surf-cloud-api-common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
api(libs.bundles.spring.aop)
1010

1111
api(libs.aide.reflection)
12-
api(libs.netty.all)
12+
api(libs.bundles.netty.all)
1313
api(libs.kotlin.byte.buf.serializer) {
1414
exclude(group = "io.netty")
1515
}

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerEncryptionManager.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package dev.slne.surf.cloud.standalone.netty.server.network
22

33
import dev.slne.surf.cloud.core.common.netty.network.EncryptionManager
44
import dev.slne.surf.cloud.core.common.netty.network.HandlerNames
5-
import dev.slne.surf.surfapi.core.api.util.logger
65
import io.netty.channel.Channel
76
import io.netty.handler.ssl.ClientAuth
87
import io.netty.handler.ssl.SslContext
@@ -12,8 +11,6 @@ import java.security.cert.CertificateFactory
1211
import javax.net.ssl.TrustManagerFactory
1312

1413
object ServerEncryptionManager : EncryptionManager() {
15-
private val log = logger()
16-
1714
private val serverCertificateFile = certificatesFolder.resolve("server.crt").toFile()
1815
private val serverKeyFile = certificatesFolder.resolve("server.key").toFile()
1916
private val clientCertificatesFolder =

0 commit comments

Comments
 (0)