From ada3edb22213ca4080ba128bceffcc681f78f546 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 16 Apr 2019 13:50:52 +0200 Subject: [PATCH] Fix after rebase - adapting to the new idea plugin handling scheme --- plugins/scripting/scripting-compiler-impl/build.gradle.kts | 2 -- plugins/scripting/scripting-idea/build.gradle.kts | 2 -- prepare/idea-plugin/build.gradle.kts | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts index d0e6b11451d..08663c26046 100644 --- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts @@ -49,8 +49,6 @@ javadocJar() dist() -ideaPlugin() - projectTest { workingDir = rootDir } diff --git a/plugins/scripting/scripting-idea/build.gradle.kts b/plugins/scripting/scripting-idea/build.gradle.kts index a3df6b0cd78..05a2a53bf0b 100644 --- a/plugins/scripting/scripting-idea/build.gradle.kts +++ b/plugins/scripting/scripting-idea/build.gradle.kts @@ -22,5 +22,3 @@ sourceSets { runtimeJar() -ideaPlugin() - diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 9177ea4377b..a0f5b68b6d8 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -78,6 +78,7 @@ val projectsToShadow by extra(listOf( ":kotlin-noarg-compiler-plugin", ":kotlin-sam-with-receiver-compiler-plugin", ":kotlin-scripting-idea", + ":kotlin-scripting-compiler-impl", ":kotlinx-serialization-compiler-plugin", ":kotlinx-serialization-ide-plugin", ":idea:idea-android",