@@ -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,66 @@ 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"
41+ implementation(" org.hsqldb:hsqldb:2.3.4" )
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 " )
48+ }
49+ }
50+
51+ val version41Test by registering(JvmTestSuite ::class ) {
52+ dependencies {
53+ // this only exists to make Intellij happy since it doesn't (currently at least) understand our
54+ // inclusion of this artifact inside :testing-common
55+ compileOnly(project.dependencies.project(" :testing:armeria-shaded-for-testing" , configuration = " shadow" ))
56+
57+ val version = if (testLatestDeps) " 4.+" else " 4.1.0"
3658 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 " )
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 " )
4365 }
4466 }
4567
46- val latestDepTest by registering(JvmTestSuite ::class ) {
68+ val version5Test by registering(JvmTestSuite ::class ) {
4769 dependencies {
4870 // this only exists to make Intellij happy since it doesn't (currently at least) understand our
4971 // inclusion of this artifact inside :testing-common
5072 compileOnly(project.dependencies.project(" :testing:armeria-shaded-for-testing" , configuration = " shadow" ))
5173
74+ val version = if (testLatestDeps) " latest.release" else " 5.0.0"
5275 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.+" )
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 " )
5882 }
5983 }
6084 }
6185}
6286
63- val testLatestDeps = findProperty(" testLatestDeps" ) as Boolean
64-
6587tasks {
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" ) {
88+ named(" compileVersion5TestJava" , JavaCompile ::class ).configure {
89+ options.release.set(11 )
90+ }
91+ val testJavaVersion =
92+ gradle.startParameter.projectProperties.get(" testJavaVersion" )?.let (JavaVersion ::toVersion)
93+ ? : JavaVersion .current()
94+ if (! testJavaVersion.isCompatibleWith(JavaVersion .VERSION_11 )) {
95+ named(" version5Test" , Test ::class ).configure {
7296 enabled = false
7397 }
7498 }
7599
76- named(" latestDepTest" ) {
77- enabled = testLatestDeps
78- }
79-
80100 check {
81101 dependsOn(testing.suites)
82102 }
0 commit comments