Skip to content
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

Jump to bottom

Made isRequiredBy compatible with composite gradle builds #460

Merged
merged 2 commits into from
Oct 10, 2024
Merged

Made isRequiredBy compatible with composite gradle builds #460

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a02a592
Made isRequiredBy compatible with composite gradle builds
jamesbassett Oct 9, 2024
efd2541
Address review comment - no need for TaskDependency wrapper
jamesbassett Oct 10, 2024
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
25 changes: 23 additions & 2 deletions src/main/groovy/com/avast/gradle/dockercompose/TasksConfigurator.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import groovy.transform.PackageScope
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.provider.Provider
import org.gradle.api.tasks.TaskDependency
import org.gradle.api.tasks.TaskProvider
import org.gradle.process.JavaForkOptions
import org.gradle.process.ProcessForkOptions
Expand Down Expand Up @@ -122,15 +123,35 @@ class TasksConfigurator {
void isRequiredByCore(Task task, boolean fromConfigure) {
task.dependsOn upTask
task.finalizedBy downTask
def taskDependencies = getTaskDependencies(task)
if (fromConfigure) {
upTask.get().shouldRunAfter task.taskDependencies
upTask.get().shouldRunAfter taskDependencies
} else {
upTask.configure { it.shouldRunAfter task.taskDependencies }
upTask.configure { it.shouldRunAfter taskDependencies }
augi marked this conversation as resolved.
Show resolved Hide resolved
}
if (task instanceof ProcessForkOptions) task.doFirst { composeSettings.exposeAsEnvironment(task as ProcessForkOptions) }
if (task instanceof JavaForkOptions) task.doFirst { composeSettings.exposeAsSystemProperties(task as JavaForkOptions) }
}

private TaskDependency getTaskDependencies(Task task) {
def includedBuilds = task.project.gradle.includedBuilds
if (includedBuilds.isEmpty()) {
return task.taskDependencies
} else {
// Ignore any task dependencies from a composite/included build by delegating to a lazily filtered TaskDependency implementation
// to avoid the "Cannot use shouldRunAfter to reference tasks from another build" error introduced in Gradle 8
def includedBuildProjectNames = includedBuilds.collect { it.name }.toSet()
return new TaskDependency() {
Set<? extends Task> getDependencies(Task t) {
task.taskDependencies.getDependencies(t).findAll { dependency ->
// use rootProject.name in case the task is from a multi-module composite build
!includedBuildProjectNames.contains(dependency.project.rootProject.name)
}
}
}
}
}

@PackageScope
Map<String, ServiceInfo> getServicesInfos() {
upTask.get().servicesInfos
Expand Down