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

[FIR] Fix detecting version of plugin annotations if it differs from 1.6.255-SNAPSHOT

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-11-10 17:46:56 +03:00
committed by teamcityserver
parent edb62e247f
commit ae967ec31b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/services/PluginAnnotationsProvider.kt
+8 -4
View File
@@ -12,16 +12,20 @@ import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlin.test.services.assertions import org.jetbrains.kotlin.test.services.assertions
import java.io.File import java.io.File
import java.io.FilenameFilter
class PluginAnnotationsProvider(testServices: TestServices) : EnvironmentConfigurator(testServices) { class PluginAnnotationsProvider(testServices: TestServices) : EnvironmentConfigurator(testServices) {
companion object { companion object {
const val ANNOTATIONS_JAR = private const val ANNOTATIONS_JAR_DIR = "plugins/fir/fir-plugin-prototype/plugin-annotations/build/libs/"
"plugins/fir/fir-plugin-prototype/plugin-annotations/build/libs/plugin-annotations-1.6.255-SNAPSHOT.jar" private val ANNOTATIONS_JAR_FILTER = FilenameFilter { _, name -> name.startsWith("plugin-annotations") && name.endsWith(".jar") }
} }
override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) {
val jar = File(ANNOTATIONS_JAR) val libDir = File(ANNOTATIONS_JAR_DIR)
testServices.assertions.assertTrue(jar.exists()) { "Jar with annotations does not exist. Please run :plugins:fir:fir-plugin-prototype:plugin-annotations:jar" } testServices.assertions.assertTrue(libDir.exists() && libDir.isDirectory, failMessage)
val jar = libDir.listFiles(ANNOTATIONS_JAR_FILTER)?.firstOrNull() ?: testServices.assertions.fail(failMessage)
configuration.addJvmClasspathRoot(jar) configuration.addJvmClasspathRoot(jar)
} }
private val failMessage = { "Jar with annotations does not exist. Please run :plugins:fir:fir-plugin-prototype:plugin-annotations:jar" }
} }