Skip to content

Add check for if project is provided before adding dependent task #119

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

Merged
merged 3 commits into from
Feb 25, 2022
Merged

Add check for if project is provided before adding dependent task #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b7d98d
Add check for if project is provided before adding dependent task
joshafeinberg Feb 22, 2022
2483fd6
Fix function name
joshafeinberg Feb 22, 2022
7c872e3
Ensure using root project
joshafeinberg Feb 25, 2022
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
18 changes: 13 additions & 5 deletions ...duledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ abstract class AffectedModuleDetector {

companion object {
private const val ROOT_PROP_NAME = "AffectedModuleDetectorPlugin"
internal const val MODULES_ARG = "affected_module_detector.modules"
private const val MODULES_ARG = "affected_module_detector.modules"
private const val DEPENDENT_PROJECTS_ARG = "affected_module_detector.dependentProjects"
private const val CHANGED_PROJECTS_ARG = "affected_module_detector.changedProjects"
private const val ENABLE_ARG = "affected_module_detector.enable"
Expand All @@ -119,7 +119,7 @@ abstract class AffectedModuleDetector {
"Project provided must be root, project was ${rootProject.path}"
}

val enabled = rootProject.hasProperty(ENABLE_ARG)
val enabled = isProjectEnabled(rootProject)
if (!enabled) {
setInstance(
rootProject,
Expand Down Expand Up @@ -216,6 +216,10 @@ abstract class AffectedModuleDetector {
)
}

private fun isProjectEnabled(project: Project): Boolean {
return project.hasProperty(ENABLE_ARG)
}

private fun getModulesProperty(project: Project): Set<String>? {
return if (project.hasProperty(MODULES_ARG)) {
val commaDelimited = project.properties[MODULES_ARG] as String
Expand Down Expand Up @@ -273,9 +277,13 @@ abstract class AffectedModuleDetector {
*/
@JvmStatic
fun isProjectProvided(project: Project): Boolean {
return getOrThrow(
project
).isProjectProvided2(project)
val rootProject = project.rootProject
if (!isProjectEnabled(rootProject)) {
// if we do not want to use affected module detector property then assume every project is provided
return true
}
val modules = getModulesProperty(rootProject)
return modules?.contains(project.path) ?: true
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion ...tector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
private fun withPlugin(pluginId: String, task: Task, testType: TestType, project: Project) {
project.pluginManager.withPlugin(pluginId) {
getAffectedPath(testType, project)?.let { path ->
task.dependsOn(path)
if (AffectedModuleDetector.isProjectProvided(project)) {
task.dependsOn(path)
}
project.afterEvaluate {
project.tasks.findByPath(path)?.onlyIf {
AffectedModuleDetector.isProjectAffected(project)
Expand Down