Skip to content

Make muzzle lax when unable to resolve a dependency #10785

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

Closed
amarziali wants to merge 1 commit into from
+15 −5
Closed

Make muzzle lax when unable to resolve a dependency #10785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/MuzzleTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ abstract class MuzzleTask @Inject constructor(
}

private fun assertMuzzle(muzzleDirective: MuzzleDirective? = null) {
if (muzzleClassPath.get().isEmpty) {
val label = muzzleDirective?.name ?: name
project.logger.warn("Muzzle: skipping $label — classpath could not be resolved")
result.get().asFile.also { it.parentFile.mkdirs() }.writeText("SKIPPED")
return
}
val workQueue = if (muzzleDirective?.javaVersion != null) {
val javaLauncher = javaToolchainService.launcherFor {
languageVersion.set(JavaLanguageVersion.of(muzzleDirective.javaVersion!!))
Expand Down Expand Up @@ -139,16 +145,20 @@ abstract class MuzzleTask @Inject constructor(

private fun createMuzzleClassPath(project: Project, muzzleTaskName: String): FileCollection {
project.logger.info("Creating muzzle classpath for $muzzleTaskName")
val cp = project.files()
val config = if (muzzleTaskName == "muzzle") {
project.configurations.named("compileClasspath").get()
} else {
project.configurations.named(muzzleTaskName).get()
}
cp.from(config)
if (project.logger.isInfoEnabled) {
cp.forEach { project.logger.info("-- $it") }
return try {
val files = config.resolvedConfiguration.files
if (project.logger.isInfoEnabled) {
files.forEach { project.logger.info("-- $it") }
}
project.files(files)
} catch (e: Exception) {
project.logger.warn("Muzzle: could not resolve classpath for $muzzleTaskName, will skip: ${e.message}")
project.files()
}
return cp
}
}