diff --git a/plugins/kotlin/compiler-plugins/allopen/maven/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/maven/AllOpenMavenProjectImportHandler.kt b/plugins/kotlin/compiler-plugins/allopen/maven/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/maven/AllOpenMavenProjectImportHandler.kt index 52e25409ea93..798f44a9fb30 100644 --- a/plugins/kotlin/compiler-plugins/allopen/maven/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/maven/AllOpenMavenProjectImportHandler.kt +++ b/plugins/kotlin/compiler-plugins/allopen/maven/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/maven/AllOpenMavenProjectImportHandler.kt @@ -2,7 +2,6 @@ package org.jetbrains.kotlin.idea.compilerPlugin.allopen.maven -import com.intellij.openapi.project.Project import com.intellij.util.text.VersionComparatorUtil import org.jetbrains.idea.maven.project.MavenProject import org.jetbrains.kotlin.allopen.AllOpenPluginNames.ANNOTATION_OPTION_NAME @@ -12,12 +11,13 @@ import org.jetbrains.kotlin.idea.base.plugin.artifacts.KotlinArtifacts import org.jetbrains.kotlin.idea.compilerPlugin.CompilerPluginSetup.PluginOption import org.jetbrains.kotlin.idea.jps.toJpsVersionAgnosticKotlinBundledPath import org.jetbrains.kotlin.idea.maven.compilerPlugin.AbstractMavenImportHandler +import org.jetbrains.kotlin.idea.maven.getKotlinPlugin class AllOpenMavenProjectImportHandler : AbstractMavenImportHandler() { - override val compilerPluginId = PLUGIN_ID - override val pluginName = "allopen" - override val mavenPluginArtifactName = "kotlin-maven-allopen" - override val pluginJarFileFromIdea = KotlinArtifacts.allopenCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath() + override val compilerPluginId: String = PLUGIN_ID + override val pluginName: String = "allopen" + override val mavenPluginArtifactName: String = "kotlin-maven-allopen" + override val pluginJarFileFromIdea: String = KotlinArtifacts.allopenCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath() override fun getOptions( mavenProject: MavenProject, diff --git a/plugins/kotlin/compiler-plugins/compiler-plugin-support/maven/src/org/jetbrains/kotlin/idea/maven/compilerPlugin/AbstractMavenImportHandler.kt b/plugins/kotlin/compiler-plugins/compiler-plugin-support/maven/src/org/jetbrains/kotlin/idea/maven/compilerPlugin/AbstractMavenImportHandler.kt index c88bd63ea64d..d0577d2ab524 100644 --- a/plugins/kotlin/compiler-plugins/compiler-plugin-support/maven/src/org/jetbrains/kotlin/idea/maven/compilerPlugin/AbstractMavenImportHandler.kt +++ b/plugins/kotlin/compiler-plugins/compiler-plugin-support/maven/src/org/jetbrains/kotlin/idea/maven/compilerPlugin/AbstractMavenImportHandler.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.idea.compilerPlugin.CompilerPluginSetup import org.jetbrains.kotlin.idea.compilerPlugin.CompilerPluginSetup.PluginOption import org.jetbrains.kotlin.idea.compilerPlugin.modifyCompilerArgumentsForPluginWithFacetSettings import org.jetbrains.kotlin.idea.maven.MavenProjectImportHandler +import org.jetbrains.kotlin.idea.maven.findKotlinPlugin abstract class AbstractMavenImportHandler : MavenProjectImportHandler { abstract val compilerPluginId: String diff --git a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/AllOpenKotlinMavenImporterTest.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/AllOpenKotlinMavenImporterTest.kt index 2b9cbb368b90..88bb488826a7 100644 --- a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/AllOpenKotlinMavenImporterTest.kt +++ b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/AllOpenKotlinMavenImporterTest.kt @@ -19,8 +19,8 @@ class AllOpenKotlinMavenImporterTest : AbstractKotlinMavenImporterTest() { with(facetSettings) { assertNotNull(compilerArguments?.pluginClasspaths) - assertFalse(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.allopenCompilerPluginPath.fileName.toString()) }) - assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.noargCompilerPluginPath.fileName.toString()) }) + assertFalse(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.allopenCompilerPlugin.name) }) + assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.noargCompilerPlugin.name) }) } } @@ -34,8 +34,8 @@ class AllOpenKotlinMavenImporterTest : AbstractKotlinMavenImporterTest() { with(facetSettings) { assertNotNull(compilerArguments?.pluginClasspaths) - assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.allopenCompilerPluginPath.fileName.toString()) }) - assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.noargCompilerPluginPath.fileName.toString()) }) + assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.allopenCompilerPlugin.name) }) + assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.noargCompilerPlugin.name) }) assertArrayEquals( compilerArguments!!.pluginOptions!!, arrayOf(