File tree Expand file tree Collapse file tree 4 files changed +13
-2
lines changed Expand file tree Collapse file tree 4 files changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ dependencies {
9
9
implementation(platform(" org.sdkotlin.platforms:plugins-platform" ))
10
10
11
11
implementation(libs.dependency.analysis.gradle.plugin.dependency)
12
+ implementation(libs.jvm.dependency.conflict.resolution.gradle.plugin.dependency)
12
13
implementation(libs.kotlin.gradle.plugin.dependency)
13
14
implementation(libs.ksp.gradle.plugin.dependency)
14
15
}
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ plugins {
7
7
// https://github.com/gradle/gradle/issues/15383
8
8
// alias(libs.plugins.dependency.analysis.gradle.plugin)
9
9
id(" com.autonomousapps.dependency-analysis" )
10
+ id(" org.gradlex.jvm-dependency-conflict-resolution" )
10
11
}
11
12
12
13
val javaTargetVersion: String = JavaVersion .VERSION_21 .toString()
Original file line number Diff line number Diff line change @@ -6,9 +6,10 @@ dependency-analysis-gradle-plugin = "1.33.0"
6
6
equalsverifier = " 3.16.2"
7
7
jetbrains-annotations = " 24.1.0"
8
8
junit = " 5.11.0"
9
+ jvm-dependency-conflict-resolution = " 2.1.2"
9
10
koin = " 3.5.6"
10
11
kotest = " 5.9.1"
11
- kotlin = " 2.0.10" # Must match KSP version below.
12
+ kotlin = " 2.0.10" # Must match KSP version below.
12
13
kotlinpoet = " 1.18.1"
13
14
kotlinx-coroutines = " 1.8.1"
14
15
kotlinx-dl = " 0.5.2"
@@ -56,6 +57,10 @@ version.ref = "junit"
56
57
[libraries .junit-params ]
57
58
module = " org.junit.jupiter:junit-jupiter-params"
58
59
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
+
59
64
[libraries .koin-bom ]
60
65
module = " io.insert-koin:koin-bom"
61
66
version.ref = " koin"
@@ -202,6 +207,10 @@ mockk-jvm = [
202
207
id = " com.autonomousapps.dependency-analysis"
203
208
version.ref = " dependency-analysis-gradle-plugin"
204
209
210
+ [plugins .jvm-dependency-conflict-resolution-gradle-plugin ]
211
+ id = " org.gradlex.jvm-dependency-conflict-resolution"
212
+ version.ref = " jvm-dependency-conflict-resolution"
213
+
205
214
[plugins .kotlin-gradle-plugin ]
206
215
id = " org.jetbrains.kotlin.jvm"
207
216
version.ref = " kotlin"
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ dependencies {
17
17
18
18
testImplementation(libs.kotest.assertions.shared)
19
19
testImplementation(libs.kotest.framework.api.jvm)
20
- testImplementation(libs.bundles. mockk.jvm )
20
+ testImplementation(libs.mockk)
21
21
22
22
testRuntimeOnly(platform(" org.sdkotlin.platforms:app-platform" ))
23
23
You can’t perform that action at this time.
0 commit comments