diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e8d7a030..1c6e9c8da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ We use [semantic versioning](http://semver.org/): # Next version - [fix] _agent_: In some cases the hostname was wrongly added to the PID when sending it to Teamscale. +- [fix] _teamscale-gradle-plugin_: Fixed compatibility with Gradle 9.7, which requires report containers to implement `getElements()`. # 37.0.1 - [fix] _agent_: Changed testwise coverage mode to log a warning and finalize an interrupted test as `SKIPPED` (with a calculated duration) if a new test started before the previous `/test/end` event arrived. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..eddabd2ee 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 874732021..c6f915a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-all.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/system-tests/gradle-cucumber/gradle-project/gradle/wrapper/gradle-wrapper.properties b/system-tests/gradle-cucumber/gradle-project/gradle/wrapper/gradle-wrapper.properties index a351597e6..1e922f407 100644 --- a/system-tests/gradle-cucumber/gradle-project/gradle/wrapper/gradle-wrapper.properties +++ b/system-tests/gradle-cucumber/gradle-project/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/system-tests/gradle-multi-module/gradle-project/gradle/wrapper/gradle-wrapper.properties b/system-tests/gradle-multi-module/gradle-project/gradle/wrapper/gradle-wrapper.properties index a351597e6..1e922f407 100644 --- a/system-tests/gradle-multi-module/gradle-project/gradle/wrapper/gradle-wrapper.properties +++ b/system-tests/gradle-multi-module/gradle-project/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/teamscale-gradle-plugin/src/main/kotlin/com/teamscale/utils/Reports.kt b/teamscale-gradle-plugin/src/main/kotlin/com/teamscale/utils/Reports.kt index 051680b04..77435efe6 100644 --- a/teamscale-gradle-plugin/src/main/kotlin/com/teamscale/utils/Reports.kt +++ b/teamscale-gradle-plugin/src/main/kotlin/com/teamscale/utils/Reports.kt @@ -25,6 +25,15 @@ open class Reports(objectFactory: ObjectFactory, clazz: Class) : return this.enabled } + /** + * @implNote Gradle 9.7+ re-declares this as an abstract member of `ReportContainer`. The `@Internal` annotation + * must be repeated here because it is not inherited on the older Gradle versions we still support. + */ + @Internal + override fun getElements(): Provider> { + return reports.elements + } + /** * Adds the specified report to the container. *