diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e32237b3..c7d77dcd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] # kotlin kotlin-lang = "1.9.24" -rpc-core = "6.0-beta" # version for plugins and suffix for rpc-full +rpc-core = "0.1.0" # version for plugins and suffix for rpc-full # kotlin-dependent versions, will be replaced with the actual versions by a settings-conventions plugin # from 'kotlin-versions-lookup.json' lookup table diff --git a/runtime/src/commonMain/kotlin/kotlinx/rpc/internal/RPCVersion.kt b/runtime/src/commonMain/kotlin/kotlinx/rpc/internal/RPCVersion.kt index 6ada7fa2..93434823 100644 --- a/runtime/src/commonMain/kotlin/kotlinx/rpc/internal/RPCVersion.kt +++ b/runtime/src/commonMain/kotlin/kotlinx/rpc/internal/RPCVersion.kt @@ -9,7 +9,7 @@ package kotlinx.rpc.internal */ internal enum class RPCVersion { /** - * Version 6.0-beta. + * Version 0.1.0 */ - V_6_0_BETA, + V_0_1_0_BETA, } diff --git a/runtime/src/commonMain/kotlin/kotlinx/rpc/internal/transport/RPCPlugin.kt b/runtime/src/commonMain/kotlin/kotlinx/rpc/internal/transport/RPCPlugin.kt index 75dd4ae4..a5bbd548 100644 --- a/runtime/src/commonMain/kotlin/kotlinx/rpc/internal/transport/RPCPlugin.kt +++ b/runtime/src/commonMain/kotlin/kotlinx/rpc/internal/transport/RPCPlugin.kt @@ -34,7 +34,7 @@ public enum class RPCPlugin( * * Can be safely ignored. Endpoint must only handle the plugins it knows of. */ - UNKNOWN(0, RPCVersion.V_6_0_BETA), + UNKNOWN(0, RPCVersion.V_0_1_0_BETA), /** * Represents the handshake plugin of the kRPC protocol. @@ -45,12 +45,12 @@ public enum class RPCPlugin( * However, servers will be able to communicate with clients that do not support handshake, * BUT not the other way around. */ - HANDSHAKE(1, RPCVersion.V_6_0_BETA), + HANDSHAKE(1, RPCVersion.V_0_1_0_BETA), /** * This feature adds support for proper service/request cancellation over the network. */ - CANCELLATION(2, RPCVersion.V_6_0_BETA), + CANCELLATION(2, RPCVersion.V_0_1_0_BETA), ; @InternalRPCApi diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallData.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/CallData.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallData.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/CallData.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallDataBinary.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/CallDataBinary.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallDataBinary.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/CallDataBinary.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallDataString.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/CallDataString.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallDataString.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/CallDataString.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallException.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/CallException.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallException.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/CallException.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallResult.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/CallResult.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallResult.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/CallResult.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallSuccess.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/CallSuccess.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallSuccess.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/CallSuccess.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallSuccessBinary.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/CallSuccessBinary.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallSuccessBinary.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/CallSuccessBinary.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallSuccessString.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/CallSuccessString.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallSuccessString.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/CallSuccessString.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallType.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/CallType.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/CallType.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/CallType.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/Failure.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/Failure.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/Failure.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/Failure.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/Handshake.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/Handshake.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/Handshake.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/Handshake.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCCallMessage.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCCallMessage.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCCallMessage.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCCallMessage.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCGenericMessage.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCGenericMessage.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCGenericMessage.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCGenericMessage.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCMessage.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCMessage.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCMessage.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCMessage.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCPlugin.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCPlugin.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCPlugin.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCPlugin.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCPluginKey.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCPluginKey.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCPluginKey.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCPluginKey.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCProtocolMessage.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCProtocolMessage.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/RPCProtocolMessage.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/RPCProtocolMessage.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/SerializedException.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/SerializedException.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/SerializedException.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/SerializedException.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/StackElement.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/StackElement.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/StackElement.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/StackElement.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/StreamCancel.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/StreamCancel.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/StreamCancel.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/StreamCancel.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/StreamFinished.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/StreamFinished.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/StreamFinished.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/StreamFinished.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/StreamMessage.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/StreamMessage.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/StreamMessage.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/StreamMessage.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/StreamMessageBinary.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/StreamMessageBinary.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/StreamMessageBinary.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/StreamMessageBinary.gold diff --git a/runtime/src/jvmTest/resources/class_dumps/6_0_beta/StreamMessageString.gold b/runtime/src/jvmTest/resources/class_dumps/0_1_0/StreamMessageString.gold similarity index 100% rename from runtime/src/jvmTest/resources/class_dumps/6_0_beta/StreamMessageString.gold rename to runtime/src/jvmTest/resources/class_dumps/0_1_0/StreamMessageString.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/callException_json.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/callException_json.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/callException_json.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/callException_json.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/clientStream_json.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/clientStream_json.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/clientStream_json.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/clientStream_json.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/clientStream_protobuf.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/clientStream_protobuf.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/clientStream_protobuf.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/clientStream_protobuf.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/echo_json.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/echo_json.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/echo_json.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/echo_json.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/echo_protobuf.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/echo_protobuf.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/echo_protobuf.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/echo_protobuf.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/plainFlow_json.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/plainFlow_json.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/plainFlow_json.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/plainFlow_json.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/plainFlow_protobuf.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/plainFlow_protobuf.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/plainFlow_protobuf.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/plainFlow_protobuf.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/serverStream_json.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/serverStream_json.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/serverStream_json.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/serverStream_json.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/serverStream_protobuf.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/serverStream_protobuf.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/serverStream_protobuf.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/serverStream_protobuf.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/sharedFlow_json.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/sharedFlow_json.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/sharedFlow_json.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/sharedFlow_json.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/sharedFlow_protobuf.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/sharedFlow_protobuf.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/sharedFlow_protobuf.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/sharedFlow_protobuf.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/stateFlow_json.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/stateFlow_json.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/stateFlow_json.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/stateFlow_json.gold diff --git a/runtime/src/jvmTest/resources/wire_dumps/6_0_beta/stateFlow_protobuf.gold b/runtime/src/jvmTest/resources/wire_dumps/0_1_0/stateFlow_protobuf.gold similarity index 100% rename from runtime/src/jvmTest/resources/wire_dumps/6_0_beta/stateFlow_protobuf.gold rename to runtime/src/jvmTest/resources/wire_dumps/0_1_0/stateFlow_protobuf.gold diff --git a/samples/ktor-all-platforms-app/gradle/libs.versions.toml b/samples/ktor-all-platforms-app/gradle/libs.versions.toml index 20342488..7e304818 100644 --- a/samples/ktor-all-platforms-app/gradle/libs.versions.toml +++ b/samples/ktor-all-platforms-app/gradle/libs.versions.toml @@ -20,7 +20,7 @@ ktor = "2.3.8" logback = "1.4.14" kotlinx-serialization-json = "1.6.1" kotlinx-coroutines-core = "1.7.3" -kotlinx-rpc = "6.0-beta" +kotlinx-rpc = "0.1.0" [libraries] # kotlin diff --git a/samples/ktor-android-app/gradle/libs.versions.toml b/samples/ktor-android-app/gradle/libs.versions.toml index 0d3f8277..dc3edc08 100644 --- a/samples/ktor-android-app/gradle/libs.versions.toml +++ b/samples/ktor-android-app/gradle/libs.versions.toml @@ -13,7 +13,7 @@ ktor = "2.3.8" kotlinx-serialization-json = "1.6.1" kotlinx-coroutines-core = "1.7.3" logback = "1.4.4" -kotlinx-rpc = "6.0-beta" +kotlinx-rpc = "0.1.0" ksp = "1.9.22-1.0.17" [libraries] diff --git a/samples/ktor-web-app/gradle/libs.versions.toml b/samples/ktor-web-app/gradle/libs.versions.toml index 0a85cfe2..75a8ca09 100644 --- a/samples/ktor-web-app/gradle/libs.versions.toml +++ b/samples/ktor-web-app/gradle/libs.versions.toml @@ -5,7 +5,7 @@ ktor = "2.3.11" kotlinx-serialization-json = "1.6.1" kotlinx-coroutines-core = "1.7.3" logback = "1.4.4" -krpc = "6.0-beta" +krpc = "0.1.0" ksp = "1.9.24-1.0.20" [libraries] diff --git a/samples/simple-ktor-app/build.gradle.kts b/samples/simple-ktor-app/build.gradle.kts index 5d431e1e..844a8008 100644 --- a/samples/simple-ktor-app/build.gradle.kts +++ b/samples/simple-ktor-app/build.gradle.kts @@ -7,7 +7,7 @@ plugins { kotlin("plugin.serialization") version "1.9.24" id("io.ktor.plugin") version "2.3.11" id("com.google.devtools.ksp") version "1.9.24-1.0.20" - id("org.jetbrains.kotlinx.rpc.plugin") version "6.0-beta" + id("org.jetbrains.kotlinx.rpc.plugin") version "0.1.0" } val kotlin_version: String by project