Skip to content

Commit 38171d1

Browse files
Bump to Gradle 9.5.1 (#11436)
Bump to Gradle 9.5.1 Co-authored-by: AlexeyKuznetsov-DD <alexey.kuznetsov@datadoghq.com>
1 parent 58efd1c commit 38171d1

5 files changed

Lines changed: 27 additions & 29 deletions

File tree

buildSrc/src/main/kotlin/dd-trace-java.configure-tests.gradle.kts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,17 @@ tasks.withType<Test>().configureEach {
6363
onlyIf("skipForkedTests are undefined or false") { !skipForkedTestsProvider.isPresent }
6464
} else {
6565
exclude("**/*ForkedTest*")
66+
// Starting from Gradle 9.3, Gradle will fail if a test task has no discovered tests.
67+
// While this can be a misconfiguration, dd-trace-java test suite conventions allow suites
68+
// to contain abstract base classes that are extended by concrete forked test suites.
69+
//
70+
// Many instrumentation suites indeed only ship *ForkedTest concrete classes
71+
// (the non-forked peer task created by `addTestSuiteExtendingForDir` exists only
72+
// to host shared configurations/sources). Those test tasks won't have executable tests
73+
// by design under the `**/*ForkedTest*` exclude rule above. So let's allow them.
74+
//
75+
// Related but not the issue here https://github.com/gradle/gradle/issues/36508
76+
failOnNoDiscoveredTests = false
6677
}
6778

6879
// Set test timeout for 20 minutes. Default job timeout is 1h (configured on CI level).

gradle/wrapper/gradle-wrapper.jar

4.59 KB
Binary file not shown.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=6f74b601422d6d6fc4e1f9a1ab6522f642c2fdcbc15ae33ebd30ba3d7198e854
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
3+
distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
55
networkTimeout=10000
6+
retries=0
7+
retryBackOffMs=500
68
validateDistributionUrl=true
79
zipStoreBase=GRADLE_USER_HOME
810
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 10 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)