Keep api backwards compatible

Author: rubensousa

projectguard/api/projectguard.api

@@ -14,14 +14,15 @@ public final class com/rubensousa/projectguard/plugin/GuardRule {
 
 public abstract interface class com/rubensousa/projectguard/plugin/GuardScope {
 	public abstract fun applyRule (Lcom/rubensousa/projectguard/plugin/GuardRule;)V
+	public fun deny (Ljava/lang/String;)V
 	public fun deny (Ljava/lang/String;Lgroovy/lang/Closure;)V
 	public abstract fun deny (Ljava/lang/String;Lorg/gradle/api/Action;)V
+	public fun deny (Lorg/gradle/api/internal/catalog/DelegatingProjectDependency;)V
+	public fun deny (Lorg/gradle/api/internal/catalog/DelegatingProjectDependency;Lgroovy/lang/Closure;)V
 	public fun deny (Lorg/gradle/api/internal/catalog/DelegatingProjectDependency;Lorg/gradle/api/Action;)V
+	public fun deny (Lorg/gradle/api/provider/Provider;)V
 	public fun deny (Lorg/gradle/api/provider/Provider;Lgroovy/lang/Closure;)V
 	public abstract fun deny (Lorg/gradle/api/provider/Provider;Lorg/gradle/api/Action;)V
-	public static synthetic fun deny$default (Lcom/rubensousa/projectguard/plugin/GuardScope;Ljava/lang/String;Lorg/gradle/api/Action;ILjava/lang/Object;)V
-	public static synthetic fun deny$default (Lcom/rubensousa/projectguard/plugin/GuardScope;Lorg/gradle/api/internal/catalog/DelegatingProjectDependency;Lorg/gradle/api/Action;ILjava/lang/Object;)V
-	public static synthetic fun deny$default (Lcom/rubensousa/projectguard/plugin/GuardScope;Lorg/gradle/api/provider/Provider;Lorg/gradle/api/Action;ILjava/lang/Object;)V
 }
 
 public abstract interface class com/rubensousa/projectguard/plugin/ModuleRestrictionScope {

projectguard/src/main/kotlin/com/rubensousa/projectguard/plugin/GuardScope.kt

@@ -23,38 +23,63 @@ import org.gradle.api.internal.catalog.DelegatingProjectDependency
 import org.gradle.api.provider.Provider
 import org.gradle.util.internal.ConfigureUtil
 
+private val emptyDenyScope = Action<DenyScope> { }
+
 interface GuardScope {
 
     fun deny(
         dependencyPath: String,
-        action: Action<DenyScope> = Action<DenyScope> { },
+        action: Action<DenyScope>,
     )
 
+    fun deny(
+        provider: Provider<MinimalExternalModuleDependency>,
+        action: Action<DenyScope>,
+    )
+
+    fun applyRule(rule: GuardRule)
+
     fun deny(
         dependencyDelegation: DelegatingProjectDependency,
-        action: Action<DenyScope> = Action<DenyScope> { },
-    ) = deny(dependencyPath = dependencyDelegation.path, action = action)
+        action: Action<DenyScope>,
+    ) {
+        deny(dependencyPath = dependencyDelegation.path, action = action)
+    }
+
+    // Required for groovy compatibility
+    fun deny(dependencyPath: String) {
+        deny(dependencyPath, emptyDenyScope)
+    }
+
+    fun deny(dependencyDelegation: DelegatingProjectDependency) {
+        deny(dependencyDelegation.path, emptyDenyScope)
+    }
 
     fun deny(
         provider: Provider<MinimalExternalModuleDependency>,
-        action: Action<DenyScope> = Action<DenyScope> { },
-    )
+    ) {
+        deny(provider, emptyDenyScope)
+    }
+
+    fun deny(
+        dependencyDelegation: DelegatingProjectDependency,
+        closure: Closure<DenyScope>,
+    ) {
+        deny(dependencyDelegation.path, ConfigureUtil.configureUsing(closure))
+    }
 
-    // Required for groovy compatibility
     fun deny(
         dependencyPath: String,
-        closure: Closure<DenyScope>
+        closure: Closure<DenyScope>,
     ) {
         deny(dependencyPath, ConfigureUtil.configureUsing(closure))
     }
 
-    // Required for groovy compatibility
     fun deny(
         provider: Provider<MinimalExternalModuleDependency>,
-        closure: Closure<DenyScope>
+        closure: Closure<DenyScope>,
     ) {
         deny(provider, ConfigureUtil.configureUsing(closure))
     }
 
-    fun applyRule(rule: GuardRule)
 }

projectguard/src/test/kotlin/com/rubensousa/projectguard/plugin/GroovyIntegrationTest.kt

@@ -71,7 +71,8 @@ class GroovyIntegrationTest {
         pluginRunner.addDependency(from = module, to = dependency)
 
         // then
-        pluginRunner.assertCheckFailureContains(module, reason)
+        pluginRunner.assertCheckFails(module)
+        pluginRunner.assertTaskOutputContains(reason)
     }
 
     @Test
@@ -96,6 +97,7 @@ class GroovyIntegrationTest {
 
         // then
         pluginRunner.assertCheckSucceeds(module)
+        pluginRunner.assertTaskOutputContains("No fatal matches found")
     }
 
 }

projectguard/src/test/kotlin/com/rubensousa/projectguard/plugin/PluginRunner.kt

@@ -48,18 +48,17 @@ class PluginRunner(
         lastResult = result
     }
 
-    fun assertCheckFailureContains(module: String, message: String) {
-        assertCheckFails(module)
-        assertThat(lastResult!!.output).contains(message)
-    }
-
     fun assertCheckSucceeds(module: String) {
         val task = createCheckTask(module)
         val result = gradleRunner.withArguments(task).build()
         assertThat(result.task(task)!!.outcome).isEqualTo(TaskOutcome.SUCCESS)
         lastResult = result
     }
 
+    fun assertTaskOutputContains(message: String){
+        assertThat(lastResult!!.output).contains(message)
+    }
+
     fun addDependency(from: String, to: String, configuration: String = "implementation") {
         temporaryFolder.getRoot().resolve("$from/build.gradle.kts").appendText(
             """