Skip to content

Commit 08635d0

Browse files
committed
rename anything using DependencyBlock to DependenciesBlock
1 parent 7a8cf0a commit 08635d0

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed
+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import org.apache.groovy.parser.antlr4.GroovyParserBaseVisitor
3434
import java.io.File
3535
import javax.inject.Inject
3636

37-
class GroovyDependencyBlockParser @Inject constructor(
37+
class GroovyDependenciesBlockParser @Inject constructor(
3838
private val logger: McLogger
3939
) {
4040

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import modulecheck.utils.createSafely
2828
import org.intellij.lang.annotations.Language
2929
import org.junit.jupiter.api.Test
3030

31-
internal class GroovyDependencyBlockParserTest : BaseTest() {
31+
internal class GroovyDependenciesBlockParserTest : BaseTest() {
3232

3333
@Test
3434
fun `external declaration`() = parse(
@@ -572,7 +572,7 @@ internal class GroovyDependencyBlockParserTest : BaseTest() {
572572
) {
573573
testProjectDir.child("build.gradle")
574574
.createSafely(fileText.trimIndent())
575-
.let { file -> GroovyDependencyBlockParser(PrintLogger()).parse(file) }
575+
.let { file -> GroovyDependenciesBlockParser(PrintLogger()).parse(file) }
576576
.single()
577577
.assertions()
578578
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.psiUtil.findDescendantOfType
3737
import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
3838
import javax.inject.Inject
3939

40-
class KotlinDependencyBlockParser @Inject constructor(
40+
class KotlinDependenciesBlockParser @Inject constructor(
4141
private val logger: McLogger
4242
) {
4343

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import modulecheck.project.test.ProjectTest
2727
import modulecheck.reporting.logging.PrintLogger
2828
import org.junit.jupiter.api.Test
2929

30-
internal class KotlinDependencyBlockParserTest : ProjectTest() {
30+
internal class KotlinDependenciesBlockParserTest : ProjectTest() {
3131

32-
val parser by resets { KotlinDependencyBlockParser(PrintLogger()) }
32+
val parser by resets { KotlinDependenciesBlockParser(PrintLogger()) }
3333

3434
@Test
3535
fun `external declaration`() {
@@ -669,7 +669,7 @@ internal class KotlinDependencyBlockParserTest : ProjectTest() {
669669
)
670670
}
671671

672-
fun KotlinDependencyBlockParser.parse(
672+
fun KotlinDependenciesBlockParser.parse(
673673
string: String,
674674
project: McProject = simpleProject(buildFileText = string.trimIndent())
675675
): List<KotlinDependenciesBlock> = runBlocking { parse(project) }

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import modulecheck.dagger.AppScope
2020
import modulecheck.parsing.gradle.dsl.DependenciesBlock
2121
import modulecheck.parsing.gradle.dsl.DependenciesBlocksProvider
2222
import modulecheck.parsing.gradle.dsl.InvokesConfigurationNames
23-
import modulecheck.parsing.groovy.antlr.GroovyDependencyBlockParser
24-
import modulecheck.parsing.psi.KotlinDependencyBlockParser
23+
import modulecheck.parsing.groovy.antlr.GroovyDependenciesBlockParser
24+
import modulecheck.parsing.psi.KotlinDependenciesBlockParser
2525
import modulecheck.parsing.psi.internal.isKotlinScriptFile
2626
import javax.inject.Inject
2727
import javax.inject.Provider
2828

2929
class RealDependenciesBlocksProvider(
30-
private val groovyParser: GroovyDependencyBlockParser,
31-
private val kotlinParser: KotlinDependencyBlockParser,
30+
private val groovyParser: GroovyDependenciesBlockParser,
31+
private val kotlinParser: KotlinDependenciesBlockParser,
3232
private val invokesConfigurationNames: InvokesConfigurationNames
3333
) : DependenciesBlocksProvider {
3434

@@ -47,8 +47,8 @@ class RealDependenciesBlocksProvider(
4747

4848
@ContributesBinding(AppScope::class)
4949
class Factory @Inject constructor(
50-
private val groovyParserProvider: Provider<GroovyDependencyBlockParser>,
51-
private val kotlinParserProvider: Provider<KotlinDependencyBlockParser>
50+
private val groovyParserProvider: Provider<GroovyDependenciesBlockParser>,
51+
private val kotlinParserProvider: Provider<KotlinDependenciesBlockParser>
5252
) : DependenciesBlocksProvider.Factory {
5353
override fun create(
5454
invokesConfigurationNames: InvokesConfigurationNames

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import modulecheck.parsing.gradle.model.ProjectPath.StringProjectPath
2323
import modulecheck.parsing.gradle.model.SourceSetName
2424
import modulecheck.parsing.gradle.model.SourceSets
2525
import modulecheck.parsing.groovy.antlr.GroovyAndroidGradleParser
26-
import modulecheck.parsing.groovy.antlr.GroovyDependencyBlockParser
26+
import modulecheck.parsing.groovy.antlr.GroovyDependenciesBlockParser
2727
import modulecheck.parsing.groovy.antlr.GroovyPluginsBlockParser
2828
import modulecheck.parsing.psi.KotlinAndroidGradleParser
29-
import modulecheck.parsing.psi.KotlinDependencyBlockParser
29+
import modulecheck.parsing.psi.KotlinDependenciesBlockParser
3030
import modulecheck.parsing.psi.KotlinPluginsBlockParser
3131
import modulecheck.parsing.wiring.FileCache
3232
import modulecheck.parsing.wiring.RealAndroidDataBindingNameProvider
@@ -166,8 +166,8 @@ fun buildFileParserFactory(logger: McLogger = PrintLogger()): BuildFileParser.Fa
166166
RealBuildFileParser(
167167
{
168168
RealDependenciesBlocksProvider(
169-
groovyParser = GroovyDependencyBlockParser(logger),
170-
kotlinParser = KotlinDependencyBlockParser(logger),
169+
groovyParser = GroovyDependenciesBlockParser(logger),
170+
kotlinParser = KotlinDependenciesBlockParser(logger),
171171
invokesConfigurationNames = invokesConfigurationNames
172172
)
173173
},

0 commit comments

Comments
 (0)