@@ -22,9 +22,13 @@ dependencies {
2222 testInstrumentation(project(" :instrumentation:rxjava:rxjava-2.0:javaagent" ))
2323 testInstrumentation(project(" :instrumentation:vertx:vertx-http-client:vertx-http-client-3.0:javaagent" ))
2424 testInstrumentation(project(" :instrumentation:vertx:vertx-http-client:vertx-http-client-4.0:javaagent" ))
25+ testInstrumentation(project(" :instrumentation:vertx:vertx-http-client:vertx-http-client-5.0:javaagent" ))
26+ testInstrumentation(project(" :instrumentation:vertx:vertx-sql-client:vertx-sql-client-5.0:javaagent" ))
2527 testInstrumentation(project(" :instrumentation:vertx:vertx-web-3.0:javaagent" ))
2628}
2729
30+ val testLatestDeps = findProperty(" testLatestDeps" ) as Boolean
31+
2832testing {
2933 suites {
3034 val version35Test by registering(JvmTestSuite ::class ) {
@@ -33,50 +37,54 @@ testing {
3337 // inclusion of this artifact inside :testing-common
3438 compileOnly(project.dependencies.project(" :testing:armeria-shaded-for-testing" , configuration = " shadow" ))
3539
40+ val version = if (testLatestDeps) " 3.+" else " 3.5.0"
3641 implementation(" org.hsqldb:hsqldb:2.3.4" )
37- compileOnly(" io.vertx:vertx-codegen:$vertxVersion " )
38- implementation(" io.vertx:vertx-web:$vertxVersion " )
39- implementation(" io.vertx:vertx-rx-java2:$vertxVersion " )
40- implementation(" io.vertx:vertx-web-client:$vertxVersion " )
41- implementation(" io.vertx:vertx-jdbc-client:$vertxVersion " )
42- implementation(" io.vertx:vertx-circuit-breaker:$vertxVersion " )
42+ compileOnly(" io.vertx:vertx-codegen:$version " )
43+ implementation(" io.vertx:vertx-web:$version " )
44+ implementation(" io.vertx:vertx-rx-java2:$version " )
45+ implementation(" io.vertx:vertx-web-client:$version " )
46+ implementation(" io.vertx:vertx-jdbc-client:$version " )
47+ implementation(" io.vertx:vertx-circuit-breaker:$version " )
4348 }
4449 }
4550
46- val latestDepTest by registering(JvmTestSuite ::class ) {
51+ val version41Test by registering(JvmTestSuite ::class ) {
4752 dependencies {
4853 // this only exists to make Intellij happy since it doesn't (currently at least) understand our
4954 // inclusion of this artifact inside :testing-common
5055 compileOnly(project.dependencies.project(" :testing:armeria-shaded-for-testing" , configuration = " shadow" ))
5156
57+ val version = if (testLatestDeps) " 4.+" else " 4.1.0"
5258 implementation(" org.hsqldb:hsqldb:2.3.4" )
53- implementation(" io.vertx:vertx-web:4.+" )
54- implementation(" io.vertx:vertx-rx-java2:4.+" )
55- implementation(" io.vertx:vertx-web-client:4.+" )
56- implementation(" io.vertx:vertx-jdbc-client:4.+" )
57- implementation(" io.vertx:vertx-circuit-breaker:4.+" )
59+ compileOnly(" io.vertx:vertx-codegen:$version " )
60+ implementation(" io.vertx:vertx-web:$version " )
61+ implementation(" io.vertx:vertx-rx-java2:$version " )
62+ implementation(" io.vertx:vertx-web-client:$version " )
63+ implementation(" io.vertx:vertx-jdbc-client:$version " )
64+ implementation(" io.vertx:vertx-circuit-breaker:$version " )
5865 }
5966 }
60- }
61- }
6267
63- val testLatestDeps = findProperty(" testLatestDeps" ) as Boolean
68+ val version5Test by registering(JvmTestSuite ::class ) {
69+ dependencies {
70+ // this only exists to make Intellij happy since it doesn't (currently at least) understand our
71+ // inclusion of this artifact inside :testing-common
72+ compileOnly(project.dependencies.project(" :testing:armeria-shaded-for-testing" , configuration = " shadow" ))
6473
65- tasks {
66- if (testLatestDeps) {
67- // disable regular test running and compiling tasks when latest dep test task is run
68- named(" test" ) {
69- enabled = false
70- }
71- named(" compileTestGroovy" ) {
72- enabled = false
74+ val version = if (testLatestDeps) " latest.release" else " 5.0.0"
75+ implementation(" org.hsqldb:hsqldb:2.3.4" )
76+ compileOnly(" io.vertx:vertx-codegen:$version " )
77+ implementation(" io.vertx:vertx-web:$version " )
78+ implementation(" io.vertx:vertx-rx-java2:$version " )
79+ implementation(" io.vertx:vertx-web-client:$version " )
80+ implementation(" io.vertx:vertx-jdbc-client:$version " )
81+ implementation(" io.vertx:vertx-circuit-breaker:$version " )
82+ }
7383 }
7484 }
85+ }
7586
76- named(" latestDepTest" ) {
77- enabled = testLatestDeps
78- }
79-
87+ tasks {
8088 check {
8189 dependsOn(testing.suites)
8290 }
0 commit comments