diff --git a/build.gradle.kts b/build.gradle.kts index 0eb53aea6b2..be418c56d3d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -266,7 +266,7 @@ val compilerCopyTask = task("idea-plugin-copy-compiler") { task("ideaPlugin") { dependsOn(compilerCopyTask) dependsOnTaskIfExistsRec("idea-plugin") - shouldRunAfter(":prepare:kotlin-plugin:idea-plugin") + shouldRunAfter(":prepare:idea-plugin:idea-plugin") into("$ideaPluginDir/lib") } diff --git a/gradle/project-schema.json b/gradle/project-schema.json index 8716e87eaa9..56abb422ed4 100644 --- a/gradle/project-schema.json +++ b/gradle/project-schema.json @@ -4232,7 +4232,7 @@ "reporting": "org.gradle.api.reporting.ReportingExtension" } }, - ":prepare:kotlin-plugin": { + ":prepare:idea-plugin": { "conventions": { "base": "org.gradle.api.plugins.BasePluginConvention", "java": "org.gradle.api.plugins.JavaPluginConvention" diff --git a/idea-runner/build.gradle.kts b/idea-runner/build.gradle.kts index 50bfaf7f1c8..e21a7b65d9f 100644 --- a/idea-runner/build.gradle.kts +++ b/idea-runner/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { val runIde by task { - dependsOn(":dist", ":prepare:kotlin-plugin:idea-plugin", ":dist-plugin") + dependsOn(":dist", ":prepare:idea-plugin:idea-plugin", ":dist-plugin") classpath = the().sourceSets["main"].runtimeClasspath diff --git a/prepare/kotlin-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts similarity index 100% rename from prepare/kotlin-plugin/build.gradle.kts rename to prepare/idea-plugin/build.gradle.kts diff --git a/settings.gradle b/settings.gradle index 16ec74f87e4..831712e84ed 100644 --- a/settings.gradle +++ b/settings.gradle @@ -103,7 +103,7 @@ include ":kotlin-build-common", ":kotlin-build-common", ":prepare:formatter", ":prepare:ide-lazy-resolver", - ":prepare:kotlin-plugin", + ":prepare:idea-plugin", ":android-lint", ":prepare:mock-runtime-for-test", ":kotlin-compiler", diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index 42bda757d75..82c5f9f78dd 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -92,7 +92,7 @@ dependencies { testRuntime(ideaUltimatePluginDeps("*.jar", plugin = "java-decompiler")) testRuntime(files("${System.getProperty("java.home")}/../lib/tools.jar")) - ideaCommunityPlugin(projectRuntimeJar(":prepare:kotlin-plugin")) + ideaCommunityPlugin(projectRuntimeJar(":prepare:idea-plugin")) } val preparedResources = File(buildDir, "prepResources") @@ -133,7 +133,7 @@ val preparePluginXml by task { val jar = runtimeJar(task("shadowJar")) { duplicatesStrategy = DuplicatesStrategy.EXCLUDE dependsOn(preparePluginXml) - project(":prepare:kotlin-plugin").afterEvaluate { + project(":prepare:idea-plugin").afterEvaluate { ideaCommunityPlugin.files.forEach { from(zipTree(it), { exclude("META-INF/plugin.xml") }) } diff --git a/ultimate/ultimate-runner/build.gradle.kts b/ultimate/ultimate-runner/build.gradle.kts index 8fb9fe96d41..598b90b72bd 100644 --- a/ultimate/ultimate-runner/build.gradle.kts +++ b/ultimate/ultimate-runner/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { val runUltimate by task { - dependsOn(":dist", ":prepare:kotlin-plugin:idea-plugin", ":dist-plugin", ":ultimate:idea-ultimate-plugin") + dependsOn(":dist", ":prepare:idea-plugin:idea-plugin", ":dist-plugin", ":ultimate:idea-ultimate-plugin") classpath = the().sourceSets["main"].runtimeClasspath