diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index 251b689dfdc..f2ffb23dc76 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -155,8 +155,6 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { settings { ideArtifacts { kotlinCompilerJar() - - kotlinPluginJar() kotlinReflectJar() @@ -168,12 +166,8 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { kotlinDaemonClientJar() - kotlinJpsPluginJar() - kotlinc() - ideaPlugin() - dist() } diff --git a/settings.gradle b/settings.gradle index 764e67fb0fb..cfac40a06d0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -294,30 +294,32 @@ include ":plugins:parcelize:parcelize-compiler", include ":plugins:lombok:lombok-compiler-plugin", ":kotlin-lombok" -include ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide", - ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide", - ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-tests-for-ide", - ":prepare:ide-plugin-dependencies:incremental-compilation-impl-tests-for-ide", - ":prepare:ide-plugin-dependencies:js-ir-runtime-for-ide", - ":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide", - ":prepare:ide-plugin-dependencies:kotlin-compiler-for-ide", - ":prepare:ide-plugin-dependencies:kotlin-compiler-cli-for-ide", - ":prepare:ide-plugin-dependencies:kotlin-dist-for-ide", - ":prepare:ide-plugin-dependencies:kotlin-gradle-statistics-for-ide", - ":prepare:ide-plugin-dependencies:kotlinx-serialization-compiler-plugin-for-ide", - ":prepare:ide-plugin-dependencies:noarg-compiler-plugin-for-ide", - ":prepare:ide-plugin-dependencies:sam-with-receiver-compiler-plugin-for-ide", - ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide", - ":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide", - ":prepare:ide-plugin-dependencies:tests-common-tests-for-ide", - ":prepare:ide-plugin-dependencies:compiler-components-for-jps", - ":prepare:ide-plugin-dependencies:kotlin-compiler-testdata-for-ide", - ":prepare:ide-plugin-dependencies:kotlin-stdlib-minimal-for-test-for-ide", - ":prepare:ide-plugin-dependencies:kotlin-compiler-tests-for-ide", - ":prepare:ide-plugin-dependencies:low-level-api-fir-for-ide", - ":prepare:ide-plugin-dependencies:high-level-api-for-ide", - ":prepare:ide-plugin-dependencies:high-level-api-fir-for-ide", - ":prepare:ide-plugin-dependencies:high-level-api-fir-tests-for-ide" +if (!buildProperties.inJpsBuildIdeaSync) { + include ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-tests-for-ide", + ":prepare:ide-plugin-dependencies:incremental-compilation-impl-tests-for-ide", + ":prepare:ide-plugin-dependencies:js-ir-runtime-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-compiler-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-compiler-cli-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-dist-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-gradle-statistics-for-ide", + ":prepare:ide-plugin-dependencies:kotlinx-serialization-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:noarg-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:sam-with-receiver-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:tests-common-tests-for-ide", + ":prepare:ide-plugin-dependencies:compiler-components-for-jps", + ":prepare:ide-plugin-dependencies:kotlin-compiler-testdata-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-stdlib-minimal-for-test-for-ide", + ":prepare:ide-plugin-dependencies:kotlin-compiler-tests-for-ide", + ":prepare:ide-plugin-dependencies:low-level-api-fir-for-ide", + ":prepare:ide-plugin-dependencies:high-level-api-for-ide", + ":prepare:ide-plugin-dependencies:high-level-api-fir-for-ide", + ":prepare:ide-plugin-dependencies:high-level-api-fir-tests-for-ide" +} void kotlinIde(String imlPath) { File imlFile = new File("kotlin-ide/kotlin/${imlPath}")