From 4008be3f5f32a4b575ac80348ed490c33a0a9809 Mon Sep 17 00:00:00 2001
From: Artur Bosch <arturbosch@gmx.de>
Date: Sat, 28 Mar 2020 13:33:52 +0100
Subject: [PATCH] Use kotlin-stdlib-jdk8 to reduce dependency conflicts - #2527
 (#2538)

* Use kotlin-stdlib-jdk8 to reduce dependency conflicts - #2527

* Exclude transitive kotlin dependencies from html jvm lib - #2527
---
 build.gradle.kts                                            | 2 +-
 detekt-cli/build.gradle.kts                                 | 6 +++++-
 detekt-gradle-plugin/build.gradle.kts                       | 3 ---
 .../kotlin/io/gitlab/arturbosch/detekt/DslTestBuilder.kt    | 2 +-
 detekt-test/build.gradle.kts                                | 4 ++--
 gradle.properties                                           | 1 +
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a1a55632d..c3d29a025 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -271,7 +271,7 @@ subprojects {
     }
 
     dependencies {
-        implementation(kotlin("stdlib"))
+        compileOnly(kotlin("stdlib-jdk8"))
 
         detekt(project(":detekt-cli"))
         detektPlugins(project(":detekt-formatting"))
diff --git a/detekt-cli/build.gradle.kts b/detekt-cli/build.gradle.kts
index 1ed6697c6..30d852e97 100644
--- a/detekt-cli/build.gradle.kts
+++ b/detekt-cli/build.gradle.kts
@@ -4,12 +4,16 @@ application {
 
 val jcommanderVersion: String by project
 val detektVersion: String by project
+val kotlinxHtmlJvmVersion: String by project
 
 dependencies {
+    implementation(kotlin("stdlib-jdk8"))
     implementation(project(":detekt-core"))
     runtimeOnly(project(":detekt-rules"))
     implementation("com.beust:jcommander:$jcommanderVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinxHtmlJvmVersion") {
+        exclude(group = "org.jetbrains.kotlin")
+    }
 
     testImplementation(project(":detekt-test"))
     testImplementation(project(":detekt-rules"))
diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts
index 0d13a435f..2c0f269a1 100644
--- a/detekt-gradle-plugin/build.gradle.kts
+++ b/detekt-gradle-plugin/build.gradle.kts
@@ -1,6 +1,3 @@
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.gradle.api.tasks.testing.logging.TestLogEvent
-
 plugins {
     `java-gradle-plugin`
     id("com.gradle.plugin-publish") version "0.11.0"
diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DslTestBuilder.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DslTestBuilder.kt
index 78af8d9d8..d3af8081a 100644
--- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DslTestBuilder.kt
+++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DslTestBuilder.kt
@@ -88,7 +88,7 @@ abstract class DslTestBuilder {
             |$gradleRepositoriesSection
             |
             |dependencies {
-            |   implementation(kotlin("stdlib"))
+            |   implementation(kotlin("stdlib-jdk8"))
             |}
             """.trimMargin()
     }
diff --git a/detekt-test/build.gradle.kts b/detekt-test/build.gradle.kts
index 014458f89..612bc4a9d 100644
--- a/detekt-test/build.gradle.kts
+++ b/detekt-test/build.gradle.kts
@@ -1,10 +1,10 @@
 val assertjVersion: String by project
 
 dependencies {
+    api(kotlin("stdlib-jdk8"))
+    api(project(":detekt-core"))
     implementation(kotlin("script-runtime"))
     implementation(kotlin("script-util"))
     implementation(kotlin("scripting-compiler-embeddable"))
-
-    api(project(":detekt-core"))
     implementation("org.assertj:assertj-core:$assertjVersion")
 }
diff --git a/gradle.properties b/gradle.properties
index ead900fd1..c7971930f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,6 +10,7 @@ reflectionsVersion=0.9.12
 spekVersion=2.0.10
 yamlVersion=1.26
 mockkVersion=1.9.3
+kotlinxHtmlJvmVersion=0.7.1
 
 # Gradle plugins
 artifactoryVersion=4.15.1