From aac564872c4c1f59de544e48500d1d31185d1956 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Thu, 18 Apr 2019 11:39:39 +0300 Subject: [PATCH] Scripting, main-kts: temporary workaround to avoid IDE exceptions on Kotlin project Exclude script definition from resources classpath to avoid IDE exceptions on kotlin project. This is done by moving MainKtsScript to new `jar-resources` folder which is not resource root. #EA-127827 #KT-31176 --- libraries/tools/kotlin-main-kts/build.gradle.kts | 3 +++ .../org.jetbrains.kotlin.mainKts.MainKtsScript.classname | 0 2 files changed, 3 insertions(+) rename libraries/tools/kotlin-main-kts/{resources => jar-resources}/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript.classname (100%) diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 4c6067d8f15..e31f648fd1f 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -71,6 +71,9 @@ val packJar by task { from(mainSourceSet.output) from(fatJarContents) + // don't add this files to resources classpath to avoid IDE exceptions on kotlin project + from("jar-resources") + packagesToRelocate.forEach { relocate(it, "$mainKtsRelocatedDepsRootPackage.$it") } diff --git a/libraries/tools/kotlin-main-kts/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript.classname b/libraries/tools/kotlin-main-kts/jar-resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript.classname similarity index 100% rename from libraries/tools/kotlin-main-kts/resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript.classname rename to libraries/tools/kotlin-main-kts/jar-resources/META-INF/kotlin/script/templates/org.jetbrains.kotlin.mainKts.MainKtsScript.classname