Skip to content

Commit 5fda895

Browse files
melodicoremelodicore
committed
chore: round 2 review comments
Signed-off-by: melodicore <datafox@datafox.me>
1 parent 74cac1b commit 5fda895

5 files changed

Lines changed: 85 additions & 60 deletions

File tree

‎elide-plugin/pom.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,17 @@
5050
<mavenTestPluginVersion>3.5.5</mavenTestPluginVersion>
5151
<mavenCompilerVersion>3.15.0</mavenCompilerVersion>
5252
<plexusUtilsVersion>4.0.3</plexusUtilsVersion>
53+
<!-- version used by kotlin-maven-plugin to avoid conflicts -->
54+
<mavenCompilerKotlinPluginVersion>3.14.0</mavenCompilerKotlinPluginVersion>
55+
56+
<!-- used only for META-INF/plexus/components.xml -->
57+
<mavenResourcesPluginVersion>3.5.0</mavenResourcesPluginVersion>
58+
<mavenJarPluginVersion>3.5.0</mavenJarPluginVersion>
59+
<mavenInstallPluginVersion>3.1.4</mavenInstallPluginVersion>
60+
<mavenDeployPluginVersion>3.1.4</mavenDeployPluginVersion>
61+
<mavenEjbPluginVersion>3.3.0</mavenEjbPluginVersion>
62+
<mavenWarPluginVersion>3.5.1</mavenWarPluginVersion>
63+
<mavenRarPluginVersion>3.1.0</mavenRarPluginVersion>
5364
</properties>
5465

5566
<repositories>
@@ -221,6 +232,12 @@
221232
</exclusion>
222233
</exclusions>
223234
</dependency>
235+
<dependency>
236+
<groupId>org.apache.maven.plugins</groupId>
237+
<artifactId>maven-compiler-plugin</artifactId>
238+
<version>${mavenCompilerKotlinPluginVersion}</version>
239+
<scope>provided</scope>
240+
</dependency>
224241
<dependency>
225242
<groupId>org.apache.maven.plugin-tools</groupId>
226243
<artifactId>maven-plugin-annotations</artifactId>

‎elide-plugin/src/main/resources/META-INF/plexus/components.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
${project.groupId}:${project.artifactId}:${project.version}:kapt
1616
</process-sources>
1717
<process-resources>
18-
org.apache.maven.plugins:maven-resources-plugin:3.3.0:resources
18+
org.apache.maven.plugins:maven-resources-plugin:${mavenResourcesPluginVersion}:resources
1919
</process-resources>
2020
<compile>
2121
${project.groupId}:${project.artifactId}:${project.version}:compile-kotlin,
@@ -25,23 +25,23 @@
2525
${project.groupId}:${project.artifactId}:${project.version}:test-kapt
2626
</process-test-sources>
2727
<process-test-resources>
28-
org.apache.maven.plugins:maven-resources-plugin:3.3.0:testResources
28+
org.apache.maven.plugins:maven-resources-plugin:${mavenResourcesPluginVersion}:testResources
2929
</process-test-resources>
3030
<test-compile>
3131
${project.groupId}:${project.artifactId}:${project.version}:test-compile-kotlin,
3232
${project.groupId}:${project.artifactId}:${project.version}:test-compile
3333
</test-compile>
3434
<test>
35-
org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M7:test
35+
org.apache.maven.plugins:maven-surefire-plugin:${mavenTestPluginVersion}:test
3636
</test>
3737
<package>
38-
org.apache.maven.plugins:maven-jar-plugin:3.3.0:jar
38+
org.apache.maven.plugins:maven-jar-plugin:${mavenJarPluginVersion}:jar
3939
</package>
4040
<install>
41-
org.apache.maven.plugins:maven-install-plugin:3.0.1:install
41+
org.apache.maven.plugins:maven-install-plugin:${mavenInstallPluginVersion}:install
4242
</install>
4343
<deploy>
44-
org.apache.maven.plugins:maven-deploy-plugin:3.0.0:deploy
44+
org.apache.maven.plugins:maven-deploy-plugin:${mavenDeployPluginVersion}:deploy
4545
</deploy>
4646
</phases>
4747

