From 259b882e63764c6e1737f16f2a64fb2b69745b8b Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 13 Sep 2023 12:19:20 +0300 Subject: [PATCH] kotlin 1.9.20 --- CHANGELOG.md | 3 ++- build.gradle.kts | 12 ++---------- dataforge-io/build.gradle.kts | 3 +-- dataforge-meta/api/dataforge-meta.api | 15 ++------------- .../dataforge/workspace/FileWorkspaceCache.kt | 12 ++++++------ .../kscience/dataforge/workspace/FileDataTest.kt | 11 +++++++---- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 23 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ab4eac7..9d0ab66a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ ### Added ### Changed -- Kotlin 1.9 +- Kotlin 1.9.20. +- Migrated from ktor-io to kotlinx-io. ### Deprecated diff --git a/build.gradle.kts b/build.gradle.kts index bbab94eb..1005929b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,4 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import space.kscience.gradle.isInDevelopment import space.kscience.gradle.useApache2Licence import space.kscience.gradle.useSPCTeam @@ -9,7 +8,7 @@ plugins { allprojects { group = "space.kscience" - version = "0.6.2" + version = "0.6.3-dev-1" } subprojects { @@ -31,14 +30,7 @@ ksciencePublish { useApache2Licence() useSPCTeam() } - github("dataforge-core", "SciProgCentre") - space( - if (isInDevelopment) { - "https://maven.pkg.jetbrains.space/spc/p/sci/dev" - } else { - "https://maven.pkg.jetbrains.space/spc/p/sci/maven" - } - ) + repository("spc","https://maven.sciprog.center/kscience") sonatype() } diff --git a/dataforge-io/build.gradle.kts b/dataforge-io/build.gradle.kts index b4ad8ade..6d3c888c 100644 --- a/dataforge-io/build.gradle.kts +++ b/dataforge-io/build.gradle.kts @@ -4,7 +4,7 @@ plugins { description = "IO module" -val ioVersion = "0.2.0" +val ioVersion = "0.2.1" kscience { jvm() @@ -18,7 +18,6 @@ kscience { api(projects.dataforgeContext) api("org.jetbrains.kotlinx:kotlinx-io-core:$ioVersion") api("org.jetbrains.kotlinx:kotlinx-io-bytestring:$ioVersion") - //api("io.ktor:ktor-io:${KScienceVersions.ktorVersion}") } } diff --git a/dataforge-meta/api/dataforge-meta.api b/dataforge-meta/api/dataforge-meta.api index 94878da2..cfe175ab 100644 --- a/dataforge-meta/api/dataforge-meta.api +++ b/dataforge-meta/api/dataforge-meta.api @@ -45,9 +45,9 @@ public final class space/kscience/dataforge/meta/False : space/kscience/dataforg public final class space/kscience/dataforge/meta/JsonMetaKt { public static final fun getJSON_ARRAY_KEY (Lspace/kscience/dataforge/meta/Meta$Companion;)Ljava/lang/String; - public static final fun toJson (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lkotlinx/serialization/json/JsonObject; + public static final fun toJson (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lkotlinx/serialization/json/JsonElement; public static final fun toJson (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lkotlinx/serialization/json/JsonElement; - public static synthetic fun toJson$default (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lkotlinx/serialization/json/JsonObject; + public static synthetic fun toJson$default (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lkotlinx/serialization/json/JsonElement; public static synthetic fun toJson$default (Lspace/kscience/dataforge/meta/Value;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;ILjava/lang/Object;)Lkotlinx/serialization/json/JsonElement; public static final fun toMeta (Lkotlinx/serialization/json/JsonElement;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lspace/kscience/dataforge/meta/SealedMeta; public static final fun toMeta (Lkotlinx/serialization/json/JsonObject;Lspace/kscience/dataforge/meta/descriptors/MetaDescriptor;)Lspace/kscience/dataforge/meta/SealedMeta; @@ -639,17 +639,6 @@ public final class space/kscience/dataforge/meta/ValueType : java/lang/Enum { public static fun values ()[Lspace/kscience/dataforge/meta/ValueType; } -public final class space/kscience/dataforge/meta/ValueType$$serializer : kotlinx/serialization/internal/GeneratedSerializer { - public static final field INSTANCE Lspace/kscience/dataforge/meta/ValueType$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lspace/kscience/dataforge/meta/ValueType; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lspace/kscience/dataforge/meta/ValueType;)V - public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; -} - public final class space/kscience/dataforge/meta/ValueType$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } diff --git a/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/FileWorkspaceCache.kt b/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/FileWorkspaceCache.kt index a637ad97..e703232d 100644 --- a/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/FileWorkspaceCache.kt +++ b/dataforge-workspace/src/jvmMain/kotlin/space/kscience/dataforge/workspace/FileWorkspaceCache.kt @@ -27,10 +27,10 @@ public class JsonIOFormat(override val type: KType) : IOFormat { @Suppress("UNCHECKED_CAST") private val serializer: KSerializer = serializer(type) as KSerializer - override fun readObject(input: Source): T = Json.decodeFromString(serializer, input.readString()) + override fun readObject(source: Source): T = Json.decodeFromString(serializer, source.readString()) - override fun writeObject(output: Sink, obj: T) { - output.writeString(Json.encodeToString(serializer, obj)) + override fun writeObject(sink: Sink, obj: T) { + sink.writeString(Json.encodeToString(serializer, obj)) } } @@ -40,10 +40,10 @@ public class ProtobufIOFormat(override val type: KType) : IOFormat { @Suppress("UNCHECKED_CAST") private val serializer: KSerializer = serializer(type) as KSerializer - override fun readObject(input: Source): T = ProtoBuf.decodeFromByteArray(serializer, input.readByteArray()) + override fun readObject(source: Source): T = ProtoBuf.decodeFromByteArray(serializer, source.readByteArray()) - override fun writeObject(output: Sink, obj: T) { - output.write(ProtoBuf.encodeToByteArray(serializer, obj)) + override fun writeObject(sink: Sink, obj: T) { + sink.write(ProtoBuf.encodeToByteArray(serializer, obj)) } } diff --git a/dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/FileDataTest.kt b/dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/FileDataTest.kt index 313ea82e..cbf0b993 100644 --- a/dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/FileDataTest.kt +++ b/dataforge-workspace/src/jvmTest/kotlin/space/kscience/dataforge/workspace/FileDataTest.kt @@ -9,7 +9,10 @@ import kotlinx.io.writeString import space.kscience.dataforge.context.Context import space.kscience.dataforge.context.Global import space.kscience.dataforge.data.* -import space.kscience.dataforge.io.* +import space.kscience.dataforge.io.Envelope +import space.kscience.dataforge.io.IOFormat +import space.kscience.dataforge.io.io +import space.kscience.dataforge.io.readEnvelopeFile import space.kscience.dataforge.io.yaml.YamlPlugin import space.kscience.dataforge.meta.get import space.kscience.dataforge.misc.DFExperimental @@ -39,11 +42,11 @@ class FileDataTest { object StringIOFormat : IOFormat { override val type: KType get() = typeOf() - override fun writeObject(output: Sink, obj: String) { - output.writeString(obj) + override fun writeObject(sink: Sink, obj: String) { + sink.writeString(obj) } - override fun readObject(input: Source): String = input.readString() + override fun readObject(source: Source): String = source.readString() } @Test diff --git a/gradle.properties b/gradle.properties index 7db6f9a8..a9b414c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,5 +6,5 @@ kotlin.mpp.stability.nowarn=true kotlin.incremental.js.ir=true kotlin.native.ignoreDisabledTargets=true -toolsVersion=0.14.11-kotlin-1.9.20-Beta -kotlin.experimental.tryK2=true \ No newline at end of file +toolsVersion=0.15.0-kotlin-1.9.20-Beta +#kotlin.experimental.tryK2=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84a0b92f..db9a6b82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists