Wizard: exclude new wizard from AS build

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") {

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"))

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<String>) {
         }
     }
 
-    testGroup(
-        "libraries/tools/new-project-wizard/new-project-wizard-cli/tests",
-        "libraries/tools/new-project-wizard/new-project-wizard-cli/testData"
-    ) {
-        testClass<AbstractBuildFileGenerationTest> {
-            model("buildFileGeneration", recursive = false, extension = null)
-        }
-    }
-
     //TODO: move these tests into idea-completion module
     testGroup("idea/tests", "idea/idea-completion/testData") {
         testClass<AbstractCodeFragmentCompletionHandlerTest> {

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<String>) {
         }
     }
 
-    testGroup(
-        "libraries/tools/new-project-wizard/new-project-wizard-cli/tests",
-        "libraries/tools/new-project-wizard/new-project-wizard-cli/testData"
-    ) {
-        testClass<AbstractBuildFileGenerationTest> {
-            model("buildFileGeneration", recursive = false, extension = null)
-        }
-    }
-
     //TODO: move these tests into idea-completion module
     testGroup("idea/tests", "idea/idea-completion/testData") {
         testClass<AbstractCodeFragmentCompletionHandlerTest> {

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<String>) {
         }
     }
 
-    testGroup(
-        "libraries/tools/new-project-wizard/new-project-wizard-cli/tests",
-        "libraries/tools/new-project-wizard/new-project-wizard-cli/testData"
-    ) {
-        testClass<AbstractBuildFileGenerationTest> {
-            model("buildFileGeneration", recursive = false, extension = null)
-        }
-    }
-
     //TODO: move these tests into idea-completion module
     testGroup("idea/tests", "idea/idea-completion/testData") {
         testClass<AbstractCodeFragmentCompletionHandlerTest> {

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"))

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<String>()
 ))