azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SAM with receiver] Fix maven plugin and IDE dependencies according new module structure

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2022-06-23 13:07:20 +03:00
committed by teamcity
parent 1a9c690dcb
commit 53bbe805ce
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-sam-with-receiver/pom.xml
+11 -3
View File
@@ -6,8 +6,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
<maven.version>3.0.5</maven.version> <maven.version>3.0.5</maven.version>
<sam.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver-cli/src</sam.src> <sam.common.src>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver.common/src</sam.common.src>
<sam.resources>${basedir}/../../../plugins/sam-with-receiver/sam-with-receiver-cli/resources</sam.resources> <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> <sam.maven.plugin.src>${basedir}/src/main/kotlin</sam.maven.plugin.src>
</properties> </properties>
@@ -52,7 +56,11 @@
<goals><goal>add-source</goal></goals> <goals><goal>add-source</goal></goals>
<configuration> <configuration>
<sources> <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> <source>${sam.maven.plugin.src}</source>
</sources> </sources>
</configuration> </configuration>
prepare/ide-plugin-dependencies/sam-with-receiver-compiler-plugin-for-ide/build.gradle.kts
+6 -1
View File
@@ -2,4 +2,9 @@ plugins {
kotlin("jvm") 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"
)
)