From c0649b42d3a913cbdff146184f6d23c3a387b599 Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Wed, 27 May 2026 13:56:28 +0200 Subject: [PATCH 1/4] Bump compose-plugin to 1.11.0 and kotlin to 2.3.20 Updated versions for compose-plugin and kotlin. --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6060b5a..35cd83c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,10 +9,10 @@ kotlinCompileTesting = "0.12.1" junitVersion = "4.13.2" storytale = "0.0.3+dev8" -compose-plugin = "1.10.0" +compose-plugin = "1.11.0" compose-navigation = "2.9.1" kotlinx-serialization-json = "1.9.0" -kotlin = "2.3.10" +kotlin = "2.3.20" kotlin-poet = "2.2.0" build-time-config = "2.3.1" code-highlights = "1.1.0" From 86209a1333055657730c9fcee9fa94ba6f141d12 Mon Sep 17 00:00:00 2001 From: "Oleksandr.Karpovich" Date: Wed, 27 May 2026 14:17:48 +0200 Subject: [PATCH 2/4] Remove iosX64 target from build configurations --- examples/build.gradle.kts | 1 - modules/gallery/build.gradle.kts | 1 - modules/runtime-api/build.gradle.kts | 1 - 3 files changed, 3 deletions(-) diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 971ac32..6e03379 100644 --- a/examples/build.gradle.kts +++ b/examples/build.gradle.kts @@ -48,7 +48,6 @@ kotlin { jvm("desktop") listOf( - iosX64(), iosArm64(), iosSimulatorArm64(), ).forEach { iosTarget -> diff --git a/modules/gallery/build.gradle.kts b/modules/gallery/build.gradle.kts index 8df5682..72f7275 100644 --- a/modules/gallery/build.gradle.kts +++ b/modules/gallery/build.gradle.kts @@ -17,7 +17,6 @@ kotlin { wasmJs { browser() } - iosX64() iosArm64() iosSimulatorArm64() jvm { diff --git a/modules/runtime-api/build.gradle.kts b/modules/runtime-api/build.gradle.kts index 279b166..2665156 100644 --- a/modules/runtime-api/build.gradle.kts +++ b/modules/runtime-api/build.gradle.kts @@ -16,7 +16,6 @@ kotlin { js { browser() } - iosX64() iosArm64() iosSimulatorArm64() jvm { From 046378557cbff575898939c42651560280872a48 Mon Sep 17 00:00:00 2001 From: "Oleksandr.Karpovich" Date: Wed, 27 May 2026 14:29:40 +0200 Subject: [PATCH 3/4] Replace FirSimpleFunction with FirNamedFunction in MakePreviewPublicFirExtensionRegistrar --- .../main/kotlin/MakePreviewPublicFirExtensionRegistrar.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/preview-processor/src/main/kotlin/MakePreviewPublicFirExtensionRegistrar.kt b/modules/preview-processor/src/main/kotlin/MakePreviewPublicFirExtensionRegistrar.kt index 2e6a505..aead365 100644 --- a/modules/preview-processor/src/main/kotlin/MakePreviewPublicFirExtensionRegistrar.kt +++ b/modules/preview-processor/src/main/kotlin/MakePreviewPublicFirExtensionRegistrar.kt @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus -import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction +import org.jetbrains.kotlin.fir.declarations.FirNamedFunction import org.jetbrains.kotlin.fir.declarations.hasAnnotation import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar import org.jetbrains.kotlin.fir.extensions.FirStatusTransformerExtension @@ -30,13 +30,13 @@ class MakePreviewPublicFirExtensionRegistrar : FirExtensionRegistrar() { class Extension(session: FirSession) : FirStatusTransformerExtension(session) { override fun needTransformStatus(declaration: FirDeclaration): Boolean { - if (declaration !is FirSimpleFunction) return false + if (declaration !is FirNamedFunction) return false return PREVIEW_CLASS_IDS.any { declaration.hasAnnotation(it, session) } } override fun transformStatus( status: FirDeclarationStatus, - function: FirSimpleFunction, + function: FirNamedFunction, containingClass: FirClassLikeSymbol<*>?, isLocal: Boolean, ): FirDeclarationStatus { From d8f38182de0edb4cb7541a5645b91b9b1998ce61 Mon Sep 17 00:00:00 2001 From: "Oleksandr.Karpovich" Date: Fri, 16 Oct 2026 14:23:54 +0200 Subject: [PATCH 4/4] Bump CMP version to 1.12.2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 35cd83c..4280f24 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ kotlinCompileTesting = "0.12.1" junitVersion = "4.13.2" storytale = "0.0.3+dev8" -compose-plugin = "1.11.0" +compose-plugin = "1.12.2" compose-navigation = "2.9.1" kotlinx-serialization-json = "1.9.0" kotlin = "2.3.20"