move to Kotlin 1.6.20 and KTor 2.0

CHANGELOG.md

@@ -4,9 +4,11 @@
 ### Added
 - Add `specOrNull` delegate to meta and Scheme
 - Suspended read methods to the `Binary`
+- Static `Meta` to all `DataSet`s
 
 ### Changed
 - `Factory` is now `fun interface` and uses `build` instead of `invoke`. `invoke moved to an extension.
+- KTor 2.0
 
 ### Deprecated
 

dataforge-io/build.gradle.kts

@@ -1,3 +1,5 @@
+import ru.mipt.npm.gradle.KScienceVersions
+
 plugins {
     id("ru.mipt.npm.gradle.mpp")
     id("ru.mipt.npm.gradle.native")
@@ -18,7 +20,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":dataforge-context"))
-                api(npmlibs.ktor.io)
+                api("io.ktor:ktor-io:${KScienceVersions.ktorVersion}")
             }
         }
     }

dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/Binary.kt

@@ -62,7 +62,7 @@ internal class ByteArrayBinary(
 public fun ByteArray.asBinary(): Binary = ByteArrayBinary(this)
 
 /**
- * Produce a [buildByteArray] representing an exact copy of this [Binary]
+ * Produce a [ByteArray] representing an exact copy of this [Binary]
  */
 public fun Binary.toByteArray(): ByteArray = if (this is ByteArrayBinary) {
     array.copyOf() // TODO do we need to ensure data safety here?

dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/EnvelopeBuilder.kt

@@ -34,7 +34,7 @@ public class EnvelopeBuilder : Envelope {
      * Construct a data binary from given builder
      */
     public inline fun data(block: Output.() -> Unit) {
-        data = buildByteArray { block() }.asBinary()
+        data = ByteArray { block() }.asBinary()
     }
 
     public fun seal(): Envelope = SimpleEnvelope(metaBuilder.seal(), data)

dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/MetaFormat.kt

@@ -54,9 +54,9 @@ public interface MetaFormatFactory : IOFormatFactory<Meta>, MetaFormat {
     }
 }
 
-public fun Meta.toString(format: MetaFormat): String = buildByteArray {
+public fun Meta.toString(format: MetaFormat): String = ByteArray {
     format.run {
-        writeObject(this@buildByteArray, this@toString)
+        writeObject(this@ByteArray, this@toString)
     }
 }.decodeToString()
 

dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/TaggedEnvelopeFormat.kt

@@ -26,7 +26,7 @@ public class TaggedEnvelopeFormat(
 //        ?: error("Meta format with key $metaFormatKey could not be resolved in $io")
 
 
-    private fun Tag.toBinary() = Binary(24) {
+    private fun Tag.toBinary() = Binary {
         writeRawString(START_SEQUENCE)
         writeRawString(version.name)
         writeShort(metaFormatKey)
@@ -149,7 +149,7 @@ public class TaggedEnvelopeFormat(
 
         override fun peekFormat(io: IOPlugin, binary: Binary): EnvelopeFormat? {
             return try {
-                binary.read{
+                binary.read {
                     val header = readRawString(6)
                     return@read when (header.substring(2..5)) {
                         VERSION.DF02.name -> TaggedEnvelopeFormat(io, VERSION.DF02)

dataforge-io/src/commonMain/kotlin/space/kscience/dataforge/io/ioMisc.kt

@@ -15,7 +15,6 @@ public fun Output.writeUtf8String(str: String) {
     writeFully(str.encodeToByteArray())
 }
 
-@OptIn(ExperimentalIoApi::class)
 public fun Input.readRawString(size: Int): String {
     return Charsets.ISO_8859_1.newDecoder().decodeExactBytes(this, size)
 }
@@ -24,14 +23,11 @@ public fun Input.readUtf8String(): String = readBytes().decodeToString()
 
 public fun Input.readSafeUtf8Line(): String = readUTF8Line() ?: error("Line not found")
 
-public inline fun buildByteArray(expectedSize: Int = 16, block: Output.() -> Unit): ByteArray {
+public inline fun ByteArray(block: Output.() -> Unit): ByteArray =
-    val builder = BytePacketBuilder(expectedSize)
+    buildPacket(block).readBytes()
-    builder.block()
-    return builder.build().readBytes()
-}
 
-public inline fun Binary(expectedSize: Int = 16, block: Output.() -> Unit): Binary =
+public inline fun Binary(block: Output.() -> Unit): Binary =
-    buildByteArray(expectedSize, block).asBinary()
+    ByteArray(block).asBinary()
 
 /**
  * View section of a [Binary] as an independent binary

dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/MetaFormatTest.kt

@@ -8,8 +8,8 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 
-fun Meta.toByteArray(format: MetaFormat = JsonMetaFormat) = buildByteArray {
+fun Meta.toByteArray(format: MetaFormat = JsonMetaFormat) = ByteArray {
-    format.writeObject(this@buildByteArray, this@toByteArray)
+    format.writeObject(this@ByteArray, this@toByteArray)
 }
 
 fun MetaFormat.fromByteArray(packet: ByteArray): Meta {

dataforge-io/src/commonTest/kotlin/space/kscience/dataforge/io/ioTestUtils.kt

@@ -4,7 +4,7 @@ import io.ktor.utils.io.core.ByteReadPacket
 import io.ktor.utils.io.core.use
 
 
-fun <T : Any> IOFormat<T>.writeToByteArray(obj: T): ByteArray = buildByteArray {
+fun <T : Any> IOFormat<T>.writeToByteArray(obj: T): ByteArray = ByteArray {
     writeObject(this, obj)
 }
 fun <T : Any> IOFormat<T>.readFromByteArray(array: ByteArray): T = ByteReadPacket(array).use {

dataforge-scripting/src/jvmMain/kotlin/space/kscience/dataforge/scripting/Builders.kt

@@ -27,7 +27,7 @@ public object Builders {
                 dependenciesFromCurrentContext(wholeClasspath = true)
             }
             hostConfiguration(defaultJvmScriptingHostConfiguration)
-            compilerOptions("-jvm-target", Runtime.version().feature().toString())
+            compilerOptions("-jvm-target", Runtime.version().feature().toString(),"-Xcontext-receivers")
         }
 
         val evaluationConfiguration = ScriptEvaluationConfiguration {

gradle.properties

@@ -1,13 +1,7 @@
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=1G
 org.gradle.parallel=true
 
 kotlin.code.style=official
 
-#kotlin.mpp.enableGranularSourceSetsMetadata=true
-#kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.stability.nowarn=true
 
-publishing.github=false
+toolsVersion=0.11.4-kotlin-1.6.20
-publishing.sonatype=false
-
-toolsVersion=0.11.1-kotlin-1.6.10