From 5e41cbda75fc4ee8befde5df829b5da8f682e8cf Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Mon, 20 Mar 2023 17:43:03 +0100
Subject: [PATCH] Change kotlin-assignment plugin to use published compiler
 plugin

^KT-52811 In Progress
---
 .../tools/kotlin-assignment/build.gradle.kts  |  2 --
 .../plugin/gradle/AssignmentSubplugin.kt      |  2 +-
 .../assign-plugin.embeddable/build.gradle.kts | 32 +++++--------------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/libraries/tools/kotlin-assignment/build.gradle.kts b/libraries/tools/kotlin-assignment/build.gradle.kts
index e6055476b21..0130d574846 100644
--- a/libraries/tools/kotlin-assignment/build.gradle.kts
+++ b/libraries/tools/kotlin-assignment/build.gradle.kts
@@ -16,8 +16,6 @@ dependencies {
     commonCompileOnly(project(":compiler"))
     commonCompileOnly(project(":kotlin-assignment-compiler-plugin"))
 
-    embedded(project(":kotlin-assignment-compiler-plugin")) { isTransitive = false }
-
     testImplementation(commonDependency("junit"))
 }
 
diff --git a/libraries/tools/kotlin-assignment/src/common/kotlin/org/jetbrains/kotlin/assignment/plugin/gradle/AssignmentSubplugin.kt b/libraries/tools/kotlin-assignment/src/common/kotlin/org/jetbrains/kotlin/assignment/plugin/gradle/AssignmentSubplugin.kt
index 366fef71e60..a3fbf4e280f 100644
--- a/libraries/tools/kotlin-assignment/src/common/kotlin/org/jetbrains/kotlin/assignment/plugin/gradle/AssignmentSubplugin.kt
+++ b/libraries/tools/kotlin-assignment/src/common/kotlin/org/jetbrains/kotlin/assignment/plugin/gradle/AssignmentSubplugin.kt
@@ -18,7 +18,7 @@ class AssignmentSubplugin
 ) : KotlinCompilerPluginSupportPlugin {
 
     companion object {
-        const val COMPILER_PLUGIN_ARTIFACT_NAME = "kotlin-assignment"
+        const val COMPILER_PLUGIN_ARTIFACT_NAME = "kotlin-assignment-compiler-plugin-embeddable"
         const val COMPILER_PLUGIN_ID = "org.jetbrains.kotlin.assignment"
         private const val ANNOTATION_ARG_NAME = "annotation"
     }
diff --git a/plugins/assign-plugin/assign-plugin.embeddable/build.gradle.kts b/plugins/assign-plugin/assign-plugin.embeddable/build.gradle.kts
index 6a0f48fe06f..7df04bd4f11 100644
--- a/plugins/assign-plugin/assign-plugin.embeddable/build.gradle.kts
+++ b/plugins/assign-plugin/assign-plugin.embeddable/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.gradle.kotlin.dsl.support.serviceOf
-
 description = "Kotlin Assignment Compiler Plugin (Embeddable)"
 
 plugins {
@@ -11,28 +9,14 @@ dependencies {
     embedded(project(":kotlin-assignment-compiler-plugin")) { isTransitive = false }
 }
 
-sourceSets {
-    "main" { none() }
-    "test" { none() }
-}
-
-val runtimeJar = runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
-
-val sourcesJar = sourcesJar {
-    val compilerTask = project(":kotlin-assignment-compiler-plugin").tasks.named<Jar>("sourcesJar")
-    dependsOn(compilerTask)
-    val archiveOperations = serviceOf<ArchiveOperations>()
-    from(compilerTask.map { it.archiveFile }.map { archiveOperations.zipTree(it) })
-}
-
-val javadocJar = javadocJar {
-    val compilerTask = project(":kotlin-assignment-compiler-plugin").tasks.named<Jar>("javadocJar")
-    dependsOn(compilerTask)
-    val archiveOperations = serviceOf<ArchiveOperations>()
-    from(compilerTask.map { it.archiveFile }.map { archiveOperations.zipTree(it) })
-}
-
 publish {
     artifactId = artifactId.replace(".", "-")
-    setArtifacts(listOf(runtimeJar, sourcesJar, javadocJar))
 }
+
+runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
+sourcesJarWithSourcesFromEmbedded(
+    project(":kotlin-assignment-compiler-plugin").tasks.named<Jar>("sourcesJar")
+)
+javadocJarWithJavadocFromEmbedded(
+    project(":kotlin-assignment-compiler-plugin").tasks.named<Jar>("javadocJar")
+)