Move Gradle Doctor conventions to build-logic

ktorio · Jan 17, 2025 · fc73b74 · fc73b74
1 parent 6cba3b1
commit fc73b74
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -11,6 +11,7 @@ dependencies {
     implementation(libs.kotlin.gradlePlugin)
     implementation(libs.dokka.gradlePlugin)
     implementation(libs.develocity)
+    implementation(libs.gradleDoctor)
 
     // A hack to make version catalogs accessible from buildSrc sources
     // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192

diff --git a/...otlin/conventions.gradleDoctor.gradle.kts → ...c/main/kotlin/ktorbuild.doctor.gradle.kts b/...otlin/conventions.gradleDoctor.gradle.kts → ...c/main/kotlin/ktorbuild.doctor.gradle.kts
@@ -1,10 +1,12 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
+import ktorbuild.internal.ktorBuild
 import org.gradle.api.services.internal.RegisteredBuildServiceProvider
 
 plugins {
+    id("ktorbuild.base")
     id("com.osacky.doctor")
 }
 
@@ -21,8 +23,8 @@ doctor {
 
 // Always monitor tasks on CI, but disable it locally by default with providing an option to opt-in.
 // See 'doctor.enableTaskMonitoring' in gradle.properties for details.
-val enableTasksMonitoring = System.getenv("TEAMCITY_VERSION") != null ||
-    properties.getOrDefault("doctor.enableTaskMonitoring", "false").toString().toBoolean()
+val enableTasksMonitoring = ktorBuild.isCI.get() ||
+    findProperty("doctor.enableTaskMonitoring")?.toString().toBoolean()
 
 if (!enableTasksMonitoring) {
     logger.info("Gradle Doctor task monitoring is disabled.")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -32,9 +32,8 @@ extra["nonDefaultProjectStructure"] = mutableListOf(
 apply(from = "gradle/compatibility.gradle")
 
 plugins {
-    id("ktorbuild.base")
+    id("ktorbuild.doctor")
     alias(libs.plugins.binaryCompatibilityValidator)
-    conventions.gradleDoctor
 }
 
 println("Build version: ${project.version}")

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -11,7 +11,6 @@ dependencies {
     implementation(libs.kotlin.serialization)
 
     implementation(libs.kotlinter)
-    implementation(libs.gradleDoctor)
 
     // A hack to make version catalogs accessible from buildSrc sources
     // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192