@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot
2121import org.jetbrains.kotlin.cli.common.fir.FirDiagnosticsCompilerResultsReporter
2222import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
2323import org.jetbrains.kotlin.cli.common.messages.MessageCollector
24+ import org.jetbrains.kotlin.cli.common.modules.ModuleBuilder
2425import org.jetbrains.kotlin.cli.common.perfManager
2526import org.jetbrains.kotlin.cli.jvm.config.*
2627import org.jetbrains.kotlin.cli.jvm.config.ClassicFrontendSpecificJvmConfigurationKeys.JAVA_CLASSES_TRACKER
@@ -199,19 +200,8 @@ object KotlinToJVMBytecodeCompiler {
199200 )
200201
201202 fun compileBunchOfSources (environment : KotlinCoreEnvironment ): Boolean {
202- val moduleVisibilityManager = ModuleVisibilityManager .SERVICE .getInstance(environment.project)
203-
204- val friendPaths = environment.configuration.getList(JVMConfigurationKeys .FRIEND_PATHS )
205- for (path in friendPaths) {
206- moduleVisibilityManager.addFriendPath(path)
207- }
208-
209- if (! checkKotlinPackageUsageForPsi(environment.configuration, environment.getSourceFiles())) return false
210-
211- val generationState = analyzeAndGenerate(environment) ? : return false
212-
213- writeOutput(environment.configuration, generationState.factory, null )
214- return true
203+ val module = ModuleBuilder (" test" , environment.configuration.outputDirectory!! .path, " test" )
204+ return compileModules(environment, buildFile = null , listOf (module))
215205 }
216206
217207 private fun repeatAnalysisIfNeeded (result : AnalysisResult ? , environment : KotlinCoreEnvironment ): AnalysisResult ? {
@@ -253,7 +243,7 @@ object KotlinToJVMBytecodeCompiler {
253243 return result
254244 }
255245
256- @Suppress(" MemberVisibilityCanBePrivate " ) // Used in ExecuteKotlinScriptMojo
246+ @Suppress(" unused " ) // Used in ExecuteKotlinScriptMojo. To be removed (KT-71729).
257247 fun analyzeAndGenerate (environment : KotlinCoreEnvironment ): GenerationState ? {
258248 val result = environment.configuration.perfManager.let {
259249 it?.notifyPhaseFinished(PhaseType .Initialization )
0 commit comments