Skip to content

Commit 31cc632

Browse files
RBusarowkodiakhq[bot]
authored andcommitted
Apply changes from moduleCheckAuto
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 7124af8 commit 31cc632

6 files changed

Lines changed: 15 additions & 10 deletions

File tree

build-logic/conventions/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ dependencies {
8989
implementation(libs.detekt.gradle)
9090
implementation(libs.dokka.gradle)
9191
implementation(libs.dokka.versioning)
92+
implementation(libs.dokkatoo.plugin)
9293
implementation(libs.dropbox.dependencyGuard)
9394
implementation(libs.google.dagger.api)
94-
implementation(libs.dokkatoo.plugin)
9595
implementation(libs.google.ksp)
9696
implementation(libs.gradle.plugin.publish)
9797
implementation(libs.kotlin.compiler)

build-logic/versions-matrix/src/main/kotlin/modulecheck/builds/matrix/VersionsMatrix.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ class VersionsMatrix(
2222
val kotlinList: List<String>
2323
) {
2424

25-
internal val exclusions = listOf(
26-
Exclusion(anvil = "2.4.9-1-8", kotlin = "1.9.10"),
27-
Exclusion(anvil = "2.4.9-1-8", kotlin = "1.9.22"),
28-
Exclusion(anvil = "2.4.9", kotlin = "1.8.22")
29-
).requireNoDuplicates()
25+
internal val exclusions = listOf<Exclusion>().requireNoDuplicates()
3026

3127
// ORDER MATTERS.
3228
// ...at least with regard to Gradle.

build-logic/versions-matrix/src/main/kotlin/modulecheck/builds/matrix/VersionsMatrixExtension.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ open class Versions @Inject constructor(
6565
companion object {
6666
internal val gradleListDefault = listOf("8.5")
6767
internal val agpListDefault = listOf("8.0.2", "8.1.0")
68-
internal val anvilListDefault = listOf("2.4.9-1-8", "2.4.9")
69-
internal val kotlinListDefault = listOf("1.8.22", "1.9.10", "1.9.22")
68+
internal val anvilListDefault = listOf("2.4.9")
69+
internal val kotlinListDefault = listOf("1.9.22")
7070
}
7171
}
7272

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "jUn
195195
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jUnit" }
196196
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jUnit" }
197197
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "jUnit" }
198-
junit-platform-suite = { module = "org.junit.platformr:junit-platform-suite", version.ref = "jUnit-platform" }
198+
junit-platform-suite = { module = "org.junit.platform:junit-platform-suite", version.ref = "jUnit-platform" }
199199
junit-platform-suite-api = { module = "org.junit.platform:junit-platform-suite-api", version.ref = "jUnit-platform" }
200200
junit-platform-suite-engine = { module = "org.junit.platform:junit-platform-suite-engine", version.ref = "jUnit-platform" }
201201
junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "jUnit" }

modulecheck-gradle/plugin/src/integrationTest/kotlin/modulecheck/gradle/UnusedDependenciesPluginTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ class UnusedDependenciesPluginTest : BaseGradleTest() {
8989
}
9090

9191
@TestFactory
92-
fun `android test fixtures from android DSL should be treated as test fixtures`() = factory {
92+
fun `android test fixtures from android DSL should be treated as test fixtures`() = factory(
93+
exhaustive = true
94+
) {
9395

9496
androidLibrary(":lib1", "com.modulecheck.lib1") {
9597
buildFile {

modulecheck-internal-testing/src/main/kotlin/modulecheck/testing/McVersionMatrix.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ class McVersionMatrix(
4848
AgpDependencyVersion,
4949
::McTestVersions
5050
)
51+
.filter { (_, kotlin, anvil, _) ->
52+
53+
when {
54+
anvil.value.endsWith("-1-8") -> kotlin.value < "1.9.0"
55+
else -> kotlin.value >= "1.9.0"
56+
}
57+
}
5158
}
5259

5360
/** either all permutations or just the last */

0 commit comments

Comments
 (0)