Build: Rework runtimeJar helper and drop redundant configuration

#KTI-559

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

@@ -16,8 +16,6 @@ configure<GradlePluginDevelopmentExtension> {
     isAutomatedPublishing = false
 }
 
-val jarContents by configurations.creating
-
 repositories {
     google()
     maven("https://plugins.gradle.org/m2/")
@@ -66,14 +64,14 @@ dependencies {
     compileOnly(project(":kotlin-reflect"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
-    runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable"))
-    runtimeOnly(projectRuntimeJar(":kotlin-annotation-processing-gradle"))
-    runtimeOnly(projectRuntimeJar(":kotlin-android-extensions"))
-    runtimeOnly(projectRuntimeJar(":kotlin-compiler-runner"))
-    runtimeOnly(projectRuntimeJar(":kotlin-scripting-compiler-embeddable"))
-    runtimeOnly(projectRuntimeJar(":kotlin-scripting-compiler-impl-embeddable"))
+    runtimeOnly(project(":kotlin-compiler-embeddable"))
+    runtimeOnly(project(":kotlin-annotation-processing-gradle"))
+    runtimeOnly(project(":kotlin-android-extensions"))
+    runtimeOnly(project(":kotlin-compiler-runner"))
+    runtimeOnly(project(":kotlin-scripting-compiler-embeddable"))
+    runtimeOnly(project(":kotlin-scripting-compiler-impl-embeddable"))
 
-    jarContents(compileOnly(intellijDep()) {
+    embedded(compileOnly(intellijDep()) {
         includeJars("asm-all", "gson", "guava", "serviceMessages", rootProject = rootProject)
     })
 
@@ -105,17 +103,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
     configurations.api.get().exclude("com.android.tools.external.com-intellij", "intellij-core")
 }
 
-noDefaultJar()
-runtimeJar(rewriteDefaultJarDepsToShadedCompiler()).configure {
-    dependsOn(jarContents)
-
-    from {
-        jarContents.asFileTree.map {
-            if (it.endsWith(".jar")) zipTree(it)
-            else it
-        }
-    }
-}
+runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
 
 tasks {
     named<ProcessResources>("processResources") {