From 377cdfdb2d7d573479a3e1e987ae96308aa77253 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Sat, 7 Mar 2020 15:29:56 +0300 Subject: [PATCH] Wizard: exclude new wizard from AS build --- build.gradle.kts | 22 +++++++++++-------- generators/build.gradle.kts | 5 ++++- .../generators/tests/GenerateTests.kt.as35 | 10 --------- .../generators/tests/GenerateTests.kt.as36 | 10 --------- .../generators/tests/GenerateTests.kt.as40 | 10 --------- idea/idea-gradle/build.gradle.kts | 4 +++- prepare/idea-plugin/build.gradle.kts | 10 +++++---- 7 files changed, 26 insertions(+), 45 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e82331459e1..2a72e0b64a7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -666,22 +666,26 @@ tasks { ) } - register("idea-new-project-wizard-tests") { - dependsOn("dist") - dependsOn( - ":libraries:tools:new-project-wizard:test", - ":libraries:tools:new-project-wizard:new-project-wizard-cli:test", - ":idea:idea-new-project-wizard:test" - ) + if (Ide.IJ()) { + register("idea-new-project-wizard-tests") { + dependsOn("dist") + dependsOn( + ":libraries:tools:new-project-wizard:test", + ":libraries:tools:new-project-wizard:new-project-wizard-cli:test", + ":idea:idea-new-project-wizard:test" + ) + } } register("idea-plugin-tests") { dependsOn("dist") dependsOn( "idea-plugin-main-tests", - "idea-plugin-additional-tests", - "idea-new-project-wizard-tests" + "idea-plugin-additional-tests" ) + if (Ide.IJ()) { + dependsOn("idea-new-project-wizard-tests") + } } register("idea-plugin-performance-tests") { diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index f2b1d64a595..be0e040070d 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -40,7 +40,10 @@ dependencies { testCompile(projectTests(":idea:idea-fir")) testCompile(projectTests(":j2k")) testCompile(projectTests(":nj2k")) - testCompile(projectTests(":libraries:tools:new-project-wizard:new-project-wizard-cli")) + if (Ide.IJ()) { + testCompile(projectTests(":libraries:tools:new-project-wizard:new-project-wizard-cli")) + testCompile(projectTests(":idea:idea-new-project-wizard")) + } testCompile(projectTests(":idea:idea-android")) testCompile(projectTests(":idea:performanceTests")) testCompile(projectTests(":idea:scripting-support")) diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 index 1ae3ca58b96..d04c5b19c6a 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 @@ -157,7 +157,6 @@ import org.jetbrains.kotlin.search.AbstractAnnotatedMembersSearchTest import org.jetbrains.kotlin.search.AbstractInheritorsSearchTest import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest import org.jetbrains.kotlin.test.TargetBackend -import org.jetbrains.kotlin.tools.projectWizard.cli.AbstractBuildFileGenerationTest import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginBytecodeListingTest import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginDiagnosticTest import org.jetbrains.kotlinx.serialization.AbstractSerializationIrBytecodeListingTest @@ -981,15 +980,6 @@ fun main(args: Array) { } } - testGroup( - "libraries/tools/new-project-wizard/new-project-wizard-cli/tests", - "libraries/tools/new-project-wizard/new-project-wizard-cli/testData" - ) { - testClass { - model("buildFileGeneration", recursive = false, extension = null) - } - } - //TODO: move these tests into idea-completion module testGroup("idea/tests", "idea/idea-completion/testData") { testClass { diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 index d8b8c8bf472..cf94e3836ed 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 @@ -157,7 +157,6 @@ import org.jetbrains.kotlin.search.AbstractAnnotatedMembersSearchTest import org.jetbrains.kotlin.search.AbstractInheritorsSearchTest import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest import org.jetbrains.kotlin.test.TargetBackend -import org.jetbrains.kotlin.tools.projectWizard.cli.AbstractBuildFileGenerationTest import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginBytecodeListingTest import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginDiagnosticTest import org.jetbrains.kotlinx.serialization.AbstractSerializationIrBytecodeListingTest @@ -982,15 +981,6 @@ fun main(args: Array) { } } - testGroup( - "libraries/tools/new-project-wizard/new-project-wizard-cli/tests", - "libraries/tools/new-project-wizard/new-project-wizard-cli/testData" - ) { - testClass { - model("buildFileGeneration", recursive = false, extension = null) - } - } - //TODO: move these tests into idea-completion module testGroup("idea/tests", "idea/idea-completion/testData") { testClass { diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 index 1ae3ca58b96..d04c5b19c6a 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as40 @@ -157,7 +157,6 @@ import org.jetbrains.kotlin.search.AbstractAnnotatedMembersSearchTest import org.jetbrains.kotlin.search.AbstractInheritorsSearchTest import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest import org.jetbrains.kotlin.test.TargetBackend -import org.jetbrains.kotlin.tools.projectWizard.cli.AbstractBuildFileGenerationTest import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginBytecodeListingTest import org.jetbrains.kotlinx.serialization.AbstractSerializationPluginDiagnosticTest import org.jetbrains.kotlinx.serialization.AbstractSerializationIrBytecodeListingTest @@ -981,15 +980,6 @@ fun main(args: Array) { } } - testGroup( - "libraries/tools/new-project-wizard/new-project-wizard-cli/tests", - "libraries/tools/new-project-wizard/new-project-wizard-cli/testData" - ) { - testClass { - model("buildFileGeneration", recursive = false, extension = null) - } - } - //TODO: move these tests into idea-completion module testGroup("idea/tests", "idea/idea-completion/testData") { testClass { diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 1b9e9090aae..84ebb34b915 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -53,7 +53,9 @@ dependencies { testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } testRuntime(project(":native:frontend.native")) { isTransitive = false } testRuntime(project(":native:kotlin-native-utils")) { isTransitive = false } - testRuntime(project(":idea:idea-new-project-wizard")) + if (Ide.IJ()) { + testRuntime(project(":idea:idea-new-project-wizard")) + } testRuntimeOnly(toolsJar()) testRuntime(project(":kotlin-reflect")) diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index b49bcbe718f..799dcf2a13f 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -39,9 +39,6 @@ val projectsToShadow by extra(listOf( ":idea:scripting-support", ":idea:idea-j2k", ":idea:formatter", - ":libraries:tools:new-project-wizard", - ":idea:idea-new-project-wizard", - ":libraries:tools:new-project-wizard:new-project-wizard-cli", ":compiler:psi", ":compiler:fir:cones", ":compiler:fir:checkers", @@ -92,7 +89,12 @@ val projectsToShadow by extra(listOf( ":idea:idea-git", ":idea:idea-jps-common", *if (Ide.IJ()) - arrayOf(":idea:idea-maven") + arrayOf( + ":idea:idea-maven", + ":libraries:tools:new-project-wizard", + ":idea:idea-new-project-wizard", + ":libraries:tools:new-project-wizard:new-project-wizard-cli" + ) else emptyArray() ))