Skip to content

Commit 0144d6e

Browse files
committed
Fup 2
1 parent 512be81 commit 0144d6e

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

driver-core/build.gradle.kts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,18 @@ dependencies {
5858
testImplementation(project(path = ":bson", configuration = "testArtifacts"))
5959
testImplementation(libs.reflections)
6060

61-
testRuntimeOnly(libs.netty.boringssl)
61+
testRuntimeOnly(libs.netty.tcnative.boringssl)
6262
listOf("linux-x86_64", "linux-aarch_64", "osx-x86_64", "osx-aarch_64", "windows-x86_64").forEach { arch ->
63-
testRuntimeOnly(variantOf(libs.netty.boringssl) { classifier(arch) })
63+
testRuntimeOnly(variantOf(libs.netty.tcnative.boringssl) { classifier(arch) })
6464
}
6565
}
6666

67+
configurations.create("consumableTestRuntimeOnly") {
68+
extendsFrom(configurations.testRuntimeOnly.get())
69+
setCanBeConsumed(true)
70+
}
71+
72+
6773
configureMavenPublication {
6874
pom {
6975
name.set("MongoDB Java Driver Core")

driver-legacy/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies {
3333
testImplementation(project(path = ":bson", configuration = "testArtifacts"))
3434
testImplementation(project(path = ":driver-core", configuration = "testArtifacts"))
3535
testImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))
36+
testRuntimeOnly(project(path = ":driver-core", configuration = "consumableTestRuntimeOnly"))
3637
}
3738

3839
configureMavenPublication {

driver-reactive-streams/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ dependencies {
3434

3535
testImplementation(libs.project.reactor.test)
3636
testImplementation(libs.reactive.streams.tck)
37-
testImplementation(project(path = ":driver-sync", configuration = "default")) // TODO check
37+
testImplementation(project(path = ":driver-sync", configuration = "default"))
3838
testImplementation(project(path = ":bson", configuration = "testArtifacts"))
39-
testImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))
4039
testImplementation(project(path = ":driver-core", configuration = "testArtifacts"))
40+
testImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))
41+
testRuntimeOnly(project(path = ":driver-core", configuration = "consumableTestRuntimeOnly"))
4142
}
4243

4344
configureMavenPublication {

driver-scala/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ dependencies {
2828
api(project(path = ":driver-reactive-streams", configuration = "default"))
2929

3030
testImplementation(project(path = ":driver-sync", configuration = "default"))
31-
testImplementation(project(path = ":driver-reactive-streams", configuration = "testArtifacts"))
3231
testImplementation(project(path = ":bson", configuration = "testArtifacts"))
33-
testImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))
3432
testImplementation(project(path = ":driver-core", configuration = "testArtifacts"))
33+
testImplementation(project(path = ":driver-sync", configuration = "testArtifacts"))
34+
testImplementation(project(path = ":driver-reactive-streams", configuration = "testArtifacts"))
35+
testRuntimeOnly(project(path = ":driver-core", configuration = "consumableTestRuntimeOnly"))
3536
}
3637

3738
configureMavenPublication {

driver-sync/build.gradle.kts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ dependencies {
3030
api(project(path = ":bson", configuration = "default"))
3131
api(project(path = ":driver-core", configuration = "default"))
3232

33+
testImplementation(libs.aws.lambda.core)
3334
testImplementation(project(path = ":bson", configuration = "testArtifacts"))
3435
testImplementation(project(path = ":driver-core", configuration = "testArtifacts"))
35-
testImplementation(libs.aws.lambda.core)
36+
testRuntimeOnly(project(path = ":driver-core", configuration = "consumableTestRuntimeOnly"))
3637
}
3738

3839
configureMavenPublication {
@@ -53,9 +54,3 @@ configureJarManifest {
5354
)
5455
.joinToString(",")
5556
}
56-
57-
// TODO confirm checkstyle
58-
// tasks.withType<Checkstyle> {
59-
// // needed so the Javadoc checks can find the code in other modules
60-
// classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output)
61-
// }

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ findbugs-jsr = { module = "com.google.code.findbugs:jsr305", version.ref = "find
164164
groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
165165
hamcrest-all = { module = "org.hamcrest:hamcrest-all", version.ref = "hamcrest" }
166166
logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
167-
netty-boringssl = { module = "io.netty:netty-tcnative-boringssl-static" }
167+
netty-tcnative-boringssl = { module = "io.netty:netty-tcnative-boringssl-static" }
168168
objenesis = { module = "org.objenesis:objenesis", version.ref = "objenesis" }
169169
project-reactor-test = { module = "io.projectreactor:reactor-test" }
170170
reactive-streams-tck = { module = " org.reactivestreams:reactive-streams-tck", version.ref = "reactive-streams" }

0 commit comments

Comments
 (0)