MBS-12266 Clean up in module types plugin

avito-tech · Dec 2, 2021 · 9637d8a · 9637d8a
1 parent 937f327
commit 9637d8a
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 14 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -28,7 +28,7 @@ include(":subprojects:gradle:graphite-config")
 include(":subprojects:gradle:impact")
 include(":subprojects:gradle:impact-shared")
 include(":subprojects:gradle:module-dependencies-graph")
-include(":subprojects:gradle:module-dependencies-shared")
+include(":subprojects:gradle:module-dependencies")
 include(":subprojects:gradle:module-types")
 include(":subprojects:gradle:pre-build")
 include(":subprojects:gradle:process")

diff --git a/subprojects/gradle/impact-shared/build.gradle.kts b/subprojects/gradle/impact-shared/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    api(projects.subprojects.gradle.moduleDependenciesShared)
+    api(projects.subprojects.gradle.moduleDependencies)
 
     implementation(gradleApi())
 

diff --git a/subprojects/gradle/module-dependencies-graph/build.gradle.kts b/subprojects/gradle/module-dependencies-graph/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     compileOnly(gradleApi())
 
-    implementation(projects.subprojects.gradle.moduleDependenciesShared)
+    implementation(projects.subprojects.gradle.moduleDependencies)
     implementation(projects.subprojects.common.math)
     implementation(projects.subprojects.gradle.gradleExtensions)
 

diff --git a/...dule-dependencies-shared/build.gradle.kts → ...adle/module-dependencies/build.gradle.kts b/...dule-dependencies-shared/build.gradle.kts → ...adle/module-dependencies/build.gradle.kts
diff --git a/...pendencies-shared/locking/gradle.lockfile → ...dule-dependencies/locking/gradle.lockfile b/...pendencies-shared/locking/gradle.lockfile → ...dule-dependencies/locking/gradle.lockfile
diff --git a/...odule/configurations/ConfigurationType.kt → ...odule/configurations/ConfigurationType.kt b/...odule/configurations/ConfigurationType.kt → ...odule/configurations/ConfigurationType.kt
diff --git a/...encies/ModuleConfigurationDependencies.kt → ...encies/ModuleConfigurationDependencies.kt b/...encies/ModuleConfigurationDependencies.kt → ...encies/ModuleConfigurationDependencies.kt
diff --git a/subprojects/gradle/module-types/build.gradle.kts b/subprojects/gradle/module-types/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    api(projects.subprojects.gradle.moduleDependenciesShared)
+    api(projects.subprojects.gradle.moduleDependencies)
 
     implementation(projects.subprojects.gradle.gradleExtensions)
     implementation(projects.subprojects.common.problem)

diff --git a/...radle/module-types/src/gradleTest/kotlin/com/avito/android/module_type/ModuleTypesTest.kt b/...radle/module-types/src/gradleTest/kotlin/com/avito/android/module_type/ModuleTypesTest.kt
@@ -44,6 +44,20 @@ internal class ModuleTypesTest : BaseModuleTypesTest() {
         )
     }
 
+    @Test
+    fun `forbidden dependency in implementation - success - warning severity`() {
+        givenProject(
+            severity = Severity.warning,
+            moduleType = LibraryModule,
+            dependency = Dependency(FeatureModule),
+            constraint = Constraint(module = LibraryModule, dependency = FeatureModule)
+        )
+
+        val result = runCheck(projectDir, expectFailure = false)
+
+        result.assertThat().outputContains(briefErrorMessage)
+    }
+
     @Test
     fun `forbidden test dependency in implementation - failure`() {
         givenProject(

diff --git a/...radle/module-types/src/main/kotlin/com/avito/android/module_type/DependencyRestriction.kt b/...radle/module-types/src/main/kotlin/com/avito/android/module_type/DependencyRestriction.kt
@@ -7,15 +7,16 @@ public class DependencyRestriction(
     public val exclusions: Set<DependencyMatcher> = emptySet(),
     @Deprecated("Use matcher's description instead. This property is not used and will be deleted.")
     public val description: String = ""
-)
+) {
 
-internal fun DependencyRestriction.isViolated(
-    module: ModuleWithType,
-    dependency: ModuleWithType,
-    configuration: ConfigurationType
-): Boolean {
-    val isExcluded = exclusions.any {
-        it.matches(module, dependency, configuration)
+    internal fun isViolated(
+        module: ModuleWithType,
+        dependency: ModuleWithType,
+        configuration: ConfigurationType
+    ): Boolean {
+        val isExcluded = exclusions.any {
+            it.matches(module, dependency, configuration)
+        }
+        return !isExcluded && matcher.matches(module, dependency, configuration)
     }
-    return !isExcluded && matcher.matches(module, dependency, configuration)
 }
diff --git a/...types/src/main/kotlin/com/avito/android/module_type/internal/ModulesRestrictionsFinder.kt b/...types/src/main/kotlin/com/avito/android/module_type/internal/ModulesRestrictionsFinder.kt
@@ -4,7 +4,6 @@ import com.avito.android.Problem
 import com.avito.android.asRuntimeException
 import com.avito.android.module_type.DependencyRestriction
 import com.avito.android.module_type.ModuleWithType
-import com.avito.android.module_type.isViolated
 import com.avito.android.module_type.pluginId
 import com.avito.module.configurations.ConfigurationType