Skip to content

Commit ff4d271

Browse files
committed
Declared plugins in the root build with apply false so they'll be included in Versions Gradle Plugin checks. Improved version catalog aliases for Gradle plugins.
1 parent 487f7f3 commit ff4d271

File tree

5 files changed

+46
-34
lines changed

5 files changed

+46
-34
lines changed

build-logic/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ dependencies {
1111

1212
implementation(platform("org.sdkotlin.platforms:plugins-platform"))
1313

14-
implementation(libs.dependency.analysis.gradle.plugin.dependency)
15-
implementation(libs.detekt.gradle.plugin.dependency)
16-
implementation(libs.jvm.dependency.conflict.resolution.gradle.plugin.dependency)
17-
implementation(libs.kotlin.gradle.plugin.dependency)
18-
implementation(libs.ksp.gradle.plugin.dependency)
19-
implementation(libs.mokkery.gradle.plugin.dependency)
14+
implementation(libs.dependencyAnalysis.gradlePluginDependency)
15+
implementation(libs.detekt.gradlePluginDependency)
16+
implementation(libs.jvmDependencyConflictResolution.gradlePluginDependency)
17+
implementation(libs.kotlin.gradlePluginDependency)
18+
implementation(libs.ksp.gradlePluginDependency)
19+
implementation(libs.mokkery.gradlePluginDependency)
2020
}

build.gradle.kts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,21 @@ import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL
44

55
plugins {
66
id("base")
7-
alias(libs.plugins.dependency.analysis.gradle.plugin)
7+
alias(libs.plugins.dependencyAnalysis.gradlePlugin)
8+
// Declare with `apply false` to include in Versions Gradle Plugin checks.
9+
alias(libs.plugins.detekt.gradlePlugin) apply false
10+
// Declare with `apply false` to include in Versions Gradle Plugin checks.
11+
alias(libs.plugins.jvmDependencyConflictDetection.gradlePlugin) apply false
12+
// Declare with `apply false` to include in Versions Gradle Plugin checks.
13+
alias(libs.plugins.jvmDependencyConflictResolution.gradlePlugin) apply false
814
// Kotlin plugin declaration needed here for the Dependency Analysis Plugin,
915
// but with `apply false` since the root project itself isn't a Kotlin
1016
// project:
1117
// https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin/wiki/FAQ#typenotpresentexception-type-orgjetbrainskotlingradledslkotlinprojectextension-in-kotlin-jvm-library
12-
alias(libs.plugins.kotlin.gradle.plugin) apply false
13-
alias(libs.plugins.versions.gradle.plugin)
18+
alias(libs.plugins.kotlin.gradlePlugin) apply false
19+
// Declare with `apply false` to include in Versions Gradle Plugin checks.
20+
alias(libs.plugins.mokkery.gradlePlugin) apply false
21+
alias(libs.plugins.versionsCheck.gradlePlugin)
1422
}
1523

1624
dependencyAnalysis {

detekt-rules/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
alias(libs.plugins.kotlin.gradle.plugin)
2+
alias(libs.plugins.kotlin.gradlePlugin)
33
id("jvm-test-suite")
44
}
55

gradle/libs.versions.toml

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
arrow = "2.1.1"
44
assertj = "3.27.3"
5-
dependency-analysis-gradle-plugin = "2.17.0"
5+
dependencyAnalysis-gradlePlugin = "2.17.0"
66
detekt = "1.23.7"
77
equalsverifier = "4.0"
88
jetbrains-annotations = "26.0.2"
99
junit = "5.12.2"
10-
jvm-dependency-conflict-resolution = "2.1.2"
10+
jvmDependencyConflictResolution-gradlePlugin = "2.1.2"
1111
koin = "4.0.4"
1212
kotest = "5.9.1"
1313
kotlin = "2.1.21" # Must match KSP version below.
@@ -21,7 +21,7 @@ mockk = "1.14.2"
2121
mokkery = "2.7.2"
2222
org-json = "20250107"
2323
slf4j = "2.0.17"
24-
versions-gradle-plugin = "0.52.0"
24+
versionsCheck-gradlePlugin = "0.52.0"
2525

2626
[libraries]
2727

@@ -37,15 +37,15 @@ version.ref = "arrow"
3737
module = "org.assertj:assertj-core"
3838
version.ref = "assertj"
3939

40-
[libraries.dependency-analysis-gradle-plugin-dependency]
40+
[libraries.dependencyAnalysis-gradlePluginDependency]
4141
module = "com.autonomousapps.dependency-analysis:com.autonomousapps.dependency-analysis.gradle.plugin"
42-
version.ref = "dependency-analysis-gradle-plugin"
42+
version.ref = "dependencyAnalysis-gradlePlugin"
4343

4444
[libraries.detekt-api]
4545
module = "io.gitlab.arturbosch.detekt:detekt-api"
4646
version.ref = "detekt"
4747

