Skip to content

Commit 1a4d203

Browse files
TapchicomaSpace Team
authored and
Space Team
committed
Publish lombok compiler plugin separately
- also add 'kotlin-lombok-compiler-plugin-embeddable' to be used with 'kotlin-compiler-emebeddable' - 'kotlin-maven-lombok' does not try to embed plugin into itself and just depends on compiler plugin as normal dependency ^KT-52811 In Progress
1 parent 5e41cbd commit 1a4d203

File tree

6 files changed

+28
-24
lines changed

6 files changed

+28
-24
lines changed

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

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ plugins {
88
dependencies {
99
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
1010
commonApi(project(":kotlin-gradle-plugin-model"))
11-
12-
embedded(project(":kotlin-lombok-compiler-plugin")) { isTransitive = false }
1311
}
1412

1513
projectTest(parallel = true)

libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokSubplugin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ class LombokSubplugin @Inject internal constructor(private val registry: Tooling
3838

3939
override fun getCompilerPluginId(): String = "org.jetbrains.kotlin.lombok"
4040

41-
override fun getPluginArtifact(): SubpluginArtifact = JetBrainsSubpluginArtifact(artifactId = "kotlin-lombok")
41+
override fun getPluginArtifact(): SubpluginArtifact = JetBrainsSubpluginArtifact(artifactId = "kotlin-lombok-compiler-plugin-embeddable")
4242
}

libraries/tools/kotlin-maven-lombok/pom.xml

+5-21
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
<modelVersion>4.0.0</modelVersion>
77
<properties>
8-
<lombok.common.src>${basedir}/../../../plugins/lombok/lombok.common/src</lombok.common.src>
9-
<lombok.k1.src>${basedir}/../../../plugins/lombok/lombok.k1/src</lombok.k1.src>
10-
<lombok.k2.src>${basedir}/../../../plugins/lombok/lombok.k2/src</lombok.k2.src>
11-
<lombok.cli.src>${basedir}/../../../plugins/lombok/lombok.cli/src</lombok.cli.src>
12-
<lombok.resources>${basedir}/../../../plugins/lombok/lombok.cli/resources</lombok.resources>
138
<lombok.maven.plugin.src>${basedir}/src/main/kotlin</lombok.maven.plugin.src>
149
</properties>
1510

@@ -37,6 +32,11 @@
3732
<version>${project.version}</version>
3833
<scope>provided</scope>
3934
</dependency>
35+
<dependency>
36+
<groupId>org.jetbrains.kotlin</groupId>
37+
<artifactId>kotlin-lombok-compiler-plugin</artifactId>
38+
<version>${project.version}</version>
39+
</dependency>
4040
<dependency>
4141
<groupId>org.apache.maven</groupId>
4242
<artifactId>maven-core</artifactId>
@@ -46,12 +46,6 @@
4646
</dependencies>
4747

4848
<build>
49-
<resources>
50-
<resource>
51-
<directory>${lombok.resources}</directory>
52-
</resource>
53-
</resources>
54-
5549
<plugins>
5650
<plugin>
5751
<groupId>org.codehaus.mojo</groupId>
@@ -64,10 +58,6 @@
6458
</goals>
6559
<configuration>
6660
<sources>
67-
<source>${lombok.common.src}</source>
68-
<source>${lombok.k1.src}</source>
69-
<source>${lombok.k2.src}</source>
70-
<source>${lombok.cli.src}</source>
7161
<source>${lombok.maven.plugin.src}</source>
7262
</sources>
7363
</configuration>
@@ -88,12 +78,6 @@
8878
</goals>
8979
</execution>
9080
</executions>
91-
<configuration>
92-
<args>
93-
<arg>-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi</arg>
94-
<arg>-Xcontext-receivers</arg>
95-
</args>
96-
</configuration>
9781
</plugin>
9882
<plugin>
9983
<groupId>org.codehaus.plexus</groupId>

plugins/lombok/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ projectTest(jUnitMode = JUnitMode.JUnit5) {
6767
}
6868
}
6969

70+
publish()
71+
7072
runtimeJar()
7173
sourcesJar()
7274
javadocJar()
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
plugins {
2+
id("org.jetbrains.kotlin.jvm")
3+
}
4+
5+
dependencies {
6+
embedded(project(":kotlin-lombok-compiler-plugin")) { isTransitive = false }
7+
}
8+
9+
publish {
10+
artifactId = artifactId.replace(".", "-")
11+
}
12+
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
13+
sourcesJarWithSourcesFromEmbedded(
14+
project(":kotlin-lombok-compiler-plugin").tasks.named<Jar>("sourcesJar")
15+
)
16+
javadocJarWithJavadocFromEmbedded(
17+
project(":kotlin-lombok-compiler-plugin").tasks.named<Jar>("javadocJar")
18+
)

settings.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ include ":plugins:parcelize:parcelize-compiler",
313313
":kotlin-parcelize-compiler"
314314

315315
include ":kotlin-lombok-compiler-plugin",
316+
":kotlin-lombok-compiler-plugin.embeddable",
316317
":kotlin-lombok-compiler-plugin.common",
317318
":kotlin-lombok-compiler-plugin.k1",
318319
":kotlin-lombok-compiler-plugin.k2",
@@ -673,6 +674,7 @@ project(':kotlin-allopen-compiler-plugin.k2').projectDir = "$rootDir/plugins/all
673674
project(':kotlin-allopen-compiler-plugin.cli').projectDir = "$rootDir/plugins/allopen/allopen.cli" as File
674675

675676
project(':kotlin-lombok-compiler-plugin').projectDir = "$rootDir/plugins/lombok" as File
677+
project(':kotlin-lombok-compiler-plugin.embeddable').projectDir = "$rootDir/plugins/lombok/lombok.embeddable" as File
676678
project(':kotlin-lombok-compiler-plugin.cli').projectDir = "$rootDir/plugins/lombok/lombok.cli" as File
677679
project(':kotlin-lombok-compiler-plugin.k1').projectDir = "$rootDir/plugins/lombok/lombok.k1" as File
678680
project(':kotlin-lombok-compiler-plugin.k2').projectDir = "$rootDir/plugins/lombok/lombok.k2" as File

0 commit comments

Comments
 (0)