Skip to content

Commit c410900

Browse files
ting-yuanKSP Auto Pick
authored andcommitted
Get rid of KotlinCoreEnvironment.createForTests()
which is deprecated. (cherry picked from commit 2e0285f)
1 parent 6d5137b commit c410900

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/AbstractKSPTest.kt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import com.intellij.testFramework.TestDataFile
2525
import org.jetbrains.kotlin.analysis.test.framework.services.TargetPlatformDirectives
2626
import org.jetbrains.kotlin.analysis.test.framework.services.TargetPlatformProviderForAnalysisApiTests
2727
import org.jetbrains.kotlin.cli.common.disposeRootInWriteAction
28-
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
29-
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
28+
import org.jetbrains.kotlin.cli.common.output.writeAllTo
3029
import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoot
3130
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
31+
import org.jetbrains.kotlin.codegen.ClassBuilderFactories
3232
import org.jetbrains.kotlin.codegen.GenerationUtils
3333
import org.jetbrains.kotlin.config.JvmTarget
3434
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
@@ -176,13 +176,17 @@ abstract class AbstractKSPTest(frontend: FrontendKind<*>) : DisposableTest() {
176176
compilerConfiguration.addJavaSourceRoot(module.javaDir)
177177

178178
// TODO: other platforms
179-
val kotlinCoreEnvironment = KotlinCoreEnvironment.createForTests(
180-
disposable,
179+
val configurationProvider = testServices.compilerConfigurationProvider
180+
val project = configurationProvider.getProject(module)
181+
val ktFiles = module.loadKtFiles(project)
182+
GenerationUtils.compileFiles(
183+
ktFiles,
181184
compilerConfiguration,
182-
EnvironmentConfigFiles.JVM_CONFIG_FILES
183-
)
184-
val ktFiles = module.loadKtFiles(kotlinCoreEnvironment.project)
185-
GenerationUtils.compileFilesTo(ktFiles, kotlinCoreEnvironment, module.outDir)
185+
ClassBuilderFactories.TEST,
186+
configurationProvider.getPackagePartProviderFactory(module)
187+
).first.factory.apply {
188+
writeAllTo(module.outDir)
189+
}
186190

187191
if (module.javaFiles.isEmpty())
188192
return

0 commit comments

Comments
 (0)