From 01bd98ff10102c51b5a80b51fb375c68264f627d Mon Sep 17 00:00:00 2001 From: SEONGILKIM Date: Sat, 4 Nov 2023 01:48:39 +0900 Subject: [PATCH] Fix using IrFactory's deprecated api (#3750) --- .../embeddablecompiler/NativeTransformer.kt | 9 +++++---- .../multiplatform/native/SpecIrGenerationExtension.kt | 9 ++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/kotest-framework/kotest-framework-multiplatform-plugin-embeddable-compiler/src/jvmMain/kotlin/io/kotest/framework/multiplatform/embeddablecompiler/NativeTransformer.kt b/kotest-framework/kotest-framework-multiplatform-plugin-embeddable-compiler/src/jvmMain/kotlin/io/kotest/framework/multiplatform/embeddablecompiler/NativeTransformer.kt index e64917f1957..476d7589c9b 100644 --- a/kotest-framework/kotest-framework-multiplatform-plugin-embeddable-compiler/src/jvmMain/kotlin/io/kotest/framework/multiplatform/embeddablecompiler/NativeTransformer.kt +++ b/kotest-framework/kotest-framework-multiplatform-plugin-embeddable-compiler/src/jvmMain/kotlin/io/kotest/framework/multiplatform/embeddablecompiler/NativeTransformer.kt @@ -43,15 +43,16 @@ class NativeTransformer(messageCollector: MessageCollector, pluginContext: IrPlu name = Name.identifier(EntryPoint.LauncherValName) }.also { field -> field.correspondingPropertySymbol = this@apply.symbol - field.initializer = pluginContext.irFactory.createExpressionBody(startOffset, endOffset) { - this.expression = DeclarationIrBuilder(pluginContext, field.symbol).irBlock { + field.initializer = pluginContext.irFactory.createExpressionBody( + startOffset, + endOffset, + DeclarationIrBuilder(pluginContext, field.symbol).irBlock { +callLauncher(launchFn, specs, configs) { irCall(withTeamCityListenerMethodNameFn).also { withTeamCity -> withTeamCity.dispatchReceiver = irCall(launcherConstructor) } } - } - } + }) } addGetter { diff --git a/kotest-framework/kotest-framework-multiplatform-plugin-legacy-native/src/jvmMain/kotlin/io/kotest/framework/multiplatform/native/SpecIrGenerationExtension.kt b/kotest-framework/kotest-framework-multiplatform-plugin-legacy-native/src/jvmMain/kotlin/io/kotest/framework/multiplatform/native/SpecIrGenerationExtension.kt index a0f744db4cc..f0e983ce2ec 100644 --- a/kotest-framework/kotest-framework-multiplatform-plugin-legacy-native/src/jvmMain/kotlin/io/kotest/framework/multiplatform/native/SpecIrGenerationExtension.kt +++ b/kotest-framework/kotest-framework-multiplatform-plugin-legacy-native/src/jvmMain/kotlin/io/kotest/framework/multiplatform/native/SpecIrGenerationExtension.kt @@ -4,6 +4,7 @@ import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder +import org.jetbrains.kotlin.backend.common.serialization.proto.IrExpression import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.toLogger import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET @@ -82,8 +83,10 @@ class SpecIrGenerationExtension(private val messageCollector: MessageCollector) name = Name.identifier(EntryPoint.LauncherValName) }.also { field -> field.correspondingPropertySymbol = this@apply.symbol - field.initializer = pluginContext.irFactory.createExpressionBody(startOffset, endOffset) { - this.expression = DeclarationIrBuilder(pluginContext, field.symbol).irBlock { + field.initializer = pluginContext.irFactory.createExpressionBody( + startOffset, + endOffset, + DeclarationIrBuilder(pluginContext, field.symbol).irBlock { +irCall(launchFn).also { launch -> launch.dispatchReceiver = irCall(withTeamCityListenerMethodNameFn).also { withTeamCity -> withTeamCity.dispatchReceiver = irCall(withSpecsFn).also { withSpecs -> @@ -99,7 +102,7 @@ class SpecIrGenerationExtension(private val messageCollector: MessageCollector) } } } - } + ) } addGetter {