Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 11 additions & 5 deletions modules/compiler-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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`
Expand All @@ -7,6 +8,15 @@ plugins {
alias(libs.plugins.jetbrainsCompose)
alias(libs.plugins.compose.compiler)
}

tasks.withType<KotlinCompile> {
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"))
Expand Down Expand Up @@ -50,7 +60,3 @@ publishing {
}
}
}

tasks.withType<KotlinCompilationTask<*>>().configureEach {
compilerOptions.optIn.add("org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi")
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading