Add settings convention for Gradle enterprise

buildSrc/build.gradle.kts

@@ -135,8 +135,7 @@ dependencies {
 
     implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.0.1")
 
-    implementation("org.gradle:test-retry-gradle-plugin:1.5.1")
-    compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.11.2")
+    compileOnly("com.gradle:gradle-enterprise-gradle-plugin:3.12.3")
 
     compileOnly(gradleApi())
 

buildSrc/settings.gradle

@@ -17,6 +17,7 @@ pluginManagement {
 
 plugins {
     id "build-cache"
+    id "gradle-enterprise"
 }
 
 File versionPropertiesFile = new File(rootProject.projectDir.parentFile, "gradle/versions.properties")

buildSrc/src/main/kotlin/common-configuration.gradle.kts

@@ -281,9 +281,7 @@ fun Project.configureTests() {
     // Aggregate task for build related checks
     tasks.register("checkBuild")
 
-    afterEvaluate {
-        apply(from = "$rootDir/gradle/testRetry.gradle.kts")
-    }
+    configureTestRetriesForTestTasks()
 }
 
 // TODO: migrate remaining modules to the new JVM default scheme.

buildSrc/src/main/kotlin/testRetry.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+import org.gradle.api.Project
+import org.gradle.api.tasks.testing.Test
+import com.gradle.enterprise.gradleplugin.testretry.retry
+import org.gradle.kotlin.dsl.withType
+
+fun Project.configureTestRetriesForTestTasks() {
+    val testRetryMaxRetries = findProperty("kotlin.build.testRetry.maxRetries")
+        ?.toString()?.toInt()
+        ?: (if (kotlinBuildProperties.isTeamcityBuild) 3 else 0)
+
+    tasks.withType<Test>().configureEach {
+        retry {
+            maxRetries.set(testRetryMaxRetries)
+            maxFailures.set(20)
+            failOnPassedAfterRetry.set(false)
+        }
+    }
+}