From 75211129133e9b0d28b1b0e2cae0729f40fc9e40 Mon Sep 17 00:00:00 2001 From: Yahor Date: Tue, 3 Mar 2026 11:39:39 +0300 Subject: [PATCH] Use Kotlin 2.2.20 --- gradle/libs.versions.toml | 2 +- sample/app-android/build.gradle.kts | 1 - sample/app-wasm/build.gradle.kts | 5 ++++- .../compiler-plugin/api/tiamat-destinations-compiler.api | 1 - .../destinations/TiamatDestinationsComponentRegistrar.kt | 1 - 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 731ffe3f..730bbf1f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ sample-compileSdk = "36" sample-minSdk = "23" sample-targetSdk = "36" -kotlin = "2.3.10" +kotlin = "2.2.20" jetbrains-compose = "1.10.1" camerax = "1.5.3" lifecycle = "2.9.6" diff --git a/sample/app-android/build.gradle.kts b/sample/app-android/build.gradle.kts index 0f84af2e..b54ae64d 100644 --- a/sample/app-android/build.gradle.kts +++ b/sample/app-android/build.gradle.kts @@ -38,5 +38,4 @@ dependencies { implementation(libs.androidx.hilt.compose) implementation(libs.hilt.android) ksp(libs.hilt.compiler) - ksp("org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.10") // hilt + android 2.3.0 workaround } \ No newline at end of file diff --git a/sample/app-wasm/build.gradle.kts b/sample/app-wasm/build.gradle.kts index ea64cf60..373f182a 100644 --- a/sample/app-wasm/build.gradle.kts +++ b/sample/app-wasm/build.gradle.kts @@ -16,7 +16,10 @@ kotlin { commonWebpackConfig { outputFileName = "tiamatApp.js" devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply { - static(project.projectDir.path) + static = (static ?: mutableListOf()).apply { + // Serve sources to debug inside browser + add(project.projectDir.path) + } } } } diff --git a/tiamat-destinations/compiler-plugin/api/tiamat-destinations-compiler.api b/tiamat-destinations/compiler-plugin/api/tiamat-destinations-compiler.api index 313f7d59..ca193e24 100644 --- a/tiamat-destinations/compiler-plugin/api/tiamat-destinations-compiler.api +++ b/tiamat-destinations/compiler-plugin/api/tiamat-destinations-compiler.api @@ -11,7 +11,6 @@ public final class com/composegears/tiamat/destinations/TiamatDestinationsComman public final class com/composegears/tiamat/destinations/TiamatDestinationsComponentRegistrar : org/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar { public fun ()V - public fun getPluginId ()Ljava/lang/String; public fun getSupportsK2 ()Z public fun registerExtensions (Lorg/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar$ExtensionStorage;Lorg/jetbrains/kotlin/config/CompilerConfiguration;)V } diff --git a/tiamat-destinations/compiler-plugin/src/main/kotlin/com/composegears/tiamat/destinations/TiamatDestinationsComponentRegistrar.kt b/tiamat-destinations/compiler-plugin/src/main/kotlin/com/composegears/tiamat/destinations/TiamatDestinationsComponentRegistrar.kt index e35e875c..bed5f12d 100644 --- a/tiamat-destinations/compiler-plugin/src/main/kotlin/com/composegears/tiamat/destinations/TiamatDestinationsComponentRegistrar.kt +++ b/tiamat-destinations/compiler-plugin/src/main/kotlin/com/composegears/tiamat/destinations/TiamatDestinationsComponentRegistrar.kt @@ -8,7 +8,6 @@ import org.jetbrains.kotlin.config.CompilerConfiguration @OptIn(ExperimentalCompilerApi::class) class TiamatDestinationsComponentRegistrar : CompilerPluginRegistrar() { - override val pluginId: String = "tiamat-destinations-compiler" override val supportsK2: Boolean = true