@@ -64,7 +64,7 @@
6464
${project.groupId}:${project.artifactId}:${project.version}:kapt
6565
</process-sources>
6666
<process-resources>
67-
org.apache.maven.plugins:maven-resources-plugin:3.3.0:resources
67+
org.apache.maven.plugins:maven-resources-plugin:${mavenResourcesPluginVersion}:resources
6868
</process-resources>
6969
<compile>
7070
${project.groupId}:${project.artifactId}:${project.version}:compile-kotlin,
@@ -74,23 +74,23 @@
7474
${project.groupId}:${project.artifactId}:${project.version}:test-kapt
7575
</process-test-sources>
7676
<process-test-resources>
77-
org.apache.maven.plugins:maven-resources-plugin:3.3.0:testResources
77+
org.apache.maven.plugins:maven-resources-plugin:${mavenResourcesPluginVersion}:testResources
7878
</process-test-resources>
7979
<test-compile>
8080
${project.groupId}:${project.artifactId}:${project.version}:test-compile-kotlin,
8181
${project.groupId}:${project.artifactId}:${project.version}:test-compile
8282
</test-compile>
8383
<test>
84-
org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M7:test
84+
org.apache.maven.plugins:maven-surefire-plugin:${mavenTestPluginVersion}:test
8585
</test>
8686
<package>
87-
org.apache.maven.plugins:maven-ejb-plugin:3.2.1:ejb
87+
org.apache.maven.plugins:maven-ejb-plugin:${mavenEjbPluginVersion}:ejb
8888
</package>
8989
<install>
90-
org.apache.maven.plugins:maven-install-plugin:3.0.1:install
90+
org.apache.maven.plugins:maven-install-plugin:${mavenInstallPluginVersion}:install
9191
</install>
9292
<deploy>
93-
org.apache.maven.plugins:maven-deploy-plugin:3.3.0:deploy
93+
org.apache.maven.plugins:maven-deploy-plugin:${mavenDeployPluginVersion}:deploy
9494
</deploy>
9595
</phases>
9696

@@ -113,7 +113,7 @@
113113
${project.groupId}:${project.artifactId}:${project.version}:kapt
114114
</process-sources>
115115
<process-resources>
116-
org.apache.maven.plugins:maven-resources-plugin:3.3.0:resources
116+
org.apache.maven.plugins:maven-resources-plugin:${mavenResourcesPluginVersion}:resources
117117
</process-resources>
118118
<compile>
119119
${project.groupId}:${project.artifactId}:${project.version}:compile-kotlin,
@@ -123,23 +123,23 @@
123123
${project.groupId}:${project.artifactId}:${project.version}:test-kapt
124124
</process-test-sources>
125125
<process-test-resources>
126-
org.apache.maven.plugins:maven-resources-plugin:3.3.0:testResources
126+
org.apache.maven.plugins:maven-resources-plugin:${mavenResourcesPluginVersion}:testResources
127127
</process-test-resources>
128128
<test-compile>
129129
${project.groupId}:${project.artifactId}:${project.version}:test-compile-kotlin,
130130
${project.groupId}:${project.artifactId}:${project.version}:test-compile
131131
</test-compile>
132132
<test>
133-
org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M7:test
133+
org.apache.maven.plugins:maven-surefire-plugin:${mavenTestPluginVersion}:test
134134
</test>
135135
<package>
136-
org.apache.maven.plugins:maven-war-plugin:2.2:war
136+
org.apache.maven.plugins:maven-war-plugin:${mavenWarPluginVersion}:war
137137
</package>
138138
<install>
139-
org.apache.maven.plugins:maven-install-plugin:3.0.1:install
139+
org.apache.maven.plugins:maven-install-plugin:${mavenInstallPluginVersion}:install
140140
</install>
141141
<deploy>
142-
org.apache.maven.plugins:maven-deploy-plugin:3.3.0:deploy
142+
org.apache.maven.plugins:maven-deploy-plugin:${mavenDeployPluginVersion}:deploy
143143
</deploy>
144144
</phases>
145145

