Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct netty dependencies #3078

Merged
merged 1 commit into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions servicetalk-buffer-netty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies {

implementation project(":servicetalk-annotations")
implementation project(":servicetalk-utils-internal")
implementation "io.netty:netty-common"
implementation "org.slf4j:slf4j-api:$slf4jVersion"

testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version")
Expand Down
6 changes: 6 additions & 0 deletions servicetalk-dns-discovery-netty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,19 @@ ext.isNettySnapshot = "$nettyVersion".endsWithAny("SNAPSHOT", "+")
dependencies {
api project(":servicetalk-client-api")

implementation platform("io.netty:netty-bom:$nettyVersion")
implementation project(":servicetalk-annotations")
implementation project(":servicetalk-concurrent-internal")
implementation project(":servicetalk-concurrent-api-internal")
implementation project(":servicetalk-transport-netty")
implementation project(":servicetalk-transport-netty-internal")
implementation project(":servicetalk-utils-internal")
implementation "io.netty:netty-buffer"
implementation "io.netty:netty-common"
implementation "io.netty:netty-codec-dns"
implementation "io.netty:netty-resolver"
implementation "io.netty:netty-resolver-dns"
implementation "io.netty:netty-transport"
implementation "org.slf4j:slf4j-api:$slf4jVersion"

if (!project.ext.isNettySnapshot) {
Expand Down
3 changes: 3 additions & 0 deletions servicetalk-encoding-netty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"
dependencies {
api project(":servicetalk-encoding-api")

implementation platform("io.netty:netty-bom:$nettyVersion")
implementation project(":servicetalk-annotations")
implementation project(":servicetalk-buffer-netty")
implementation project(":servicetalk-concurrent-internal")
implementation project(":servicetalk-utils-internal")
implementation "io.netty:netty-buffer"
implementation "io.netty:netty-codec"
implementation "io.netty:netty-transport"
implementation "org.slf4j:slf4j-api:$slf4jVersion"

testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version")
Expand Down
6 changes: 6 additions & 0 deletions servicetalk-http-netty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ dependencies {
api project(":servicetalk-logging-api")
api project(":servicetalk-http-api")

implementation platform("io.netty:netty-bom:$nettyVersion")
implementation project(":servicetalk-annotations")
implementation project(":servicetalk-client-api-internal")
implementation project(":servicetalk-concurrent-internal")
Expand All @@ -35,8 +36,13 @@ dependencies {
implementation project(":servicetalk-transport-netty")
implementation project(":servicetalk-transport-netty-internal")
implementation project(":servicetalk-utils-internal")
implementation "io.netty:netty-buffer"
implementation "io.netty:netty-codec"
implementation "io.netty:netty-codec-http"
implementation "io.netty:netty-codec-http2"
implementation "io.netty:netty-common"
implementation "io.netty:netty-handler"
implementation "io.netty:netty-transport"
implementation "org.slf4j:slf4j-api:$slf4jVersion"

testImplementation enforcedPlatform("org.junit:junit-bom:$junit5Version")
Expand Down
2 changes: 2 additions & 0 deletions servicetalk-tcp-netty-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ dependencies {
testImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
testImplementation "org.mockito:mockito-core:$mockitoCoreVersion"

testFixturesImplementation platform("io.netty:netty-bom:$nettyVersion")
testFixturesImplementation platform("org.junit:junit-bom:$junit5Version")
testFixturesImplementation testFixtures(project(":servicetalk-concurrent-api"))
testFixturesImplementation testFixtures(project(":servicetalk-transport-netty-internal"))
testFixturesImplementation "com.google.code.findbugs:jsr305:$jsr305Version"
testFixturesImplementation "io.netty:netty-transport"
testFixturesImplementation "io.netty:netty-transport-native-epoll"
testFixturesRuntimeOnly( group:"io.netty", name:"netty-transport-native-epoll", classifier:"linux-x86_64")
testFixturesRuntimeOnly( group:"io.netty", name:"netty-transport-native-epoll", classifier:"linux-aarch_64")
Expand Down
5 changes: 5 additions & 0 deletions servicetalk-transport-netty-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,22 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"
ext.isNettySnapshot = "$nettyVersion".endsWithAny("SNAPSHOT", "+")

dependencies {
api platform("io.netty:netty-bom:$nettyVersion")
api project(":servicetalk-buffer-netty")
api project(":servicetalk-concurrent-api")
api project(":servicetalk-logging-api")
api project(":servicetalk-transport-api")
api "io.netty:netty-buffer"
api "io.netty:netty-common"
api "io.netty:netty-handler"
api "io.netty:netty-transport"

implementation project(":servicetalk-annotations")
implementation project(":servicetalk-concurrent-api-internal")
implementation project(":servicetalk-concurrent-internal")
implementation project(":servicetalk-logging-slf4j-internal")
implementation project(":servicetalk-utils-internal")
implementation "io.netty:netty-codec"
implementation "io.netty:netty-transport-native-epoll"
runtimeOnly( group:"io.netty", name:"netty-transport-native-epoll", classifier:"linux-x86_64")
runtimeOnly( group:"io.netty", name:"netty-transport-native-epoll", classifier:"linux-aarch_64")
Expand Down
1 change: 0 additions & 1 deletion servicetalk-transport-netty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ dependencies {
implementation project(":servicetalk-annotations")
implementation project(":servicetalk-concurrent-internal")
implementation project(":servicetalk-transport-netty-internal")
implementation "io.netty:netty-common"
}
Loading