Publish noarg compiler plugin separately

- also publish 'kotlin-noarg-compiler-plugin-embeddable' to be used with
  'kotlin-compiler-embeddable'
- 'kotlin-noarg-maven' plugin now just adds
  'kotlin-noarg-compiler-plugin' as normal dependency instead embedding
  it into itself

^KT-52811 In Progress
This commit is contained in:
Yahor Berdnikau
2023-03-20 17:58:36 +01:00
committed by Space Team
parent 1a4d203d1c
commit a58266050f
6 changed files with 29 additions and 21 deletions
+5 -18
View File
@@ -5,12 +5,6 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties> <properties>
<noarg.common.src>${basedir}/../../../plugins/noarg/noarg.common/src</noarg.common.src>
<noarg.k1.src>${basedir}/../../../plugins/noarg/noarg.k1/src</noarg.k1.src>
<noarg.k2.src>${basedir}/../../../plugins/noarg/noarg.k2/src</noarg.k2.src>
<noarg.backend.src>${basedir}/../../../plugins/noarg/noarg.backend/src</noarg.backend.src>
<noarg.cli.src>${basedir}/../../../plugins/noarg/noarg.cli/src</noarg.cli.src>
<noarg.resources>${basedir}/../../../plugins/noarg/noarg.cli/resources</noarg.resources>
<noarg.maven.plugin.src>${basedir}/src/main/kotlin</noarg.maven.plugin.src> <noarg.maven.plugin.src>${basedir}/src/main/kotlin</noarg.maven.plugin.src>
</properties> </properties>
@@ -38,6 +32,11 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-noarg-compiler-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
@@ -47,10 +46,6 @@
</dependencies> </dependencies>
<build> <build>
<resources>
<resource><directory>${noarg.resources}</directory></resource>
</resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@@ -62,11 +57,6 @@
<configuration> <configuration>
<sources> <sources>
<source>${noarg.maven.plugin.src}</source> <source>${noarg.maven.plugin.src}</source>
<source>${noarg.common.src}</source>
<source>${noarg.k1.src}</source>
<source>${noarg.k2.src}</source>
<source>${noarg.backend.src}</source>
<source>${noarg.cli.src}</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@@ -88,9 +78,6 @@
<configuration> <configuration>
<jvmTarget>1.8</jvmTarget> <jvmTarget>1.8</jvmTarget>
<args>
<arg>-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi</arg>
</args>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@@ -18,8 +18,6 @@ dependencies {
testImplementation(gradleApi()) testImplementation(gradleApi())
testImplementation(commonDependency("junit")) testImplementation(commonDependency("junit"))
embedded(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false }
} }
gradlePlugin { gradlePlugin {
@@ -33,7 +33,7 @@ class NoArgGradleSubplugin
return project.extensions.getByType(NoArgExtension::class.java) return project.extensions.getByType(NoArgExtension::class.java)
} }
private const val NOARG_ARTIFACT_NAME = "kotlin-noarg" private const val NOARG_ARTIFACT_NAME = "kotlin-noarg-compiler-plugin-embeddable"
private const val ANNOTATION_ARG_NAME = "annotation" private const val ANNOTATION_ARG_NAME = "annotation"
private const val PRESET_ARG_NAME = "preset" private const val PRESET_ARG_NAME = "preset"
+2
View File
@@ -39,6 +39,8 @@ sourceSets {
optInToExperimentalCompilerApi() optInToExperimentalCompilerApi()
publish()
runtimeJar() runtimeJar()
sourcesJar() sourcesJar()
javadocJar() javadocJar()
@@ -0,0 +1,19 @@
plugins {
id("org.jetbrains.kotlin.jvm")
}
dependencies {
embedded(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false }
}
publish {
artifactId = artifactId.replace(".", "-")
}
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
sourcesJarWithSourcesFromEmbedded(
project(":kotlin-noarg-compiler-plugin").tasks.named<Jar>("sourcesJar")
)
javadocJarWithJavadocFromEmbedded(
project(":kotlin-noarg-compiler-plugin").tasks.named<Jar>("javadocJar")
)
+2
View File
@@ -133,6 +133,7 @@ include ":kotlin-allopen-compiler-plugin",
":kotlin-allopen-compiler-plugin.cli" ":kotlin-allopen-compiler-plugin.cli"
include ":kotlin-noarg-compiler-plugin", include ":kotlin-noarg-compiler-plugin",
":kotlin-noarg-compiler-plugin.embeddable",
":kotlin-noarg-compiler-plugin.common", ":kotlin-noarg-compiler-plugin.common",
":kotlin-noarg-compiler-plugin.k1", ":kotlin-noarg-compiler-plugin.k1",
":kotlin-noarg-compiler-plugin.k2", ":kotlin-noarg-compiler-plugin.k2",
@@ -681,6 +682,7 @@ project(':kotlin-lombok-compiler-plugin.k2').projectDir = "$rootDir/plugins/lomb
project(':kotlin-lombok-compiler-plugin.common').projectDir = "$rootDir/plugins/lombok/lombok.common" as File project(':kotlin-lombok-compiler-plugin.common').projectDir = "$rootDir/plugins/lombok/lombok.common" as File
project(':kotlin-noarg-compiler-plugin').projectDir = "$rootDir/plugins/noarg" as File project(':kotlin-noarg-compiler-plugin').projectDir = "$rootDir/plugins/noarg" as File
project(':kotlin-noarg-compiler-plugin.embeddable').projectDir = "$rootDir/plugins/noarg/noarg.embeddable" as File
project(':kotlin-noarg-compiler-plugin.common').projectDir = "$rootDir/plugins/noarg/noarg.common" as File project(':kotlin-noarg-compiler-plugin.common').projectDir = "$rootDir/plugins/noarg/noarg.common" as File
project(':kotlin-noarg-compiler-plugin.k1').projectDir = "$rootDir/plugins/noarg/noarg.k1" as File project(':kotlin-noarg-compiler-plugin.k1').projectDir = "$rootDir/plugins/noarg/noarg.k1" as File
project(':kotlin-noarg-compiler-plugin.k2').projectDir = "$rootDir/plugins/noarg/noarg.k2" as File project(':kotlin-noarg-compiler-plugin.k2').projectDir = "$rootDir/plugins/noarg/noarg.k2" as File