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

Move configuration to before project evaluation #245

Merged
merged 1 commit into from
Mar 18, 2024
Merged

Move configuration to before project evaluation #245

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 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 @@ -30,7 +30,7 @@
import org.gradle.api.GradleException
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.invocation.Gradle
import org.gradle.api.UnknownDomainObjectException
import org.gradle.api.logging.Logger
import java.io.File

Expand Down Expand Up @@ -115,7 +115,7 @@
var isConfigured = false

@JvmStatic
fun configure(gradle: Gradle, rootProject: Project) {
fun configure(rootProject: Project) {
require(rootProject == rootProject.rootProject) {
"Project provided must be root, project was ${rootProject.path}"
}
Expand Down Expand Up @@ -193,7 +193,11 @@
private fun getInstance(project: Project): AffectedModuleDetector? {
val extensions = project.rootProject.extensions

return extensions.getByName(ROOT_PROP_NAME) as? AffectedModuleDetector
return try {

Check warning on line 196 in affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt

View check run for this annotation

Codecov / codecov/patch

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt#L196 

Added line #L196 was not covered by tests
extensions.getByName(ROOT_PROP_NAME) as? AffectedModuleDetector
} catch (e: UnknownDomainObjectException) {
null

Check warning on line 199 in affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt

View check run for this annotation

Codecov / codecov/patch

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt#L198-L199 

Added lines #L198 - L199 were not covered by tests
}
}

private fun getOrThrow(project: Project): AffectedModuleDetector {
Expand Down
3 changes: 1 addition & 2 deletions ...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 @@ -48,12 +48,11 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {

registerSubprojectConfiguration(project)
registerMainConfiguration(project)
AffectedModuleDetector.configure(project)
registerCustomTasks(project)
registerTestTasks(project)

project.gradle.projectsEvaluated {
AffectedModuleDetector.configure(project.gradle, project)

filterAndroidTests(project)
filterJvmTests(project)
filterCustomTasks(project)
Expand Down
Loading