Refactor GenerationState creation

plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt

@@ -43,13 +43,14 @@ class StubProducerExtension(
             bindingTrace: BindingTrace,
             files: Collection<KtFile>
     ): AnalysisResult? {
-        val generationState = GenerationState(
+        val generationState = GenerationState.Builder(
                 project, 
                 StubClassBuilderFactory(),
                 module, 
                 bindingTrace.bindingContext, 
                 files.toList(),
-                CompilerConfiguration.EMPTY)
+                CompilerConfiguration.EMPTY
+        ).build()
 
         KotlinCodegenFacade.compileCorrectFiles(generationState, CompilationErrorHandler.THROW_EXCEPTION)
 

plugins/kapt3/src/org/jetbrains/kotlin/kapt3/Kapt3Extension.kt

@@ -222,14 +222,14 @@ abstract class AbstractKapt3Extension(
                 name = compilerConfiguration[CommonConfigurationKeys.MODULE_NAME] ?: module.name.asString(),
                 type = "java-production")
 
-        val generationState = GenerationState(
+        val generationState = GenerationState.Builder(
                 project,
                 builderFactory,
                 module,
                 bindingContext,
                 files,
-                compilerConfiguration,
-                targetId = targetId)
+                compilerConfiguration
+        ).targetId(targetId).build()
 
         val (classFilesCompilationTime) = measureTimeMillis {
             KotlinCodegenFacade.compileCorrectFiles(generationState, CompilationErrorHandler.THROW_EXCEPTION)