Skip to content

Commit fe19974

Browse files
committed
Update Gradle Enterprise plugin to 3.12.1
The Gradle Enterprise plugin now includes test retry functionality so the Test Retry plugin is removed to avoid conflict. Closes #3113. Closes #3114.
1 parent 324802d commit fe19974

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

buildSrc/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ dependencies {
1515
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.11.0")
1616
implementation("com.github.ben-manes:gradle-versions-plugin:0.42.0")
1717
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
18-
implementation("org.gradle:test-retry-gradle-plugin:1.4.1")
19-
compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.11.2") // keep in sync with root settings.gradle.kts
18+
compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.1") // keep in sync with root settings.gradle.kts
2019
}
2120

2221
tasks {

buildSrc/src/main/kotlin/testing-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import com.gradle.enterprise.gradleplugin.testretry.retry
12
import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
23
import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
34
import org.gradle.internal.os.OperatingSystem
45

56
plugins {
67
`java-library`
7-
id("org.gradle.test-retry")
88
}
99

1010
tasks.withType<Test>().configureEach {

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pluginManagement {
55
gradlePluginPortal()
66
}
77
plugins {
8-
id("com.gradle.enterprise") version "3.11.2" // keep in sync with buildSrc/build.gradle.kts
8+
id("com.gradle.enterprise") version "3.12.1" // keep in sync with buildSrc/build.gradle.kts
99
id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2"
1010
id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
1111
id("org.ajoberstar.git-publish") version "4.1.1"

0 commit comments

Comments
 (0)