Skip to content

Commit 891a046

Browse files
committed
Added the JVM Dependency Conflict Detection Gradle plugin.
1 parent 41163be commit 891a046

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

build-logic/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies {
99
implementation(platform("org.sdkotlin.platforms:plugins-platform"))
1010

1111
implementation(libs.dependency.analysis.gradle.plugin.dependency)
12+
implementation(libs.jvm.dependency.conflict.resolution.gradle.plugin.dependency)
1213
implementation(libs.kotlin.gradle.plugin.dependency)
1314
implementation(libs.ksp.gradle.plugin.dependency)
1415
}

build-logic/src/main/kotlin/org.sdkotlin.buildlogic.kotlin-project.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
// https://github.com/gradle/gradle/issues/15383
88
// alias(libs.plugins.dependency.analysis.gradle.plugin)
99
id("com.autonomousapps.dependency-analysis")
10+
id("org.gradlex.jvm-dependency-conflict-resolution")
1011
}
1112

1213
val javaTargetVersion: String = JavaVersion.VERSION_21.toString()

gradle/libs.versions.toml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ dependency-analysis-gradle-plugin = "1.33.0"
66
equalsverifier = "3.16.2"
77
jetbrains-annotations = "24.1.0"
88
junit = "5.11.0"
9+
jvm-dependency-conflict-resolution = "2.1.2"
910
koin = "3.5.6"
1011
kotest = "5.9.1"
11-
kotlin = "2.0.10" # Must match KSP version below.
12+
kotlin = "2.0.10" # Must match KSP version below.
1213
kotlinpoet = "1.18.1"
1314
kotlinx-coroutines = "1.8.1"
1415
kotlinx-dl = "0.5.2"
@@ -56,6 +57,10 @@ version.ref = "junit"
5657
[libraries.junit-params]
5758
module = "org.junit.jupiter:junit-jupiter-params"
5859

60+
[libraries.jvm-dependency-conflict-resolution-gradle-plugin-dependency]
61+
module = "org.gradlex:jvm-dependency-conflict-resolution"
62+
version.ref = "jvm-dependency-conflict-resolution"
63+
5964
[libraries.koin-bom]
6065
module = "io.insert-koin:koin-bom"
6166
version.ref = "koin"
@@ -202,6 +207,10 @@ mockk-jvm = [
202207
id = "com.autonomousapps.dependency-analysis"
203208
version.ref = "dependency-analysis-gradle-plugin"
204209

210+
[plugins.jvm-dependency-conflict-resolution-gradle-plugin]
211+
id = "org.gradlex.jvm-dependency-conflict-resolution"
212+
version.ref = "jvm-dependency-conflict-resolution"
213+
205214
[plugins.kotlin-gradle-plugin]
206215
id = "org.jetbrains.kotlin.jvm"
207216
version.ref = "kotlin"

tdd-in-kotlin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717

1818
testImplementation(libs.kotest.assertions.shared)
1919
testImplementation(libs.kotest.framework.api.jvm)
20-
testImplementation(libs.bundles.mockk.jvm)
20+
testImplementation(libs.mockk)
2121

2222
testRuntimeOnly(platform("org.sdkotlin.platforms:app-platform"))
2323

0 commit comments

Comments
 (0)