diff --git a/gradle.properties b/gradle.properties index 95f46728..7feaacca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,6 +8,6 @@ org.gradle.jvmargs=-Xmx4G org.jetbrains.compose.experimental.jscanvas.enabled=true -toolsVersion=0.15.0-kotlin-2.0.0-Beta1 +toolsVersion=0.15.2-kotlin-2.0.0-Beta2 #kotlin.experimental.tryK2=true #kscience.wasm.disabled=true diff --git a/settings.gradle.kts b/settings.gradle.kts index 8611d0aa..31119a06 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -45,7 +45,7 @@ include( ":ui:ring", // ":ui:material", ":ui:bootstrap", - ":ui:compose", +// ":ui:compose", ":visionforge-core", ":visionforge-solid", // ":visionforge-fx", diff --git a/ui/compose/build.gradle.kts b/ui/compose/build.gradle.kts index b04c5a11..77a8cfcf 100644 --- a/ui/compose/build.gradle.kts +++ b/ui/compose/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("space.kscience.gradle.mpp") - id("org.jetbrains.compose") version "1.5.11" + alias(spclibs.plugins.compose) // id("com.android.library") } diff --git a/visionforge-core/build.gradle.kts b/visionforge-core/build.gradle.kts index f2cac4c6..ad73b93d 100644 --- a/visionforge-core/build.gradle.kts +++ b/visionforge-core/build.gradle.kts @@ -12,6 +12,7 @@ kscience { dependencies { api("space.kscience:dataforge-context:$dataforgeVersion") api(spclibs.kotlinx.html) + api(spclibs.atomicfu) // api("org.jetbrains.kotlin-wrappers:kotlin-css") } jsMain { diff --git a/visionforge-markdown/src/commonMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt b/visionforge-markdown/src/commonMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt index 3508ba8b..8a6778ec 100644 --- a/visionforge-markdown/src/commonMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt +++ b/visionforge-markdown/src/commonMain/kotlin/space/kscience/visionforge/markup/MarkupPlugin.kt @@ -1,8 +1,20 @@ package space.kscience.visionforge.markup +import kotlinx.serialization.modules.SerializersModule +import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.PluginFactory +import space.kscience.dataforge.context.PluginTag +import space.kscience.dataforge.meta.Meta import space.kscience.visionforge.VisionPlugin public expect class MarkupPlugin: VisionPlugin{ - public companion object : PluginFactory + + override val tag: PluginTag + override val visionSerializersModule: SerializersModule + + public companion object : PluginFactory{ + override val tag: PluginTag + + override fun build(context: Context, meta: Meta): MarkupPlugin + } } \ No newline at end of file