48-
[libraries.detekt-gradle-plugin-dependency]
48+
[libraries.detekt-gradlePluginDependency]
4949
module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin"
5050
version.ref = "detekt"
5151

@@ -71,9 +71,9 @@ version.ref = "junit"
7171
[libraries.junit-params]
7272
module = "org.junit.jupiter:junit-jupiter-params"
7373

74-
[libraries.jvm-dependency-conflict-resolution-gradle-plugin-dependency]
74+
[libraries.jvmDependencyConflictResolution-gradlePluginDependency]
7575
module = "org.gradlex:jvm-dependency-conflict-resolution"
76-
version.ref = "jvm-dependency-conflict-resolution"
76+
version.ref = "jvmDependencyConflictResolution-gradlePlugin"
7777

7878
[libraries.koin-bom]
7979
module = "io.insert-koin:koin-bom"
@@ -91,7 +91,7 @@ module = "io.insert-koin:koin-test"
9191
[libraries.koin-test-junit5]
9292
module = "io.insert-koin:koin-test-junit5"
9393

94-
[libraries.kotlin-gradle-plugin-dependency]
94+
[libraries.kotlin-gradlePluginDependency]
9595
module = "org.jetbrains.kotlin:kotlin-gradle-plugin"
9696
version.ref = "kotlin"
9797

@@ -147,7 +147,7 @@ version.ref = "kotlinx-dl"
147147
module = "com.google.devtools.ksp:symbol-processing-api"
148148
version.ref = "ksp"
149149

150-
[libraries.ksp-gradle-plugin-dependency]
150+
[libraries.ksp-gradlePluginDependency]
151151
module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin"
152152
version.ref = "ksp"
153153

@@ -175,7 +175,7 @@ version.ref = "mockk"
175175
module = "dev.mokkery:mokkery-core"
176176
version.ref = "mokkery"
177177

178-
[libraries.mokkery-gradle-plugin-dependency]
178+
[libraries.mokkery-gradlePluginDependency]
179179
module = "dev.mokkery:mokkery-gradle"
180180
version.ref = "mokkery"
181181

@@ -225,26 +225,30 @@ mockk-jvm = [
225225

226226
[plugins]
227227

228-
[plugins.dependency-analysis-gradle-plugin]
228+
[plugins.dependencyAnalysis-gradlePlugin]
229229
id = "com.autonomousapps.dependency-analysis"
230-
version.ref = "dependency-analysis-gradle-plugin"
230+
version.ref = "dependencyAnalysis-gradlePlugin"
231231

232-
[plugins.detekt-gradle-plugin]
232+
[plugins.detekt-gradlePlugin]
233233
id = "io.gitlab.arturbosch.detekt"
234234
version.ref = "detekt"
235235

236-
[plugins.jvm-dependency-conflict-detection-gradle-plugin]
236+
[plugins.jvmDependencyConflictDetection-gradlePlugin]
237237
id = "org.gradlex.jvm-dependency-conflict-detection"
238-
version.ref = "jvm-dependency-conflict-resolution"
238+
version.ref = "jvmDependencyConflictResolution-gradlePlugin"
239239

240-
[plugins.kotlin-gradle-plugin]
240+
[plugins.jvmDependencyConflictResolution-gradlePlugin]
241+
id = "org.gradlex.jvm-dependency-conflict-resolution"
242+
version.ref = "jvmDependencyConflictResolution-gradlePlugin"
243+
244+
[plugins.kotlin-gradlePlugin]
241245
id = "org.jetbrains.kotlin.jvm"
242246
version.ref = "kotlin"
243247

244-
[plugins.mokkery-gradle-plugin]
248+
[plugins.mokkery-gradlePlugin]
245249
id = "dev.mokkery"
246250
version.ref = "mokkery"
247251

248-
[plugins.versions-gradle-plugin]
252+
[plugins.versionsCheck-gradlePlugin]
249253
id = "com.github.ben-manes.versions"
250-
version.ref = "versions-gradle-plugin"
254+
version.ref = "versionsCheck-gradlePlugin"

platforms/plugins-platform/build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44

55
dependencies {
66
constraints {
7-
api(libs.dependency.analysis.gradle.plugin.dependency)
8-
api(libs.jvm.dependency.conflict.resolution.gradle.plugin.dependency)
9-
api(libs.kotlin.gradle.plugin.dependency)
10-
api(libs.ksp.gradle.plugin.dependency)
7+
api(libs.dependencyAnalysis.gradlePluginDependency)
8+
api(libs.jvmDependencyConflictResolution.gradlePluginDependency)
9+
api(libs.kotlin.gradlePluginDependency)
10+
api(libs.ksp.gradlePluginDependency)
1111
}
1212
}

0 commit comments

Comments
 (0)