Skip to content

Commit

Permalink
Netty's native code is separated from the java code (#2226)
Browse files Browse the repository at this point in the history
*-native-* is the artifact for the native code
*-classes-* is the artifact for the java code

Related to #1873
  • Loading branch information
violetagg committed May 19, 2022
1 parent ecf8384 commit cc2f8fa
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 deletions reactor-netty-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,18 @@ dependencies {
}
else {
// MacOS binaries are not available for Netty SNAPSHOT version
api "io.netty:netty5-resolver-dns-native-macos:$nettyVersion"
api "io.netty:netty5-resolver-dns-classes-macos:$nettyVersion"
}
//transport resolution: typical build forces epoll but not kqueue transitively
//on the other hand, if we want to make transport-specific tests, we'll make all
// native optional at compile time and add correct native/nio to testRuntime
if (project.hasProperty("forceTransport")) {
//so that the main code compiles
compileOnly "io.netty:netty5-transport-native-epoll:$nettyVersion"
compileOnly "io.netty:netty5-transport-native-kqueue:$nettyVersion"
compileOnly "io.netty:netty5-transport-classes-epoll:$nettyVersion"
compileOnly "io.netty:netty5-transport-classes-kqueue:$nettyVersion"
//compileOnly "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
testImplementation "io.netty:netty5-transport-native-epoll:$nettyVersion"
testImplementation "io.netty:netty5-transport-native-kqueue:$nettyVersion"
testImplementation "io.netty:netty5-transport-classes-epoll:$nettyVersion"
testImplementation "io.netty:netty5-transport-classes-kqueue:$nettyVersion"
//testImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
//now we explicitly add correctly qualified native, or do nothing if we want to test NIO
if (forceTransport == "native") {
Expand All @@ -97,9 +97,9 @@ dependencies {
else {
//classic build to be distributed
api "io.netty:netty5-transport-native-epoll:$nettyVersion:linux-x86_64"
compileOnly "io.netty:netty5-transport-native-kqueue:$nettyVersion"
compileOnly "io.netty:netty5-transport-classes-kqueue:$nettyVersion"
//compileOnly "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
testImplementation "io.netty:netty5-transport-native-kqueue:$nettyVersion"
testImplementation "io.netty:netty5-transport-classes-kqueue:$nettyVersion"
//testImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
}

Expand Down
8 changes: 4 additions & 4 deletions reactor-netty-http/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@ dependencies {
}
else {
// MacOS binaries are not available for Netty SNAPSHOT version
api "io.netty:netty5-resolver-dns-native-macos:$nettyVersion"
api "io.netty:netty5-resolver-dns-classes-macos:$nettyVersion"
}
compileOnly "io.netty.contrib:netty-codec-haproxy:$nettyContribVersion"
//transport resolution: typical build forces epoll but not kqueue transitively
//on the other hand, if we want to make transport-specific tests, we'll make all
// native optional at compile time and add correct native/nio to testRuntime
if (project.hasProperty("forceTransport")) {
//so that the main code compiles
compileOnly "io.netty:netty5-transport-native-epoll:$nettyVersion"
compileOnly "io.netty:netty5-transport-native-kqueue:$nettyVersion"
compileOnly "io.netty:netty5-transport-classes-epoll:$nettyVersion"
compileOnly "io.netty:netty5-transport-classes-kqueue:$nettyVersion"
//compileOnly "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
//now we explicitly add correctly qualified native, or do nothing if we want to test NIO
if (forceTransport == "native") {
Expand All @@ -105,7 +105,7 @@ dependencies {
else {
//classic build to be distributed
api "io.netty:netty5-transport-native-epoll:$nettyVersion:linux-x86_64"
compileOnly "io.netty:netty5-transport-native-kqueue:$nettyVersion"
compileOnly "io.netty:netty5-transport-classes-kqueue:$nettyVersion"
//compileOnly "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
}

Expand Down
2 changes: 1 addition & 1 deletion reactor-netty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
compileOnly "io.micrometer:micrometer-core:$micrometerVersion"
compileOnly "io.micrometer:micrometer-tracing-api:$micrometerTracingVersion"
compileOnly "io.netty.contrib:netty-codec-haproxy:$nettyContribVersion"
compileOnly "io.netty:netty5-transport-native-kqueue:$nettyVersion"
compileOnly "io.netty:netty5-transport-classes-kqueue:$nettyVersion"
//compileOnly "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
compileOnly "io.projectreactor.addons:reactor-pool:$reactorPoolVersion"
}
Expand Down

0 comments on commit cc2f8fa

Please sign in to comment.