From d1e46e8ce791fb3539b8a48b770851adc379660f Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Mon, 19 Jul 2021 18:48:25 +0200 Subject: [PATCH] Delete Kotlin IntelliJ IDEA plugin modules from settings.gradle --- build.gradle.kts | 8 ---- generators/build.gradle.kts | 4 -- gradle.properties | 1 - settings.gradle | 79 ------------------------------------- 4 files changed, 92 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d28633df48d..75c368834be 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -734,14 +734,6 @@ tasks { dependsOn(":kotlin-scripting-jsr223-test:embeddableTest") dependsOn(":kotlin-main-kts-test:test") dependsOn(":kotlin-main-kts-test:testWithIr") - - if (kotlinBuildProperties.getOrNull("attachedIntellijVersion") == null && - !kotlinBuildProperties.getBoolean("disableKotlinPluginModules", false) - ) { - dependsOn(":kotlin-scripting-ide-services-test:test") - dependsOn(":kotlin-scripting-ide-services-test:embeddableTest") - } - dependsOn(":kotlin-scripting-js-test:test") } diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 2c6dfdd1169..a6fcc1ef826 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -78,10 +78,6 @@ projectTest(parallel = true) { } val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTestsKt") { - if (kotlinBuildProperties.getOrNull("attachedIntellijVersion") == null && - !kotlinBuildProperties.getBoolean("disableKotlinPluginModules", false)) { - dependsOn(":generators:idea-generator:generateIdeaTests") - } dependsOn(":generators:frontend-api-generator:generateFrontendApiTests") } diff --git a/gradle.properties b/gradle.properties index 03f3fc83995..bdf5a37d1e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -49,4 +49,3 @@ kotlin.native.enabled=false kotlin.native.home=kotlin-native/dist org.gradle.vfs.watch=true -disableKotlinPluginModules=true diff --git a/settings.gradle b/settings.gradle index 9ef0f8d26ae..6d9bc5b84a2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -426,85 +426,6 @@ if (attachedIntellijVersion == "211") { // Latest available platform in scope of } -if (!buildProperties.getBoolean("disableKotlinPluginModules", false) && attachedIntellijVersion == null) { - logger.info("Old Kotlin plugin modules are enabled") - include ":idea:idea-jvm", - ":idea:idea-maven", - ":idea:idea-gradle", - ":idea:idea-git", - ":idea:idea-jps-common", - ":idea:formatter", - ":idea:ide-common", - ":idea:idea-core", - ":idea:idea-fir", - ":idea:idea-fir-performance-tests", - ":idea:idea-fir-fe10-binding", - ":idea:kotlin-gradle-tooling", - ":idea:line-indent-provider", - ":idea:idea-android", - ":idea:idea-android-output-parser", - ":idea:idea-test-framework", - ":idea:idea-native", - ":idea:idea-gradle-native", - ":idea:performanceTests", - ":idea", - ":idea-runner", - ":idea:jvm-debugger:eval4j", - ":idea:jvm-debugger:jvm-debugger-util", - ":idea:jvm-debugger:jvm-debugger-core", - ":idea:jvm-debugger:jvm-debugger-evaluation", - ":idea:jvm-debugger:jvm-debugger-sequence", - ":idea:jvm-debugger:jvm-debugger-coroutine", - ":idea:jvm-debugger:jvm-debugger-test", - ":idea:scripting-support", - ":idea:idea-frontend-independent", - ":libraries:tools:new-project-wizard", - ":idea:idea-new-project-wizard", - ":libraries:tools:new-project-wizard:new-project-wizard-cli", - ":j2k", - ":idea:idea-j2k", - ":nj2k", - ":nj2k:nj2k-services", - ":noarg-ide-plugin", - ":allopen-ide-plugin", - ":jps-plugin", - ":kotlinx-serialization-ide-plugin", - ":kotlin-jps-plugin", - ":generators:idea-generator", - ":sam-with-receiver-ide-plugin", - ":plugins:uast-kotlin", - ":plugins:uast-kotlin-base", - ":plugins:uast-kotlin-fir", - ":plugins:base-compiler-plugins-ide-support", - ":plugins:uast-kotlin-idea", - ":plugins:uast-kotlin-idea-base", - ":plugins:uast-kotlin-idea-fir", - ":kotlin-scripting-idea", - ":prepare:formatter", - ":plugins:annotation-based-compiler-plugins-ide-support", - ":plugins:parcelize:parcelize-ide", - ":idea:idea-frontend-fir:fir-low-level-api-ide-impl", - ":idea:idea-fir-performance-tests", - ":plugins:lint", // TODO will this module be removed with other IDE modules? - ":plugins:android-extensions-ide", // TODO will this module be removed with other IDE modules? - ":prepare:ide-lazy-resolver", // TODO will this module be removed with other IDE modules? - ":prepare:idea-plugin", // TODO will this module be removed with other IDE modules? - ":plugins:lombok:lombok-ide-plugin", - ":plugins:kapt3-idea" - - project(':idea:idea-android-output-parser').projectDir = "$rootDir/idea/idea-android/idea-android-output-parser" as File - project(':plugins:kapt3-idea').projectDir = "$rootDir/plugins/kapt3/kapt3-idea" as File - project(':allopen-ide-plugin').projectDir = "$rootDir/plugins/allopen/allopen-ide" as File - project(':noarg-ide-plugin').projectDir = "$rootDir/plugins/noarg/noarg-ide" as File - project(':kotlinx-serialization-ide-plugin').projectDir = file("$rootDir/plugins/kotlin-serialization/kotlin-serialization-ide") - project(':kotlin-jps-plugin').projectDir = "$rootDir/prepare/jps-plugin" as File - project(':sam-with-receiver-ide-plugin').projectDir = "$rootDir/plugins/sam-with-receiver/sam-with-receiver-ide" as File - project(':kotlin-scripting-idea').projectDir = "$rootDir/plugins/scripting/scripting-idea" as File - project(':plugins:android-extensions-ide').projectDir = "$rootDir/plugins/android-extensions/android-extensions-idea" as File -} else { - logger.info("Old Kotlin plugin modules are disabled") -} - include ":generators:frontend-api-generator", ":idea-frontend-fir:idea-fir-low-level-api", ":idea-frontend-fir:idea-frontend-fir-generator",