mirror of
https://github.com/jlengrand/detekt.git
synced 2026-03-10 08:11:23 +00:00
* Use kotlin-stdlib-jdk8 to reduce dependency conflicts - #2527 * Exclude transitive kotlin dependencies from html jvm lib - #2527
This commit is contained in:
@@ -271,7 +271,7 @@ subprojects {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(kotlin("stdlib"))
|
||||
compileOnly(kotlin("stdlib-jdk8"))
|
||||
|
||||
detekt(project(":detekt-cli"))
|
||||
detektPlugins(project(":detekt-formatting"))
|
||||
|
||||
@@ -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"))
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -88,7 +88,7 @@ abstract class DslTestBuilder {
|
||||
|$gradleRepositoriesSection
|
||||
|
|
||||
|dependencies {
|
||||
| implementation(kotlin("stdlib"))
|
||||
| implementation(kotlin("stdlib-jdk8"))
|
||||
|}
|
||||
""".trimMargin()
|
||||
}
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user