@@ -162,7 +162,7 @@
162162
${project.groupId}:${project.artifactId}:${project.version}:kapt
163163
</process-sources>
164164
<process-resources>
165-
org.apache.maven.plugins:maven-resources-plugin:3.3.0:resources
165+
org.apache.maven.plugins:maven-resources-plugin:${mavenResourcesPluginVersion}:resources
166166
</process-resources>
167167
<compile>
168168
${project.groupId}:${project.artifactId}:${project.version}:compile-kotlin,
@@ -172,23 +172,23 @@
172172
${project.groupId}:${project.artifactId}:${project.version}:test-kapt
173173
</process-test-sources>
174174
<process-test-resources>
175-
org.apache.maven.plugins:maven-resources-plugin:3.3.0:testResources
175+
org.apache.maven.plugins:maven-resources-plugin:${mavenResourcesPluginVersion}:testResources
176176
</process-test-resources>
177177
<test-compile>
178178
${project.groupId}:${project.artifactId}:${project.version}:test-compile-kotlin,
179179
${project.groupId}:${project.artifactId}:${project.version}:test-compile
180180
</test-compile>
181181
<test>
182-
org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M7:test
182+
org.apache.maven.plugins:maven-surefire-plugin:${mavenTestPluginVersion}:test
183183
</test>
184184
<package>
185-
org.apache.maven.plugins:maven-rar-plugin:3.0.0:rar
185+
org.apache.maven.plugins:maven-rar-plugin:${mavenJarPluginVersion}:rar
186186
</package>
187187
<install>
188-
org.apache.maven.plugins:maven-install-plugin:3.0.1:install
188+
org.apache.maven.plugins:maven-install-plugin:${mavenInstallPluginVersion}:install
189189
</install>
190190
<deploy>
191-
org.apache.maven.plugins:maven-deploy-plugin:3.3.0:deploy
191+
org.apache.maven.plugins:maven-deploy-plugin:${mavenDeployPluginVersion}:deploy
192192
</deploy>
193193
</phases>
194194

‎java-compiler/src/main/kotlin/dev/elide/maven/compiler/ElideJavacCompiler.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ open class ElideJavacCompiler : JavacCompiler() {
7373
val argumentsFile =
7474
JavacCompiler::class
7575
.java
76-
.getDeclaredMethod("createFileWithArguments", String::class.java.arrayType(), String::class.java)
76+
.getDeclaredMethod("createFileWithArguments", Array<String>::class.java, String::class.java)
7777
.run {
7878
isAccessible = true
7979
invoke(this@ElideJavacCompiler, args, config.buildDirectory.absolutePath) as File
@@ -163,9 +163,8 @@ open class ElideJavacCompiler : JavacCompiler() {
163163

164164
private fun tryParseVersion(versions: List<String>): String? {
165165
for (version in versions) {
166-
if (version.matches(VERSION_RE)) {
167-
return version.substringBefore('.')
168-
}
166+
val match = VERSION_RE.find(version) ?: continue
167+
return match.value.substringBefore('.')
169168
}
170169
return null
171170
}

‎kotlin-plugin/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@
5151
<mavenTestPluginVersion>3.5.5</mavenTestPluginVersion>
5252
<mavenCompilerVersion>3.15.0</mavenCompilerVersion>
5353
<plexusUtilsVersion>4.0.3</plexusUtilsVersion>
54+
55+
<!-- used only for META-INF/plexus/components.xml -->
56+
<mavenResourcesPluginVersion>3.5.0</mavenResourcesPluginVersion>
57+
<mavenJarPluginVersion>3.5.0</mavenJarPluginVersion>
58+
<mavenInstallPluginVersion>3.1.4</mavenInstallPluginVersion>
59+
<mavenDeployPluginVersion>3.1.4</mavenDeployPluginVersion>
60+
<mavenEjbPluginVersion>3.3.0</mavenEjbPluginVersion>
61+
<mavenWarPluginVersion>3.5.1</mavenWarPluginVersion>
62+
<mavenRarPluginVersion>3.1.0</mavenRarPluginVersion>
5463
</properties>
5564

5665
<repositories>

0 commit comments

Comments
 (0)