Skip to content

Commit c67c042

Browse files
Move configuration to before project evaluation (#245)
1 parent 312b8e0 commit c67c042

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import com.dropbox.affectedmoduledetector.util.toPathSections
3030
import org.gradle.api.GradleException
3131
import org.gradle.api.Project
3232
import org.gradle.api.Task
33-
import org.gradle.api.invocation.Gradle
33+
import org.gradle.api.UnknownDomainObjectException
3434
import org.gradle.api.logging.Logger
3535
import java.io.File
3636

@@ -115,7 +115,7 @@ abstract class AffectedModuleDetector {
115115
var isConfigured = false
116116

117117
@JvmStatic
118-
fun configure(gradle: Gradle, rootProject: Project) {
118+
fun configure(rootProject: Project) {
119119
require(rootProject == rootProject.rootProject) {
120120
"Project provided must be root, project was ${rootProject.path}"
121121
}
@@ -193,7 +193,11 @@ abstract class AffectedModuleDetector {
193193
private fun getInstance(project: Project): AffectedModuleDetector? {
194194
val extensions = project.rootProject.extensions
195195

196-
return extensions.getByName(ROOT_PROP_NAME) as? AffectedModuleDetector
196+
return try {
197+
extensions.getByName(ROOT_PROP_NAME) as? AffectedModuleDetector
198+
} catch (e: UnknownDomainObjectException) {
199+
null
200+
}
197201
}
198202

199203
private fun getOrThrow(project: Project): AffectedModuleDetector {

affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,11 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
4848

4949
registerSubprojectConfiguration(project)
5050
registerMainConfiguration(project)
51+
AffectedModuleDetector.configure(project)
5152
registerCustomTasks(project)
5253
registerTestTasks(project)
5354

5455
project.gradle.projectsEvaluated {
55-
AffectedModuleDetector.configure(project.gradle, project)
56-
5756
filterAndroidTests(project)
5857
filterJvmTests(project)
5958
filterCustomTasks(project)

0 commit comments

Comments
 (0)