Skip to content

Added missing configuration of Spotless to buildSrc module. #10085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexeyKuznetsov-DD wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added missing configuration of Spotless to buildSrc module. #10085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ae306c
Added missing configuration of `Spotless` to `buildSrc` module.
AlexeyKuznetsov-DD Dec 4, 2025
48547a9
Moved Spotless config to root script.
AlexeyKuznetsov-DD Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,41 @@ plugins {
id("com.diffplug.spotless") version "8.1.0"
}

spotless {
java {
toggleOffOn()
target("**/*.java")

googleJavaFormat("1.32.0")
}

kotlin {
toggleOffOn()
target("**/*.kt")

ktlint("1.8.0").editorConfigOverride(
// Disable trailing comma rules to minimize diff.
mapOf(
"ktlint_standard_trailing-comma-on-call-site" to "disabled",
"ktlint_standard_trailing-comma-on-declaration-site" to "disabled"
)
)
}

kotlinGradle {
toggleOffOn()
target("**/*.gradle.kts")

ktlint("1.8.0").editorConfigOverride(
// Disable trailing comma rules to minimize diff.
mapOf(
"ktlint_standard_trailing-comma-on-call-site" to "disabled",
"ktlint_standard_trailing-comma-on-declaration-site" to "disabled"
)
)
}
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(8)
Expand Down
12 changes: 0 additions & 12 deletions buildSrc/call-site-instrumentation-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
plugins {
java
groovy
id("com.diffplug.spotless") version "8.1.0"
id("com.gradleup.shadow") version "8.3.6"
}

Expand All @@ -10,17 +9,6 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8
}

spotless {
java {
toggleOffOn()
// set explicit target to workaround https://github.com/diffplug/spotless/issues/1163
target("src/**/*.java")
// ignore embedded test projects
targetExclude("src/test/resources/**")
googleJavaFormat("1.32.0")
}
}

apply {
from("$rootDir/../gradle/repositories.gradle")
}
Expand Down
12 changes: 7 additions & 5 deletions buildSrc/src/main/kotlin/datadog/gradle/plugin/ci/CIJobsExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,20 @@ import org.gradle.kotlin.dsl.extra
/**
* Returns the task's path, given affected projects, if this task or its dependencies are affected by git changes.
*/
internal fun findAffectedTaskPath(baseTask: Task, affectedProjects: Map<Project, Set<String>>): String? {
internal fun findAffectedTaskPath(
baseTask: Task,
affectedProjects: Map<Project, Set<String>>
): String? {
val visited = mutableSetOf<Task>()
val queue = mutableListOf(baseTask)

while (queue.isNotEmpty()) {
val t = queue.removeAt(0)
if (visited.contains(t)) {
continue
}
visited.add(t)

val affectedTasks = affectedProjects[t.project]
if (affectedTasks != null) {
if (affectedTasks.contains("all")) {
Expand All @@ -27,7 +30,7 @@ internal fun findAffectedTaskPath(baseTask: Task, affectedProjects: Map<Project,
return "${t.project.path}:${t.name}"
}
}

t.taskDependencies.getDependencies(t).forEach { queue.add(it) }
}
return null
Expand Down Expand Up @@ -106,4 +109,3 @@ fun Project.testAggregate(
createRootTask("${baseTaskName}LatestDepTest", "allLatestDepTests", includePrefixes, excludePrefixes, forceCoverage)
createRootTask("${baseTaskName}Check", "check", includePrefixes, excludePrefixes, forceCoverage)
}

Loading