v0.2.0-dev-22 #47

Merged
altavir merged 158 commits from dev into master 2021-07-17 11:04:22 +03:00
3 changed files with 5 additions and 3 deletions
Showing only changes of commit 720555a942 - Show all commits

View File

@ -10,7 +10,7 @@ group = "ru.mipt.npm"
val ktorVersion: String by rootProject.extra val ktorVersion: String by rootProject.extra
kscience { kscience {
// useSerialization() useSerialization()
application() application()
} }
@ -58,7 +58,7 @@ kotlin {
} }
application { application {
mainClass.set("ru.mipt.npm.gradle.muon.monitor.server.MMServerKt") mainClass.set("ru.mipt.npm.muon.monitor.server.MMServerKt")
} }
distributions { distributions {

View File

@ -1,6 +1,7 @@
package hep.dataforge.vision.plotly package hep.dataforge.vision.plotly
import hep.dataforge.context.PluginFactory import hep.dataforge.context.PluginFactory
import hep.dataforge.misc.DFExperimental
import hep.dataforge.vision.Vision import hep.dataforge.vision.Vision
import hep.dataforge.vision.VisionForge import hep.dataforge.vision.VisionForge
import hep.dataforge.vision.VisionPlugin import hep.dataforge.vision.VisionPlugin
@ -22,6 +23,7 @@ internal val plotlySerializersModule = SerializersModule {
/** /**
* Ensure that [PlotlyPlugin] is loaded in the global [VisionForge] context * Ensure that [PlotlyPlugin] is loaded in the global [VisionForge] context
*/ */
@DFExperimental
public fun VisionForge.usePlotly() { public fun VisionForge.usePlotly() {
plugins.fetch(PlotlyPlugin) plugins.fetch(PlotlyPlugin)
} }

View File

@ -72,7 +72,7 @@ public class SolidGroup(
} }
public companion object { public companion object {
//public val PROTOTYPES_TOKEN = NameToken("@prototypes") public val PROTOTYPES_TOKEN: NameToken = NameToken("@prototypes")
} }
} }