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

[lombok] Rename maven subplugin to 'lombok'

Browse Source
This commit is contained in:
Andrey Zinovyev
2021-04-22 17:40:07 +03:00
committed by TeamCityServer
parent b88f54b31a
commit 07daf2165a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-lombok/src/main/kotlin/LombokMavenPluginExtensions.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.maven.*
val LOMBOK_COMPILER_PLUGIN_ID = "org.jetbrains.kotlin.lombok" val LOMBOK_COMPILER_PLUGIN_ID = "org.jetbrains.kotlin.lombok"
@Component(role = KotlinMavenPluginExtension::class, hint = "kotlin-lombok") @Component(role = KotlinMavenPluginExtension::class, hint = "lombok")
class KotlinLombokMavenPluginExtension : KotlinMavenPluginExtension { class KotlinLombokMavenPluginExtension : KotlinMavenPluginExtension {
@Requirement @Requirement
lateinit var logger: Logger lateinit var logger: Logger
libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-simple/pom.xml
+2 -2
View File
@@ -30,11 +30,11 @@
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<configuration> <configuration>
<compilerPlugins> <compilerPlugins>
<plugin>kotlin-lombok</plugin> <plugin>lombok</plugin>
</compilerPlugins> </compilerPlugins>
<pluginOptions> <pluginOptions>
<option>kotlin-lombok:config=lombok.config</option> <option>lombok:config=lombok.config</option>
</pluginOptions> </pluginOptions>
</configuration> </configuration>
<executions> <executions>
libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-simple/verify.bsh
+1 -1
View File
@@ -1,4 +1,4 @@
source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath());
assertBuildLogHasLineThatContains("Applied plugin: 'kotlin-lombok'"); assertBuildLogHasLineThatContains("Applied plugin: 'lombok'");
assertFileExists("target/test-lombok-simple-1.0-SNAPSHOT.jar"); assertFileExists("target/test-lombok-simple-1.0-SNAPSHOT.jar");
libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-with-kapt/pom.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<version>${kotlin.version}</version> <version>${kotlin.version}</version>
<configuration> <configuration>
<compilerPlugins> <compilerPlugins>
<plugin>kotlin-lombok</plugin> <plugin>lombok</plugin>
</compilerPlugins> </compilerPlugins>
</configuration> </configuration>
<executions> <executions>
libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-with-kapt/verify.bsh
+1 -1
View File
@@ -1,6 +1,6 @@
source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath());
assertBuildLogHasLineThatContains("Applied plugin: 'kotlin-lombok'"); assertBuildLogHasLineThatContains("Applied plugin: 'lombok'");
assertFileExists("target/test-lombok-with-kapt-1.0-SNAPSHOT.jar"); assertFileExists("target/test-lombok-with-kapt-1.0-SNAPSHOT.jar");
assertFileExists("target/kaptStubs/compile/lab2/SomeObj.java"); assertFileExists("target/kaptStubs/compile/lab2/SomeObj.java");
assertFileExists("target/generated-sources/kapt/compile/lab2/SomeObjJsonAdapter.kt"); assertFileExists("target/generated-sources/kapt/compile/lab2/SomeObjJsonAdapter.kt");