diff --git a/.gitignore b/.gitignore
index 3fe6a16c0ca..0bd3daa044a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ build/
.idea/artifacts/ideaPlugin.xml
.idea/artifacts/kotlin_jps_plugin_jar.xml
.idea/artifacts/kotlin_daemon_client_jar.xml
+.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
kotlin-ultimate/
node_modules/
.rpt2_cache/
diff --git a/.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml b/.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
deleted file mode 100644
index 81b3fb43e35..00000000000
--- a/.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- $PROJECT_DIR$/out/artifacts/kotlin_imports_dumper_compiler_plugin_jar
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
index a63727f99b8..af8c5468ddf 100644
--- a/gradle/jps.gradle.kts
+++ b/gradle/jps.gradle.kts
@@ -59,6 +59,8 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
ideArtifacts {
generateIdeArtifacts(rootProject, this@ideArtifacts)
+ kotlinImportsDumperCompilerPluginJar()
+
kotlinDaemonClientJar()
kotlinJpsPluginJar()
@@ -165,6 +167,19 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
}
}
+val jarArtifactProjects = listOf(
+ "kotlin-compiler-client-embeddable",
+ "kotlin-compiler",
+ "kotlin-daemon-client",
+ "kotlin-imports-dumper-compiler-plugin",
+ "kotlin-jps-plugin",
+ "kotlin-main-kts",
+ "kotlin-reflect"
+)
+
+fun NamedDomainObjectContainer.kotlinImportsDumperCompilerPluginJar() =
+ jarFromProject(project(":kotlin-imports-dumper-compiler-plugin"))
+
fun NamedDomainObjectContainer.kotlinDaemonClientJar() =
jarFromProject(project(":kotlin-daemon-client"))
@@ -216,8 +231,8 @@ fun NamedDomainObjectContainer.jarFromProject(project: Project
file("${project.buildDir}/tmp/jar/MANIFEST.MF")
}
- if (project.sourceSets.names.contains("main")) {
- moduleOutput(moduleName(project.path))
+ if (project.sourceSets.names.contains("main")) {
+ moduleOutput(moduleName(project.path))
}
jarContentsFromEmbeddedConfiguration(project)
@@ -227,16 +242,6 @@ fun NamedDomainObjectContainer.jarFromProject(project: Project
}
}
-val jarArtifactProjects = listOf(
- "kotlin-compiler-client-embeddable",
- "kotlin-compiler",
- "kotlin-daemon-client",
- "kotlin-imports-dumper-compiler-plugin",
- "kotlin-jps-plugin",
- "kotlin-main-kts",
- "kotlin-reflect"
-)
-
fun moduleName(projectPath: String) = rootProject.name + projectPath.replace(':', '.') + ".main"
fun RecursiveArtifact.jarContentsFromEmbeddedConfiguration(project: Project) {