Merge branch 'main' into skarpov/integration-tests

Author: skarpovdev

buildSrc/src/main/kotlin/mcp.jreleaser.gradle.kts

@@ -22,6 +22,7 @@ jreleaser {
             active = Active.ALWAYS
             mavenCentral.create("ossrh") {
                 active = Active.ALWAYS
+                sign = true
                 url = "https://central.sonatype.com/api/v1/publisher"
                 applyMavenCentralRules = false
                 maxRetries = 240
@@ -56,14 +57,6 @@ jreleaser {
             }
         }
 
-        release {
-            github {
-                enabled = false
-                skipRelease = true
-                skipTag = true
-            }
-        }
-
         checksum {
             individual = false
             artifacts = false

buildSrc/src/main/kotlin/mcp.publishing.gradle.kts

@@ -26,12 +26,17 @@ publishing {
                 }
             }
 
+            organization {
+                name = "Anthropic"
+                url = "https://www.anthropic.com"
+            }
+
             developers {
                 developer {
-                    id = "Anthropic"
-                    name = "Anthropic Team"
-                    organization = "Anthropic"
-                    organizationUrl = "https://www.anthropic.com"
+                    id = "JetBrains"
+                    name = "JetBrains Team"
+                    organization = "JetBrains"
+                    organizationUrl = "https://www.jetbrains.com"
                 }
             }
 

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types.util.kt

@@ -178,8 +178,8 @@ internal fun selectServerNotificationDeserializer(element: JsonElement): Deseria
         Method.Defined.NotificationsMessage.value -> LoggingMessageNotification.serializer()
         Method.Defined.NotificationsResourcesUpdated.value -> ResourceUpdatedNotification.serializer()
         Method.Defined.NotificationsResourcesListChanged.value -> ResourceListChangedNotification.serializer()
-        Method.Defined.ToolsList.value -> ToolListChangedNotification.serializer()
-        Method.Defined.PromptsList.value -> PromptListChangedNotification.serializer()
+        Method.Defined.NotificationsToolsListChanged.value -> ToolListChangedNotification.serializer()
+        Method.Defined.NotificationsPromptsListChanged.value -> PromptListChangedNotification.serializer()
         else -> null
     }
 }

kotlin-sdk-server/api/kotlin-sdk-server.api

@@ -3,10 +3,10 @@ public final class io/modelcontextprotocol/kotlin/sdk/LibVersionKt {
 }
 
 public final class io/modelcontextprotocol/kotlin/sdk/server/KtorServerKt {
-	public static final fun MCP (Lio/ktor/server/application/Application;Lkotlin/jvm/functions/Function0;)V
-	public static final fun mcp (Lio/ktor/server/application/Application;Lkotlin/jvm/functions/Function0;)V
-	public static final fun mcp (Lio/ktor/server/routing/Routing;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
-	public static final fun mcp (Lio/ktor/server/routing/Routing;Lkotlin/jvm/functions/Function0;)V
+	public static final fun MCP (Lio/ktor/server/application/Application;Lkotlin/jvm/functions/Function1;)V
+	public static final fun mcp (Lio/ktor/server/application/Application;Lkotlin/jvm/functions/Function1;)V
+	public static final fun mcp (Lio/ktor/server/routing/Routing;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)V
+	public static final fun mcp (Lio/ktor/server/routing/Routing;Lkotlin/jvm/functions/Function1;)V
 }
 
 public final class io/modelcontextprotocol/kotlin/sdk/server/RegisteredPrompt {

kotlin-sdk-server/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/server/KtorServer.kt

@@ -19,7 +19,7 @@ import io.ktor.utils.io.KtorDsl
 private val logger = KotlinLogging.logger {}
 
 @KtorDsl
-public fun Routing.mcp(path: String, block: () -> Server) {
+public fun Routing.mcp(path: String, block: ServerSSESession.() -> Server) {
     route(path) {
         mcp(block)
     }
@@ -29,7 +29,7 @@ public fun Routing.mcp(path: String, block: () -> Server) {
  * Configures the Ktor Application to handle Model Context Protocol (MCP) over Server-Sent Events (SSE).
  */
 @KtorDsl
-public fun Routing.mcp(block: () -> Server) {
+public fun Routing.mcp(block: ServerSSESession.() -> Server) {
     val transports = ConcurrentMap<String, SseServerTransport>()
 
     sse {
@@ -43,12 +43,12 @@ public fun Routing.mcp(block: () -> Server) {
 
 @Suppress("FunctionName")
 @Deprecated("Use mcp() instead", ReplaceWith("mcp(block)"), DeprecationLevel.WARNING)
-public fun Application.MCP(block: () -> Server) {
+public fun Application.MCP(block: ServerSSESession.() -> Server) {
     mcp(block)
 }
 
 @KtorDsl
-public fun Application.mcp(block: () -> Server) {
+public fun Application.mcp(block: ServerSSESession.() -> Server) {
     val transports = ConcurrentMap<String, SseServerTransport>()
 
     install(SSE)
@@ -67,7 +67,7 @@ public fun Application.mcp(block: () -> Server) {
 private suspend fun ServerSSESession.mcpSseEndpoint(
     postEndpoint: String,
     transports: ConcurrentMap<String, SseServerTransport>,
-    block: () -> Server,
+    block: ServerSSESession.() -> Server,
 ) {
     val transport = mcpSseTransport(postEndpoint, transports)