Revert "#271 Fix loading projects and subprojects (#272)" (#279)

jraska · web-flow · commit 0c2c58987038 · 2024-08-28T19:56:06.000+02:00
This reverts commit 63386c9.
diff --git a/plugin/src/main/kotlin/com/jraska/module/graph/assertion/ModuleGraphAssertionsPlugin.kt b/plugin/src/main/kotlin/com/jraska/module/graph/assertion/ModuleGraphAssertionsPlugin.kt
@@ -29,11 +29,13 @@ class ModuleGraphAssertionsPlugin : Plugin<Project> {
   override fun apply(project: Project) {
     val graphRules = project.extensions.create(GraphRulesExtension::class.java, Api.EXTENSION_ROOT, GraphRulesExtension::class.java)
 
-    project.gradle.projectsEvaluated {
+    project.afterEvaluate {
       addModulesAssertions(project, graphRules)
 
       if (graphRules.assertOnAnyBuild) {
-        project.runAssertionsDirectly(graphRules)
+        project.gradle.projectsEvaluated {
+          project.runAssertionsDirectly(graphRules)
+        }
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,13 @@ class ModuleGraphAssertionsPlugin : Plugin<Project> {`
`29`	`29`	`override fun apply(project: Project) {`
`30`	`30`	`val graphRules = project.extensions.create(GraphRulesExtension::class.java, Api.EXTENSION_ROOT, GraphRulesExtension::class.java)`
`31`	`31`
`32`		`- project.gradle.projectsEvaluated {`
	`32`	`+ project.afterEvaluate {`
`33`	`33`	`addModulesAssertions(project, graphRules)`
`34`	`34`
`35`	`35`	`if (graphRules.assertOnAnyBuild) {`
`36`		`- project.runAssertionsDirectly(graphRules)`
	`36`	`+ project.gradle.projectsEvaluated {`
	`37`	`+ project.runAssertionsDirectly(graphRules)`
	`38`	`+ }`
`37`	`39`	`}`
`38`	`40`	`}`
`39`	`41`	`}`