kscience/dataforge-core
8
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 12 Wiki Activity

Update build version

Browse Source
This commit is contained in:
Alexander Nozik 2022-05-17 12:24:15 +03:00
parent 0fc2198832
commit f5d32ba511
No known key found for this signature in database
GPG Key ID: F7FCF2DD25C71357
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -6,7 +6,7 @@ plugins {
allprojects { allprojects {
group = "space.kscience" group = "space.kscience"
version = "0.6.0-dev-7" version = "0.6.0-dev-8"
tasks.withType<KotlinCompile>{ tasks.withType<KotlinCompile>{
kotlinOptions{ kotlinOptions{

2
dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/IOFormat.kt
View File

@ -44,7 +44,7 @@ public fun <T : Any> Binary.readWith(format: IOReader<T>): T = read {
} }
public fun <T : Any> Output.writeObject(format: IOWriter<T>, obj: T): Unit = public fun <T : Any> Output.writeObject(format: IOWriter<T>, obj: T): Unit =
format.run { writeObject(this@writeObject, obj) } format.writeObject(this@writeObject, obj)
@Type(IO_FORMAT_TYPE) @Type(IO_FORMAT_TYPE)

7
dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/IOPlugin.kt
View File

@ -53,13 +53,16 @@ public class IOPlugin(meta: Meta) : AbstractPlugin(meta) {
override fun content(target: String): Map<Name, Any> = when (target) { override fun content(target: String): Map<Name, Any> = when (target) {
META_FORMAT_TYPE -> defaultMetaFormats.toMap() META_FORMAT_TYPE -> defaultMetaFormats.toMap()
ENVELOPE_FORMAT_TYPE -> defaultEnvelopeFormats.toMap() ENVELOPE_FORMAT_TYPE -> defaultEnvelopeFormats.toMap()
IO_FORMAT_TYPE -> content(META_FORMAT_TYPE) + content(ENVELOPE_FORMAT_TYPE)
else -> super.content(target) else -> super.content(target)
} }
public companion object : PluginFactory<IOPlugin> { public companion object : PluginFactory<IOPlugin> {
public val defaultMetaFormats: List<MetaFormatFactory> = listOf(JsonMetaFormat) public val defaultMetaFormats: List<MetaFormatFactory> = listOf(JsonMetaFormat)
public val defaultEnvelopeFormats: List<EnvelopeFormatFactory> = public val defaultEnvelopeFormats: List<EnvelopeFormatFactory> = listOf(
listOf(TaggedEnvelopeFormat, TaglessEnvelopeFormat) TaggedEnvelopeFormat,
TaglessEnvelopeFormat
)
override val tag: PluginTag = PluginTag("io", group = PluginTag.DATAFORGE_GROUP) override val tag: PluginTag = PluginTag("io", group = PluginTag.DATAFORGE_GROUP)