Revert "FEAT: Support all Tier 1, 2 and 3 targets by Kotlin & remove dependency on Kotest Json due to not supporting all targets (#151)" (#154)

This reverts commit 21aec46cd0.
This commit is contained in:
Pavel Gorgulov 2025-07-17 10:45:32 +02:00 • committed by GitHub
commit b8f69b41a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 56 additions and 93 deletions

View file

@ -220,6 +220,10 @@ kotlin {
} }
} }
iosArm64()
iosX64()
iosSimulatorArm64()
js(IR) { js(IR) {
nodejs { nodejs {
testTask { testTask {
@ -234,31 +238,6 @@ kotlin {
nodejs() nodejs()
} }
// Tier 1
macosX64()
macosArm64()
iosArm64()
iosX64()
iosSimulatorArm64()
// Tier 2
linuxX64()
linuxArm64()
watchosSimulatorArm64()
watchosX64()
// watchosArm32() not supported by libs.kotlin.logging
watchosArm64()
tvosSimulatorArm64()
tvosX64()
tvosArm64()
// Tier 3
androidNativeArm32()
androidNativeArm64()
androidNativeX86()
androidNativeX64()
mingwX64()
explicitApi = ExplicitApiMode.Strict explicitApi = ExplicitApiMode.Strict
jvmToolchain(21) jvmToolchain(21)
@ -283,6 +262,7 @@ kotlin {
implementation(libs.kotlin.test) implementation(libs.kotlin.test)
implementation(libs.ktor.server.test.host) implementation(libs.ktor.server.test.host)
implementation(libs.kotlinx.coroutines.test) implementation(libs.kotlinx.coroutines.test)
implementation(libs.kotest.assertions.json)
} }
} }

View file

@ -1,20 +1,20 @@
package io.modelcontextprotocol.kotlin.sdk package io.modelcontextprotocol.kotlin.sdk
import io.kotest.assertions.json.shouldEqualJson
import io.modelcontextprotocol.kotlin.sdk.shared.McpJson import io.modelcontextprotocol.kotlin.sdk.shared.McpJson
import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.decodeFromJsonElement
import kotlinx.serialization.json.encodeToJsonElement
import kotlinx.serialization.json.put
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
class AudioContentSerializationTest { class AudioContentSerializationTest {
private val audioContentJson = buildJsonObject { private val audioContentJson = """
put("data", "base64-encoded-audio-data") {
put("mimeType", "audio/wav") "data": "base64-encoded-audio-data",
put("type", "audio") "mimeType": "audio/wav",
"type": "audio"
} }
""".trimIndent()
private val audioContent = AudioContent( private val audioContent = AudioContent(
data = "base64-encoded-audio-data", data = "base64-encoded-audio-data",
@ -23,17 +23,12 @@ class AudioContentSerializationTest {
@Test @Test
fun `should serialize audio content`() { fun `should serialize audio content`() {
val actual = McpJson.encodeToJsonElement(audioContent) McpJson.encodeToString(audioContent) shouldEqualJson audioContentJson
assertEquals(
audioContentJson,
actual,
"Expected $actual to be equal to $audioContentJson"
)
} }
@Test @Test
fun `should deserialize audio content`() { fun `should deserialize audio content`() {
val content = McpJson.decodeFromJsonElement<AudioContent>(audioContentJson) val content = McpJson.decodeFromString<AudioContent>(audioContentJson)
assertEquals(expected = audioContent, actual = content) assertEquals(expected = audioContent, actual = content)
} }
} }

View file

@ -1,53 +1,51 @@
package io.modelcontextprotocol.kotlin.sdk package io.modelcontextprotocol.kotlin.sdk
import io.kotest.assertions.json.shouldEqualJson
import io.modelcontextprotocol.kotlin.sdk.shared.McpJson import io.modelcontextprotocol.kotlin.sdk.shared.McpJson
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonArray
import kotlinx.serialization.json.JsonPrimitive import kotlinx.serialization.json.JsonPrimitive
import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.decodeFromJsonElement
import kotlinx.serialization.json.encodeToJsonElement
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
class ToolSerializationTest { class ToolSerializationTest {
// see https://docs.anthropic.com/en/docs/build-with-claude/tool-use // see https://docs.anthropic.com/en/docs/build-with-claude/tool-use
private val getWeatherToolJson = buildJsonObject { /* language=json */
put("name", JsonPrimitive("get_weather")) private val getWeatherToolJson = """
put("description", JsonPrimitive("Get the current weather in a given location")) {
put("inputSchema", buildJsonObject { "name": "get_weather",
put("properties", buildJsonObject { "description": "Get the current weather in a given location",
put("location", buildJsonObject { "inputSchema": {
put("type", JsonPrimitive("string")) "type": "object",
put("description", JsonPrimitive("The city and state, e.g. San Francisco, CA")) "properties": {
}) "location": {
}) "type": "string",
put("required", JsonArray(listOf(JsonPrimitive("location")))) "description": "The city and state, e.g. San Francisco, CA"
put("type", JsonPrimitive("object"))
})
put("outputSchema", buildJsonObject {
put("type", JsonPrimitive("object"))
put("properties", buildJsonObject {
put("temperature", buildJsonObject {
put("type", JsonPrimitive("number"))
put("description", JsonPrimitive("Temperature in celsius"))
})
put("conditions", buildJsonObject {
put("type", JsonPrimitive("string"))
put("description", JsonPrimitive("Weather conditions description"))
})
put("humidity", buildJsonObject {
put("type", JsonPrimitive("number"))
put("description", JsonPrimitive("Humidity percentage"))
})
})
put(
"required",
JsonArray(listOf(JsonPrimitive("temperature"), JsonPrimitive("conditions"), JsonPrimitive("humidity")))
)
})
} }
},
"required": ["location"]
},
"outputSchema": {
"type": "object",
"properties": {
"temperature": {
"type": "number",
"description": "Temperature in celsius"
},
"conditions": {
"type": "string",
"description": "Weather conditions description"
},
"humidity": {
"type": "number",
"description": "Humidity percentage"
}
},
"required": ["temperature", "conditions", "humidity"]
}
}
""".trimIndent()
val getWeatherTool = Tool( val getWeatherTool = Tool(
name = "get_weather", name = "get_weather",
@ -83,18 +81,12 @@ class ToolSerializationTest {
@Test @Test
fun `should serialize get_weather tool`() { fun `should serialize get_weather tool`() {
val actual = McpJson.encodeToJsonElement(getWeatherTool) McpJson.encodeToString(getWeatherTool) shouldEqualJson getWeatherToolJson
assertEquals(
getWeatherToolJson,
actual,
"Expected $actual to be equal to $getWeatherToolJson"
)
} }
@Test @Test
fun `should deserialize get_weather tool`() { fun `should deserialize get_weather tool`() {
val tool = McpJson.decodeFromJsonElement<Tool>(getWeatherToolJson) val tool = McpJson.decodeFromString<Tool>(getWeatherToolJson)
assertEquals(expected = getWeatherTool, actual = tool) assertEquals(expected = getWeatherTool, actual = tool)
} }
@ -103,11 +95,6 @@ class ToolSerializationTest {
val json = Json(from = McpJson) { val json = Json(from = McpJson) {
encodeDefaults = false encodeDefaults = false
} }
val actual = json.encodeToJsonElement(getWeatherTool) json.encodeToString(getWeatherTool) shouldEqualJson getWeatherToolJson
assertEquals(
getWeatherToolJson,
actual,
"Expected $actual to be equal to $getWeatherToolJson"
)
} }
} }

View file

@ -4,6 +4,7 @@ import io.ktor.utils.io.charsets.Charsets
import io.ktor.utils.io.core.toByteArray import io.ktor.utils.io.core.toByteArray
import io.modelcontextprotocol.kotlin.sdk.JSONRPCMessage import io.modelcontextprotocol.kotlin.sdk.JSONRPCMessage
import io.modelcontextprotocol.kotlin.sdk.JSONRPCNotification import io.modelcontextprotocol.kotlin.sdk.JSONRPCNotification
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals

View file

@ -0,0 +1,8 @@
package io.modelcontextprotocol.kotlin.sdk.internal
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.IO
internal actual val IODispatcher: CoroutineDispatcher
get() = Dispatchers.IO