From 53bbe805ce9d89ede132228c7c572bbb37498f97 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 23 Jun 2022 13:07:20 +0300
Subject: [PATCH] [SAM with receiver] Fix maven plugin and IDE dependencies
 according new module structure

---
 .../tools/kotlin-maven-sam-with-receiver/pom.xml   | 14 +++++++++++---
 .../build.gradle.kts                               |  7 ++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
index a75bddaf177..5e8e23a2dc6 100755
--- a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
+++ b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
@@ -6,8 +6,12 @@
     <modelVersion>4.0.0</modelVersion>
     <properties>
         <maven.version>3.0.5</maven.version>
-        <sam.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver-cli/src</sam.src>
-        <sam.resources>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver-cli/resources</sam.resources>
+        <sam.common.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver.common/src</sam.common.src>
+        <sam.k1.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver.k1/src</sam.k1.src>
+        <sam.k2.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver.k2/src</sam.k2.src>
+        <sam.backend.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver.backend/src</sam.backend.src>
+        <sam.cli.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver.cli/src</sam.cli.src>
+        <sam.resources>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver.cli/resources</sam.resources>
         <sam.maven.plugin.src>${basedir}/src/main/kotlin</sam.maven.plugin.src>
     </properties>
 
@@ -52,7 +56,11 @@
                         <goals><goal>add-source</goal></goals>
                         <configuration>
                             <sources>
-                                <source>${sam.src}</source>
+                                <source>${sam.common.src}</source>
+                                <source>${sam.k1.src}</source>
+                                <source>${sam.k2.src}</source>
+                                <source>${sam.backend.src}</source>
+                                <source>${sam.cli.src}</source>
                                 <source>${sam.maven.plugin.src}</source>
                             </sources>
                         </configuration>
diff --git a/prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts
index b4a0103b8ff..8cf9eb8c778 100644
--- a/prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts
@@ -2,4 +2,9 @@ plugins {
     kotlin("jvm")
 }
 
-publishJarsForIde(listOf(":kotlin-sam-with-receiver-compiler-plugin"))
+publishJarsForIde(
+    listOf(
+        "::kotlin-sam-with-receiver-compiler-plugin.common",
+        "::kotlin-sam-with-receiver-compiler-plugin.k1"
+    )
+)