Build: embed jps artifact kotlin-plugin.jar into ideaPlugin

2019-04-10 17:09:02 +03:00
parent f71c2bf25e
commit 1b68b1d599
2 changed files with 7 additions and 12 deletions
@@ -160,16 +160,6 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
            project {
                settings {
                    ideArtifacts {
-                        create("kotlin-plugin.jar") {
-                            archive("kotlin-plugin.jar") {
-                                directory("META-INF") {
-                                    file("$buildDir/tmp/jar/MANIFEST.MF")
-                                }
-
-                                jarFromEmbedded(ideaPluginProject)
-                            }
-                        }
-
                        create("ideaPlugin") {
                            directory("Kotlin") {
                                directory("kotlinc") {
@@ -177,7 +167,13 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
                                }

                                directory("lib") {
-                                    artifact("kotlin-plugin.jar")
+                                    archive("kotlin-plugin.jar") {
+                                        directory("META-INF") {
+                                            file("$buildDir/tmp/jar/MANIFEST.MF")
+                                        }
+
+                                        jarFromEmbedded(ideaPluginProject)
+                                    }
                                    
                                    directoryFromConfiguration(libraries)