From 720555a9429dcfb03c20a6f90336835c904f6bc8 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 28 Feb 2021 15:01:36 +0300 Subject: [PATCH] Fix MM build --- demo/muon-monitor/build.gradle.kts | 4 ++-- .../kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt | 2 ++ .../kotlin/hep/dataforge/vision/solid/SolidGroup.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/demo/muon-monitor/build.gradle.kts b/demo/muon-monitor/build.gradle.kts index ce4ea12a..0e0d1dab 100644 --- a/demo/muon-monitor/build.gradle.kts +++ b/demo/muon-monitor/build.gradle.kts @@ -10,7 +10,7 @@ group = "ru.mipt.npm" val ktorVersion: String by rootProject.extra kscience { -// useSerialization() + useSerialization() application() } @@ -58,7 +58,7 @@ kotlin { } application { - mainClass.set("ru.mipt.npm.gradle.muon.monitor.server.MMServerKt") + mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt") } distributions { diff --git a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt index cba38c85..58f39f52 100644 --- a/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt +++ b/visionforge-plotly/src/commonMain/kotlin/hep/dataforge/vision/plotly/PlotlyPlugin.kt @@ -1,6 +1,7 @@ package hep.dataforge.vision.plotly import hep.dataforge.context.PluginFactory +import hep.dataforge.misc.DFExperimental import hep.dataforge.vision.Vision import hep.dataforge.vision.VisionForge import hep.dataforge.vision.VisionPlugin @@ -22,6 +23,7 @@ internal val plotlySerializersModule = SerializersModule { /** * Ensure that [PlotlyPlugin] is loaded in the global [VisionForge] context */ +@DFExperimental public fun VisionForge.usePlotly() { plugins.fetch(PlotlyPlugin) } \ No newline at end of file diff --git a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt index 55dfd65b..77d4ee13 100644 --- a/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt +++ b/visionforge-solid/src/commonMain/kotlin/hep/dataforge/vision/solid/SolidGroup.kt @@ -72,7 +72,7 @@ public class SolidGroup( } public companion object { - //public val PROTOTYPES_TOKEN = NameToken("@prototypes") + public val PROTOTYPES_TOKEN: NameToken = NameToken("@prototypes") } }