From 68f9fb95b4dbe074a575593d0800744bbf8b8f0c Mon Sep 17 00:00:00 2001 From: Artem Kobzar Date: Tue, 10 Mar 2026 15:37:40 +0100 Subject: [PATCH 1/2] fix(#111): support new plugin API introduced in 2.3.0 --- gradle/libs.versions.toml | 2 +- modules/compiler-plugin/build.gradle.kts | 16 +++++++++++----- .../src/kotlin/StorytaleComponentRegistrar.kt | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d9c35444..2166bb30 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ storytale = "0.0.3+dev8" compose-plugin = "1.10.0" compose-navigation = "2.9.1" kotlinx-serialization-json = "1.9.0" -kotlin = "2.2.21" +kotlin = "2.3.10" kotlin-poet = "2.2.0" build-time-config = "2.3.1" code-highlights = "1.1.0" diff --git a/modules/compiler-plugin/build.gradle.kts b/modules/compiler-plugin/build.gradle.kts index 04f2b7eb..aed235f8 100644 --- a/modules/compiler-plugin/build.gradle.kts +++ b/modules/compiler-plugin/build.gradle.kts @@ -1,4 +1,5 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `kotlin-dsl` @@ -7,6 +8,15 @@ plugins { alias(libs.plugins.jetbrainsCompose) alias(libs.plugins.compose.compiler) } + +tasks.withType { + compilerOptions { + apiVersion = KotlinVersion.KOTLIN_2_1 + languageVersion = KotlinVersion.KOTLIN_2_1 + optIn.add("org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi") + } +} + dependencies { compileOnly(compose.runtime) implementation(kotlin("compiler-embeddable")) @@ -50,7 +60,3 @@ publishing { } } } - -tasks.withType>().configureEach { - compilerOptions.optIn.add("org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi") -} diff --git a/modules/compiler-plugin/src/kotlin/StorytaleComponentRegistrar.kt b/modules/compiler-plugin/src/kotlin/StorytaleComponentRegistrar.kt index 6b8d23d9..b74bedf4 100644 --- a/modules/compiler-plugin/src/kotlin/StorytaleComponentRegistrar.kt +++ b/modules/compiler-plugin/src/kotlin/StorytaleComponentRegistrar.kt @@ -6,6 +6,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration class StorytaleComponentRegistrar : CompilerPluginRegistrar() { override val supportsK2: Boolean get() = true + override val pluginId: String = "storytale" override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) { Companion.registerExtensions(this) From 8348a98a4e6511717b167569a260cd5006b052b4 Mon Sep 17 00:00:00 2001 From: Artem Kobzar Date: Sun, 15 Mar 2026 21:02:50 +0100 Subject: [PATCH 2/2] fixup! fix(#111): support new plugin API introduced in 2.3.0 --- .../src/main/kotlin/PreviewComponentRegistrar.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/preview-processor/src/main/kotlin/PreviewComponentRegistrar.kt b/modules/preview-processor/src/main/kotlin/PreviewComponentRegistrar.kt index 71d1f332..42635d25 100644 --- a/modules/preview-processor/src/main/kotlin/PreviewComponentRegistrar.kt +++ b/modules/preview-processor/src/main/kotlin/PreviewComponentRegistrar.kt @@ -5,6 +5,7 @@ import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter @OptIn(ExperimentalCompilerApi::class) class PreviewComponentRegistrar : CompilerPluginRegistrar() { + override val pluginId: String = "storytale-preview" override val supportsK2: Boolean get() = true override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {