From 42cfacdf0c6affe19fca17b54f536b24af5e54da Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Tue, 8 May 2018 16:16:11 +0300 Subject: [PATCH] Build: Extract j2k to standalone jar --- j2k/build.gradle.kts | 2 ++ j2k/build.gradle.kts.173 | 2 ++ j2k/build.gradle.kts.as31 | 2 ++ j2k/build.gradle.kts.as32 | 2 ++ prepare/idea-plugin/build.gradle.kts | 1 - 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 70bb77b3aa8..96eb4e99cdd 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -70,6 +70,8 @@ test.apply { exclude("**/*JavaToKotlinConverterForWebDemoTestGenerated*") dependsOn(testForWebDemo) } + val cleanTest by tasks cleanTest.dependsOn(cleanTestForWebDemo) +ideaPlugin() diff --git a/j2k/build.gradle.kts.173 b/j2k/build.gradle.kts.173 index 542e7a64a58..b2f3350e406 100644 --- a/j2k/build.gradle.kts.173 +++ b/j2k/build.gradle.kts.173 @@ -68,6 +68,8 @@ test.apply { exclude("**/*JavaToKotlinConverterForWebDemoTestGenerated*") dependsOn(testForWebDemo) } + val cleanTest by tasks cleanTest.dependsOn(cleanTestForWebDemo) +ideaPlugin() diff --git a/j2k/build.gradle.kts.as31 b/j2k/build.gradle.kts.as31 index f4bbf636b4f..cf9d487e591 100644 --- a/j2k/build.gradle.kts.as31 +++ b/j2k/build.gradle.kts.as31 @@ -69,6 +69,8 @@ test.apply { exclude("**/*JavaToKotlinConverterForWebDemoTestGenerated*") dependsOn(testForWebDemo) } + val cleanTest by tasks cleanTest.dependsOn(cleanTestForWebDemo) +ideaPlugin() diff --git a/j2k/build.gradle.kts.as32 b/j2k/build.gradle.kts.as32 index 7dfba663942..97f63488432 100644 --- a/j2k/build.gradle.kts.as32 +++ b/j2k/build.gradle.kts.as32 @@ -70,6 +70,8 @@ test.apply { exclude("**/*JavaToKotlinConverterForWebDemoTestGenerated*") dependsOn(testForWebDemo) } + val cleanTest by tasks cleanTest.dependsOn(cleanTestForWebDemo) +ideaPlugin() diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index cedc395e385..fc11fb73c2f 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -37,7 +37,6 @@ val projectsToShadow by extra(listOf( //":idea-ultimate", ":compiler:ir.psi2ir", ":compiler:ir.tree", - ":j2k", ":js:js.ast", ":js:js.frontend", ":js:js.parser",