Dependency block to dependencies block

modulecheck-parsing/groovy-antlr/src/main/kotlin/modulecheck/parsing/groovy/antlr/GroovyDependencyBlockParser.kt → modulecheck-parsing/groovy-antlr/src/main/kotlin/modulecheck/parsing/groovy/antlr/GroovyDependenciesBlockParser.kt

@@ -34,7 +34,7 @@ import org.apache.groovy.parser.antlr4.GroovyParserBaseVisitor
 import java.io.File
 import javax.inject.Inject
 
-class GroovyDependencyBlockParser @Inject constructor(
+class GroovyDependenciesBlockParser @Inject constructor(
   private val logger: McLogger
 ) {
 

modulecheck-parsing/groovy-antlr/src/test/kotlin/modulecheck/parsing/groovy/antlr/GroovyDependencyBlockParserTest.kt

@@ -28,7 +28,7 @@ import modulecheck.utils.createSafely
 import org.intellij.lang.annotations.Language
 import org.junit.jupiter.api.Test
 
-internal class GroovyDependencyBlockParserTest : BaseTest() {
+internal class GroovyDependenciesBlockParserTest : BaseTest() {
 
   @Test
   fun `external declaration`() = parse(
@@ -572,7 +572,7 @@ internal class GroovyDependencyBlockParserTest : BaseTest() {
   ) {
     testProjectDir.child("build.gradle")
       .createSafely(fileText.trimIndent())
-      .let { file -> GroovyDependencyBlockParser(PrintLogger()).parse(file) }
+      .let { file -> GroovyDependenciesBlockParser(PrintLogger()).parse(file) }
       .single()
       .assertions()
   }

modulecheck-parsing/psi/src/main/kotlin/modulecheck/parsing/psi/KotlinDependencyBlockParser.kt → modulecheck-parsing/psi/src/main/kotlin/modulecheck/parsing/psi/KotlinDependenciesBlockParser.kt

@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.psiUtil.findDescendantOfType
 import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
 import javax.inject.Inject
 
-class KotlinDependencyBlockParser @Inject constructor(
+class KotlinDependenciesBlockParser @Inject constructor(
   private val logger: McLogger
 ) {
 

modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinDependencyBlockParserTest.kt → modulecheck-parsing/psi/src/test/kotlin/modulecheck/parsing/psi/KotlinDependenciesBlockParserTest.kt

@@ -27,9 +27,9 @@ import modulecheck.project.test.ProjectTest
 import modulecheck.reporting.logging.PrintLogger
 import org.junit.jupiter.api.Test
 
-internal class KotlinDependencyBlockParserTest : ProjectTest() {
+internal class KotlinDependenciesBlockParserTest : ProjectTest() {
 
-  val parser by resets { KotlinDependencyBlockParser(PrintLogger()) }
+  val parser by resets { KotlinDependenciesBlockParser(PrintLogger()) }
 
   @Test
   fun `external declaration`() {
@@ -669,7 +669,7 @@ internal class KotlinDependencyBlockParserTest : ProjectTest() {
     )
   }
 
-  fun KotlinDependencyBlockParser.parse(
+  fun KotlinDependenciesBlockParser.parse(
     string: String,
     project: McProject = simpleProject(buildFileText = string.trimIndent())
   ): List<KotlinDependenciesBlock> = runBlocking { parse(project) }

modulecheck-parsing/wiring/src/main/kotlin/modulecheck/parsing/wiring/RealDependenciesBlocksProvider.kt

@@ -20,15 +20,15 @@ import modulecheck.dagger.AppScope
 import modulecheck.parsing.gradle.dsl.DependenciesBlock
 import modulecheck.parsing.gradle.dsl.DependenciesBlocksProvider
 import modulecheck.parsing.gradle.dsl.InvokesConfigurationNames
-import modulecheck.parsing.groovy.antlr.GroovyDependencyBlockParser
-import modulecheck.parsing.psi.KotlinDependencyBlockParser
+import modulecheck.parsing.groovy.antlr.GroovyDependenciesBlockParser
+import modulecheck.parsing.psi.KotlinDependenciesBlockParser
 import modulecheck.parsing.psi.internal.isKotlinScriptFile
 import javax.inject.Inject
 import javax.inject.Provider
 
 class RealDependenciesBlocksProvider(
-  private val groovyParser: GroovyDependencyBlockParser,
-  private val kotlinParser: KotlinDependencyBlockParser,
+  private val groovyParser: GroovyDependenciesBlockParser,
+  private val kotlinParser: KotlinDependenciesBlockParser,
   private val invokesConfigurationNames: InvokesConfigurationNames
 ) : DependenciesBlocksProvider {
 
@@ -47,8 +47,8 @@ class RealDependenciesBlocksProvider(
 
   @ContributesBinding(AppScope::class)
   class Factory @Inject constructor(
-    private val groovyParserProvider: Provider<GroovyDependencyBlockParser>,
-    private val kotlinParserProvider: Provider<KotlinDependencyBlockParser>
+    private val groovyParserProvider: Provider<GroovyDependenciesBlockParser>,
+    private val kotlinParserProvider: Provider<KotlinDependenciesBlockParser>
   ) : DependenciesBlocksProvider.Factory {
     override fun create(
       invokesConfigurationNames: InvokesConfigurationNames

modulecheck-project/api/src/testFixtures/kotlin/modulecheck/project/test/factories.kt

@@ -23,10 +23,10 @@ import modulecheck.parsing.gradle.model.ProjectPath.StringProjectPath
 import modulecheck.parsing.gradle.model.SourceSetName
 import modulecheck.parsing.gradle.model.SourceSets
 import modulecheck.parsing.groovy.antlr.GroovyAndroidGradleParser
-import modulecheck.parsing.groovy.antlr.GroovyDependencyBlockParser
+import modulecheck.parsing.groovy.antlr.GroovyDependenciesBlockParser
 import modulecheck.parsing.groovy.antlr.GroovyPluginsBlockParser
 import modulecheck.parsing.psi.KotlinAndroidGradleParser
-import modulecheck.parsing.psi.KotlinDependencyBlockParser
+import modulecheck.parsing.psi.KotlinDependenciesBlockParser
 import modulecheck.parsing.psi.KotlinPluginsBlockParser
 import modulecheck.parsing.wiring.FileCache
 import modulecheck.parsing.wiring.RealAndroidDataBindingNameProvider
@@ -166,8 +166,8 @@ fun buildFileParserFactory(logger: McLogger = PrintLogger()): BuildFileParser.Fa
     RealBuildFileParser(
       {
         RealDependenciesBlocksProvider(
-          groovyParser = GroovyDependencyBlockParser(logger),
-          kotlinParser = KotlinDependencyBlockParser(logger),
+          groovyParser = GroovyDependenciesBlockParser(logger),
+          kotlinParser = KotlinDependenciesBlockParser(logger),
           invokesConfigurationNames = invokesConfigurationNames
         )
       },