From 71b07a72e3144e3718be95ae3fc711c5f2200c76 Mon Sep 17 00:00:00 2001 From: Marcel Richter Date: Wed, 15 Nov 2023 02:33:20 +0100 Subject: [PATCH] Add workaround for https://detekt.dev/docs/gettingstarted/gradle/#gradle-runtime-dependencies and https://github.com/detekt/detekt/issues/6428#issuecomment-1779291878 --- .../src/main/kotlin/kotlin-conventions.gradle.kts | 12 ++++++++++++ gradle/libs.versions.toml | 1 + 2 files changed, 13 insertions(+) diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts index 2dbe14d..111b19c 100644 --- a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts @@ -81,3 +81,15 @@ tasks.withType().configureEach { // Target version of the generated JVM bytecode. It is used for type resolution. this.jvmTarget = JDK_VERSION } + +afterEvaluate { + // Workaround for https://detekt.dev/docs/gettingstarted/gradle/#gradle-runtime-dependencies + // and https://github.com/detekt/detekt/issues/6428#issuecomment-1779291878 + configurations.matching { it.name == "detekt" }.all { + resolutionStrategy.eachDependency { + if (requested.group == "org.jetbrains.kotlin") { + useVersion(libs.findVersion("kotlinForDetekt").get().toString()) + } + } + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f0e92e3..c9f3b17 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,7 @@ kotlin-logging = "3.0.5" lorem = "2.2" j2html = "1.6.0" kotlin = "1.8.10" +kotlinForDetekt = "1.9.10" springBoot = "3.1.5" dokka = "1.9.10" detekt = "1.23.3"