From 8993d5d2eb463bf688501338df25c318cc584a91 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Thu, 17 Feb 2022 16:10:18 +0300 Subject: [PATCH] [Build] Detach :liraries:tools:dukat module from root gradle project This is needed to prevent leaking dependency on `dukat:0.5.8-rc.4` into dependency of Kotlin project after import to IDE. This jar contains unshaded classes of some outdated compiler version and it confuses IDEA tooling (like debugger), so it shows those classes instead of real sources from project --- libraries/tools/dukat/build.gradle.kts | 8 ++++++-- libraries/tools/dukat/settings.gradle.kts | 1 + settings.gradle | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 libraries/tools/dukat/settings.gradle.kts diff --git a/libraries/tools/dukat/build.gradle.kts b/libraries/tools/dukat/build.gradle.kts index 9c11a93e15e..40342a26547 100644 --- a/libraries/tools/dukat/build.gradle.kts +++ b/libraries/tools/dukat/build.gradle.kts @@ -1,9 +1,13 @@ plugins { - kotlin("jvm") + kotlin("jvm") version "1.6.10" +} + +repositories { + mavenCentral() + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies") } dependencies { - implementation(kotlinStdlib()) implementation("org.jetbrains.dukat:dukat:0.5.8-rc.4") implementation("org.jsoup:jsoup:1.14.2") } diff --git a/libraries/tools/dukat/settings.gradle.kts b/libraries/tools/dukat/settings.gradle.kts new file mode 100644 index 00000000000..2154d055546 --- /dev/null +++ b/libraries/tools/dukat/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "dukat" diff --git a/settings.gradle b/settings.gradle index 9f68639373e..f0f4d9edf5f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -155,7 +155,6 @@ include ":benchmarks", ":compiler:tests-common-jvm6", ":compiler:tests-against-klib", ":compiler:tests-for-compiler-generator", - ":dukat", ":js:js.ast", ":js:js.sourcemap", ":js:js.serializer", @@ -695,7 +694,6 @@ project(':kotlin-imports-dumper-compiler-plugin').projectDir = "$rootDir/plugins project(':libraries:kotlin-prepush-hook').projectDir = "$rootDir/libraries/tools/kotlin-prepush-hook" as File project(':plugins:jvm-abi-gen').projectDir = "$rootDir/plugins/jvm-abi-gen" as File project(':plugins:jvm-abi-gen-embeddable').projectDir = "$rootDir/plugins/jvm-abi-gen/embeddable" as File -project(":dukat").projectDir = "$rootDir/libraries/tools/dukat" as File project(':js:js.tests').projectDir = "$rootDir/js/js.tests" as File project(':js:js.engines').projectDir = "$rootDir/js/js.engines" as File