jraska · Aug 28, 2024 · Aug 28, 2024 · Sep 2, 2024 · Sep 17, 2024 · Oct 14, 2024
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ A Gradle plugin that helps keep your module graph healthy and lean.
 Apply the plugin to a module, which dependencies graph you want to assert.
 ```groovy
 plugins {
-  id "com.jraska.module.graph.assertion" version "2.7.0"
+  id "com.jraska.module.graph.assertion" version "2.8.0"
 }
 ```
 
@@ -51,6 +51,12 @@ moduleGraphAssert {
 }
 ```
 
+#### Kotlin Multiplatform (KMP)
+```groovy
+  configurations += setOf("commonMainImplementation", "commonMainApi") // different sourceSets defaults
+```
+-  Please see [this issue](https://github.com/jraska/modules-graph-assert/issues/249#issuecomment-2437075587) for details and comment if you face issues.
+
 ### Module name alias
 - You don't have to rely on module names and set a property `ext.moduleNameAssertAlias = "ThisWillBeAssertedOn"`
 - This can be set on any module and the `allowed`/`restricted` rules would use the alias instead of module name for asserting.

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-  ext.kotlin_version = '2.0.20'
+  ext.kotlin_version = '2.1.10'
   repositories {
     mavenCentral()
     gradlePluginPortal()

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.gradle.plugin-publish" version "1.2.1"
+  id "com.gradle.plugin-publish" version "1.3.1"
   id "java-gradle-plugin"
 }
 
@@ -40,7 +40,7 @@ gradlePlugin {
   plugins {
     modulesGraphAssert {
       id = 'com.jraska.module.graph.assertion'
-      version = '2.7.0'
+      version = '2.8.0'
       displayName = 'Modules Graph Assert'
       description = 'Gradle plugin to keep your modules graph healthy and lean.'
       implementationClass = 'com.jraska.module.graph.assertion.ModuleGraphAssertionsPlugin'

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)
+        }
       }
     }
   }

diff --git a/plugin/src/main/kotlin/com/jraska/module/graph/assertion/ModuleTreeHeightAssert.kt b/plugin/src/main/kotlin/com/jraska/module/graph/assertion/ModuleTreeHeightAssert.kt
@@ -1,7 +1,7 @@
 package com.jraska.module.graph.assertion
 
 import com.jraska.module.graph.DependencyGraph
-import org.gradle.api.GradleException
+import org.gradle.api.tasks.VerificationException
 import java.io.Serializable
 
 class ModuleTreeHeightAssert(
@@ -20,15 +20,15 @@ class ModuleTreeHeightAssert(
     val height = dependencyGraph.heightOf(moduleName)
     if (height > maxHeight) {
       val longestPath = dependencyGraph.longestPath(moduleName)
-      throw GradleException("Module $moduleName is allowed to have maximum height of $maxHeight, but has $height, problematic dependencies: ${longestPath.pathString()}")
+      throw VerificationException("Module $moduleName is allowed to have maximum height of $maxHeight, but has $height, problematic dependencies: ${longestPath.pathString()}")
     }
   }
 
   private fun assertWholeGraphHeight(dependencyGraph: DependencyGraph) {
     val height = dependencyGraph.height()
     if (height > maxHeight) {
       val longestPath = dependencyGraph.longestPath()
-      throw GradleException("Module Graph is allowed to have maximum height of $maxHeight, but has $height, problematic dependencies: ${longestPath.pathString()}")
+      throw VerificationException("Module Graph is allowed to have maximum height of $maxHeight, but has $height, problematic dependencies: ${longestPath.pathString()}")
     }
   }
 }
diff --git a/plugin/src/main/kotlin/com/jraska/module/graph/assertion/OnlyAllowedAssert.kt b/plugin/src/main/kotlin/com/jraska/module/graph/assertion/OnlyAllowedAssert.kt
@@ -2,7 +2,7 @@ package com.jraska.module.graph.assertion
 
 import com.jraska.module.graph.DependencyGraph
 import com.jraska.module.graph.Parse
-import org.gradle.api.GradleException
+import org.gradle.api.tasks.VerificationException
 
 class OnlyAllowedAssert(
   private val allowedDependencies: Array<String>,
@@ -18,7 +18,7 @@ class OnlyAllowedAssert(
 
     if (disallowedDependencies.isNotEmpty()) {
       val allowedRules = allowedDependencies.joinToString(", ") { "'$it'" }
-      throw GradleException("$disallowedDependencies not allowed by any of [$allowedRules]")
+      throw VerificationException("$disallowedDependencies not allowed by any of [$allowedRules]")
     }
   }
 }

diff --git a/plugin/src/main/kotlin/com/jraska/module/graph/assertion/RestrictedDependenciesAssert.kt b/plugin/src/main/kotlin/com/jraska/module/graph/assertion/RestrictedDependenciesAssert.kt
@@ -3,7 +3,7 @@ package com.jraska.module.graph.assertion
 import com.jraska.module.graph.DependencyGraph
 import com.jraska.module.graph.Parse
 import com.jraska.module.graph.RegexpDependencyMatcher
-import org.gradle.api.GradleException
+import org.gradle.api.tasks.VerificationException
 
 class RestrictedDependenciesAssert(
   private val errorMatchers: Array<String>,
@@ -20,7 +20,7 @@ class RestrictedDependenciesAssert(
       }.filter { it.second.isNotEmpty() }
 
     if (failedDependencies.isNotEmpty()) {
-      throw GradleException(buildErrorMessage(failedDependencies))
+      throw VerificationException(buildErrorMessage(failedDependencies))
     }
   }
 

diff --git a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/ModuleTreeHeightAssertTest.kt b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/ModuleTreeHeightAssertTest.kt
@@ -1,7 +1,7 @@
 package com.jraska.module.graph.assertion
 
 import com.jraska.module.graph.DependencyGraph
-import org.gradle.api.GradleException
+import org.gradle.api.tasks.VerificationException
 import org.junit.Test
 
 class ModuleTreeHeightAssertTest {
@@ -12,7 +12,7 @@ class ModuleTreeHeightAssertTest {
     ModuleTreeHeightAssert("app", 3).assert(dependencyGraph)
   }
 
-  @Test(expected = GradleException::class)
+  @Test(expected = VerificationException::class)
   fun failsOnTooLargeHeight() {
     val dependencyGraph = testGraph()
 
@@ -26,7 +26,7 @@ class ModuleTreeHeightAssertTest {
     ModuleTreeHeightAssert(null, 3).assert(dependencyGraph)
   }
 
-  @Test(expected = GradleException::class)
+  @Test(expected = VerificationException::class)
   fun failsOnTooHighGraphHeight() {
     val dependencyGraph = testGraph()
 

diff --git a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/OnlyAllowedAssertTest.kt b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/OnlyAllowedAssertTest.kt
@@ -1,11 +1,11 @@
 package com.jraska.module.graph.assertion
 
 import com.jraska.module.graph.DependencyGraph
-import org.gradle.api.GradleException
+import org.gradle.api.tasks.VerificationException
 import org.junit.Test
 
 class OnlyAllowedAssertTest {
-  @Test(expected = GradleException::class)
+  @Test(expected = VerificationException::class)
   fun failsWithNoMatchingMatchers() {
     val dependencyGraph = testGraph()
 
@@ -33,7 +33,7 @@ class OnlyAllowedAssertTest {
     OnlyAllowedAssert(allowedDependencies).assert(dependencyGraph)
   }
 
-  @Test(expected = GradleException::class)
+  @Test(expected = VerificationException::class)
   fun failsWhenOneNotAllowed() {
     val dependencies = testGraph().dependencyPairs().toMutableList().apply { add("api" to "lib2") }
     val dependencyGraph = DependencyGraph.create(dependencies)

diff --git a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/RestrictedDependenciesAssertTest.kt b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/RestrictedDependenciesAssertTest.kt
@@ -1,7 +1,7 @@
 package com.jraska.module.graph.assertion
 
 import com.jraska.module.graph.DependencyGraph
-import org.gradle.api.GradleException
+import org.gradle.api.tasks.VerificationException
 import org.junit.Test
 
 class RestrictedDependenciesAssertTest {
@@ -12,14 +12,14 @@ class RestrictedDependenciesAssertTest {
     RestrictedDependenciesAssert(emptyArray()).assert(dependencyGraph)
   }
 
-  @Test(expected = GradleException::class)
+  @Test(expected = VerificationException::class)
   fun failsWhenFeatureCannotDependOnLib() {
     val dependencyGraph = testGraph()
 
     RestrictedDependenciesAssert(arrayOf("feature -X> lib2")).assert(dependencyGraph)
   }
 
-  @Test(expected = GradleException::class)
+  @Test(expected = VerificationException::class)
   fun failsWhenLibCannotDependOnAndroid() {
     val dependencyGraph = testGraph()
 
@@ -48,7 +48,7 @@ class RestrictedDependenciesAssertTest {
     ).assert(dependencyGraph)
   }
 
-  @Test(expected = GradleException::class)
+  @Test(expected = VerificationException::class)
   fun failsWithMatchersToAlias() {
     val dependencyGraph = DependencyGraph.create(
       "app" to "feature",