Add PluginRuntimeAnnotationsProvider

Author: kyay10

compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmBoxTest.kt

@@ -2,6 +2,7 @@ package org.jetbrains.kotlin.compiler.plugin.template.runners
 
 import org.jetbrains.kotlin.compiler.plugin.template.services.ExtensionRegistrarConfigurator
 import org.jetbrains.kotlin.compiler.plugin.template.services.PluginAnnotationsProvider
+import org.jetbrains.kotlin.compiler.plugin.template.services.PluginRuntimeAnnotationsProvider
 import org.jetbrains.kotlin.test.FirParser
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.CodegenTestDirectives
@@ -43,6 +44,8 @@ open class AbstractJvmBoxTest : AbstractFirBlackBoxCodegenTestBase(FirParser.Lig
                 ::PluginAnnotationsProvider,
                 ::ExtensionRegistrarConfigurator
             )
+
+            useCustomRuntimeClasspathProviders(::PluginRuntimeAnnotationsProvider)
         }
     }
 }

compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/PluginAnnotationsProvider.kt

@@ -1,22 +1,25 @@
 package org.jetbrains.kotlin.compiler.plugin.template.services
 
-import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
+import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
+import org.jetbrains.kotlin.test.services.RuntimeClasspathProvider
 import org.jetbrains.kotlin.test.services.TestServices
 import java.io.File
 
 class PluginAnnotationsProvider(testServices: TestServices) : EnvironmentConfigurator(testServices) {
     companion object {
-        private val annotationsRuntimeClasspath =
+        val annotationsRuntimeClasspath =
             System.getProperty("annotationsRuntime.classpath")?.split(File.pathSeparator)?.map(::File)
                 ?: error("Unable to get a valid classpath from 'annotationsRuntime.classpath' property")
     }
 
     override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) {
-        for (file in annotationsRuntimeClasspath) {
-            configuration.addJvmClasspathRoot(file)
-        }
+        configuration.addJvmClasspathRoots(annotationsRuntimeClasspath)
     }
 }
+
+class PluginRuntimeAnnotationsProvider(testServices: TestServices) : RuntimeClasspathProvider(testServices) {
+    override fun runtimeClassPaths(module: TestModule) = PluginAnnotationsProvider.annotationsRuntimeClasspath
+}