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:
committed by
Space Team
parent
1a4d203d1c
commit
a58266050f
@@ -5,12 +5,6 @@
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<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>
|
||||
</properties>
|
||||
|
||||
@@ -38,6 +32,11 @@
|
||||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-noarg-compiler-plugin</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven</groupId>
|
||||
<artifactId>maven-core</artifactId>
|
||||
@@ -47,10 +46,6 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<resources>
|
||||
<resource><directory>${noarg.resources}</directory></resource>
|
||||
</resources>
|
||||
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
@@ -62,11 +57,6 @@
|
||||
<configuration>
|
||||
<sources>
|
||||
<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>
|
||||
</configuration>
|
||||
</execution>
|
||||
@@ -88,9 +78,6 @@
|
||||
|
||||
<configuration>
|
||||
<jvmTarget>1.8</jvmTarget>
|
||||
<args>
|
||||
<arg>-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi</arg>
|
||||
</args>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
||||
@@ -18,8 +18,6 @@ dependencies {
|
||||
|
||||
testImplementation(gradleApi())
|
||||
testImplementation(commonDependency("junit"))
|
||||
|
||||
embedded(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false }
|
||||
}
|
||||
|
||||
gradlePlugin {
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ class NoArgGradleSubplugin
|
||||
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 PRESET_ARG_NAME = "preset"
|
||||
|
||||
Reference in New Issue
Block a user