diff --git a/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/SimpleIrBodyGenerator.kt b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/SimpleIrBodyGenerator.kt index 3bf1067..76fa71c 100644 --- a/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/SimpleIrBodyGenerator.kt +++ b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/SimpleIrBodyGenerator.kt @@ -7,7 +7,6 @@ import org.jetbrains.kotlin.ir.declarations.IrConstructor import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction import org.jetbrains.kotlin.ir.declarations.createBlockBody import org.jetbrains.kotlin.ir.expressions.IrBody -import org.jetbrains.kotlin.ir.expressions.IrConstKind import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl @@ -18,7 +17,7 @@ class SimpleIrBodyGenerator(pluginContext: IrPluginContext) : AbstractTransforme override fun generateBodyForFunction(function: IrSimpleFunction, key: GeneratedDeclarationKey?): IrBody { require(function.name == SimpleClassGenerator.FOO_ID.callableName) - val const = IrConstImpl(-1, -1, irBuiltIns.stringType, IrConstKind.String, value = "Hello world") + val const = IrConstImpl.string(-1, -1, irBuiltIns.stringType, value = "Hello world") val returnStatement = IrReturnImpl(-1, -1, irBuiltIns.nothingType, function.symbol, const) return irFactory.createBlockBody(-1, -1, listOf(returnStatement)) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4fdf720..56430a1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # https://github.com/JetBrains/kotlin -kotlin = "2.4.20" +kotlin = "2.5.0-Beta1" # https://github.com/junit-team/junit4 junit = "4.13.2" diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index a0eaa50..9d50fa5 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -181,11 +181,6 @@ foreground-child@^3.1.0: cross-spawn "^7.0.6" signal-exit "^4.0.1" -format-util@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271" - integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg== - get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -254,12 +249,10 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -kotlin-web-helpers@3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-3.3.0.tgz#4c0bf6bcfa64752f6f1531e4c84583943bc7e9d6" - integrity sha512-sXnwHZ2YGMtIia+NQlf/c0UDtwVNHhXsIH+uHkTv87AvvZQJjJ+XbdkvUUuomPWgBC5TgcQLDEGLcjL48QkFkQ== - dependencies: - format-util "^1.0.5" +kotlin-web-helpers@3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-3.5.3.tgz#4c85e5e3ce011ea82f8fe2ff9c01c6fa50989b41" + integrity sha512-ZJ/1Ti+9sPplfS9Rpe67lT4WPazgyaz5JKQpf7HEXzZs4ARnT9005TUZr3Zg81HIUi/HKrx4/CI9gkGGkNFoLg== locate-path@^6.0.0: version "6.0.0" diff --git a/plugin-annotations/api/plugin-annotations.klib.api b/plugin-annotations/api/plugin-annotations.klib.api index aa689ba..4b9452d 100644 --- a/plugin-annotations/api/plugin-annotations.klib.api +++ b/plugin-annotations/api/plugin-annotations.klib.api @@ -1,5 +1,5 @@ // Klib ABI Dump -// Targets: [androidNativeArm32, androidNativeArm64, androidNativeX64, androidNativeX86, iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, mingwX64, tvosArm64, tvosSimulatorArm64, wasmJs, wasmWasi, watchosArm32, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64] +// Targets: [androidNativeArm32, androidNativeArm64, androidNativeX64, androidNativeX86, iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, mingwX64, tvosArm64, tvosSimulatorArm64, wasmJs, wasmWasi, watchosArm64, watchosDeviceArm64, watchosSimulatorArm64] // Rendering settings: // - Signature version: 2 // - Show manifest properties: true diff --git a/plugin-annotations/build.gradle.kts b/plugin-annotations/build.gradle.kts index cb89cea..c67126e 100644 --- a/plugin-annotations/build.gradle.kts +++ b/plugin-annotations/build.gradle.kts @@ -35,7 +35,6 @@ kotlin { wasmJs().nodejs() wasmWasi().nodejs() - watchosArm32() watchosArm64() watchosDeviceArm64() watchosSimulatorArm64()