Skip to content

Commit 6662fcd

Browse files
Mr3zeeMr3zee
authored
Fix merge queue config (2) (modelcontextprotocol#39)
* Fix merge queue config * apiDump
1 parent 55fd9d7 commit 6662fcd

File tree

3 files changed

+49
-80
lines changed

3 files changed

+49
-80
lines changed

‎.github/workflows/merge-queue.yml

-15
This file was deleted.

‎.github/workflows/validate-pr.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,22 @@ name: Validate PR
22

33
# https://github.com/orgs/community/discussions/51120#discussioncomment-8623798
44
on:
5+
merge_group:
56
workflow_dispatch:
67
pull_request:
78
types: [enqueued]
89

910
jobs:
1011
validate-pr:
1112
runs-on: ubuntu-latest
12-
name: Build
13+
name: Validate PR
1314
steps:
15+
- uses: actions/checkout@v4
16+
- name: Set up JDK 21
17+
uses: actions/setup-java@v4
18+
with:
19+
java-version: '21'
20+
distribution: 'temurin'
1421
- name: Setup Gradle
1522
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
1623

‎api/kotlin-sdk.api

+41-64
Original file line numberDiff line numberDiff line change
@@ -2689,37 +2689,25 @@ public final class io/modelcontextprotocol/kotlin/sdk/client/ClientOptions : io/
26892689
public final fun getCapabilities ()Lio/modelcontextprotocol/kotlin/sdk/ClientCapabilities;
26902690
}
26912691

2692-
public final class io/modelcontextprotocol/kotlin/sdk/client/SSEClientTransport : io/modelcontextprotocol/kotlin/sdk/shared/Transport {
2692+
public final class io/modelcontextprotocol/kotlin/sdk/client/KtorClientKt {
2693+
public static final fun mcpSse-BZiP2OM (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2694+
public static synthetic fun mcpSse-BZiP2OM$default (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
2695+
public static final fun mcpSseTransport-5_5nbZA (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/client/SseClientTransport;
2696+
public static synthetic fun mcpSseTransport-5_5nbZA$default (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/client/SseClientTransport;
2697+
}
2698+
2699+
public final class io/modelcontextprotocol/kotlin/sdk/client/SseClientTransport : io/modelcontextprotocol/kotlin/sdk/shared/AbstractTransport {
26932700
public synthetic fun <init> (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
26942701
public synthetic fun <init> (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
26952702
public fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2696-
public fun getOnClose ()Lkotlin/jvm/functions/Function0;
2697-
public fun getOnError ()Lkotlin/jvm/functions/Function1;
2698-
public fun getOnMessage ()Lkotlin/jvm/functions/Function2;
26992703
public fun send (Lio/modelcontextprotocol/kotlin/sdk/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2700-
public fun setOnClose (Lkotlin/jvm/functions/Function0;)V
2701-
public fun setOnError (Lkotlin/jvm/functions/Function1;)V
2702-
public fun setOnMessage (Lkotlin/jvm/functions/Function2;)V
27032704
public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
27042705
}
27052706

2706-
public final class io/modelcontextprotocol/kotlin/sdk/client/Sse_ktorKt {
2707-
public static final fun mcpSse-BZiP2OM (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2708-
public static synthetic fun mcpSse-BZiP2OM$default (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
2709-
public static final fun mcpSseTransport-5_5nbZA (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;)Lio/modelcontextprotocol/kotlin/sdk/client/SSEClientTransport;
2710-
public static synthetic fun mcpSseTransport-5_5nbZA$default (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/time/Duration;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/client/SSEClientTransport;
2711-
}
2712-
2713-
public final class io/modelcontextprotocol/kotlin/sdk/client/StdioClientTransport : io/modelcontextprotocol/kotlin/sdk/shared/Transport {
2707+
public final class io/modelcontextprotocol/kotlin/sdk/client/StdioClientTransport : io/modelcontextprotocol/kotlin/sdk/shared/AbstractTransport {
27142708
public fun <init> (Lkotlinx/io/Source;Lkotlinx/io/Sink;)V
27152709
public fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2716-
public fun getOnClose ()Lkotlin/jvm/functions/Function0;
2717-
public fun getOnError ()Lkotlin/jvm/functions/Function1;
2718-
public fun getOnMessage ()Lkotlin/jvm/functions/Function2;
27192710
public fun send (Lio/modelcontextprotocol/kotlin/sdk/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2720-
public fun setOnClose (Lkotlin/jvm/functions/Function0;)V
2721-
public fun setOnError (Lkotlin/jvm/functions/Function1;)V
2722-
public fun setOnMessage (Lkotlin/jvm/functions/Function2;)V
27232711
public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
27242712
}
27252713

@@ -2735,8 +2723,11 @@ public final class io/modelcontextprotocol/kotlin/sdk/client/WebSocketMcpKtorCli
27352723
public static synthetic fun mcpWebSocketTransport$default (Lio/ktor/client/HttpClient;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lio/modelcontextprotocol/kotlin/sdk/client/WebSocketClientTransport;
27362724
}
27372725

2738-
public final class io/modelcontextprotocol/kotlin/sdk/server/McpKtorServerPluginKt {
2726+
public final class io/modelcontextprotocol/kotlin/sdk/server/KtorServerKt {
27392727
public static final fun MCP (Lio/ktor/server/application/Application;Lkotlin/jvm/functions/Function0;)V
2728+
public static final fun mcp (Lio/ktor/server/application/Application;Lkotlin/jvm/functions/Function0;)V
2729+
public static final fun mcp (Lio/ktor/server/routing/Routing;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)V
2730+
public static final fun mcp (Lio/ktor/server/routing/Routing;Lkotlin/jvm/functions/Function0;)V
27402731
}
27412732

27422733
public final class io/modelcontextprotocol/kotlin/sdk/server/RegisteredPrompt {
@@ -2778,25 +2769,8 @@ public final class io/modelcontextprotocol/kotlin/sdk/server/RegisteredTool {
27782769
public fun toString ()Ljava/lang/String;
27792770
}
27802771

2781-
public final class io/modelcontextprotocol/kotlin/sdk/server/SSEServerTransport : io/modelcontextprotocol/kotlin/sdk/shared/Transport {
2782-
public fun <init> (Ljava/lang/String;Lio/ktor/server/sse/ServerSSESession;)V
2783-
public fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2784-
public fun getOnClose ()Lkotlin/jvm/functions/Function0;
2785-
public fun getOnError ()Lkotlin/jvm/functions/Function1;
2786-
public fun getOnMessage ()Lkotlin/jvm/functions/Function2;
2787-
public final fun getSessionId ()Ljava/lang/String;
2788-
public final fun handleMessage (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2789-
public final fun handlePostMessage (Lio/ktor/server/application/ApplicationCall;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2790-
public fun send (Lio/modelcontextprotocol/kotlin/sdk/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2791-
public fun setOnClose (Lkotlin/jvm/functions/Function0;)V
2792-
public fun setOnError (Lkotlin/jvm/functions/Function1;)V
2793-
public fun setOnMessage (Lkotlin/jvm/functions/Function2;)V
2794-
public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2795-
}
2796-
27972772
public class io/modelcontextprotocol/kotlin/sdk/server/Server : io/modelcontextprotocol/kotlin/sdk/shared/Protocol {
2798-
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/Implementation;Lio/modelcontextprotocol/kotlin/sdk/server/ServerOptions;Lkotlin/jvm/functions/Function0;)V
2799-
public synthetic fun <init> (Lio/modelcontextprotocol/kotlin/sdk/Implementation;Lio/modelcontextprotocol/kotlin/sdk/server/ServerOptions;Lkotlin/jvm/functions/Function0;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
2773+
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/Implementation;Lio/modelcontextprotocol/kotlin/sdk/server/ServerOptions;)V
28002774
public final fun addPrompt (Lio/modelcontextprotocol/kotlin/sdk/Prompt;Lkotlin/jvm/functions/Function2;)V
28012775
public final fun addPrompt (Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lkotlin/jvm/functions/Function2;)V
28022776
public static synthetic fun addPrompt$default (Lio/modelcontextprotocol/kotlin/sdk/server/Server;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
@@ -2814,19 +2788,17 @@ public class io/modelcontextprotocol/kotlin/sdk/server/Server : io/modelcontextp
28142788
public static synthetic fun createMessage$default (Lio/modelcontextprotocol/kotlin/sdk/server/Server;Lio/modelcontextprotocol/kotlin/sdk/CreateMessageRequest;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
28152789
public final fun getClientCapabilities ()Lio/modelcontextprotocol/kotlin/sdk/ClientCapabilities;
28162790
public final fun getClientVersion ()Lio/modelcontextprotocol/kotlin/sdk/Implementation;
2817-
public final fun getOnCloseCallback ()Lkotlin/jvm/functions/Function0;
2818-
public final fun getOnInitialized ()Lkotlin/jvm/functions/Function0;
28192791
public final fun listRoots (Lkotlinx/serialization/json/JsonObject;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
28202792
public static synthetic fun listRoots$default (Lio/modelcontextprotocol/kotlin/sdk/server/Server;Lkotlinx/serialization/json/JsonObject;Lio/modelcontextprotocol/kotlin/sdk/shared/RequestOptions;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
28212793
public fun onClose ()V
2794+
public final fun onClose (Lkotlin/jvm/functions/Function0;)V
2795+
public final fun onInitalized (Lkotlin/jvm/functions/Function0;)V
28222796
public final fun ping (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
28232797
public final fun sendLoggingMessage (Lio/modelcontextprotocol/kotlin/sdk/LoggingMessageNotification;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
28242798
public final fun sendPromptListChanged (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
28252799
public final fun sendResourceListChanged (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
28262800
public final fun sendResourceUpdated (Lio/modelcontextprotocol/kotlin/sdk/ResourceUpdatedNotification;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
28272801
public final fun sendToolListChanged (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2828-
public final fun setOnCloseCallback (Lkotlin/jvm/functions/Function0;)V
2829-
public final fun setOnInitialized (Lkotlin/jvm/functions/Function0;)V
28302802
}
28312803

28322804
public final class io/modelcontextprotocol/kotlin/sdk/server/ServerOptions : io/modelcontextprotocol/kotlin/sdk/shared/ProtocolOptions {
@@ -2835,16 +2807,20 @@ public final class io/modelcontextprotocol/kotlin/sdk/server/ServerOptions : io/
28352807
public final fun getCapabilities ()Lio/modelcontextprotocol/kotlin/sdk/ServerCapabilities;
28362808
}
28372809

2838-
public final class io/modelcontextprotocol/kotlin/sdk/server/StdioServerTransport : io/modelcontextprotocol/kotlin/sdk/shared/Transport {
2810+
public final class io/modelcontextprotocol/kotlin/sdk/server/SseServerTransport : io/modelcontextprotocol/kotlin/sdk/shared/AbstractTransport {
2811+
public fun <init> (Ljava/lang/String;Lio/ktor/server/sse/ServerSSESession;)V
2812+
public fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2813+
public final fun getSessionId ()Ljava/lang/String;
2814+
public final fun handleMessage (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2815+
public final fun handlePostMessage (Lio/ktor/server/application/ApplicationCall;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2816+
public fun send (Lio/modelcontextprotocol/kotlin/sdk/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2817+
public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2818+
}
2819+
2820+
public final class io/modelcontextprotocol/kotlin/sdk/server/StdioServerTransport : io/modelcontextprotocol/kotlin/sdk/shared/AbstractTransport {
28392821
public fun <init> (Lkotlinx/io/Source;Lkotlinx/io/Sink;)V
28402822
public fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2841-
public fun getOnClose ()Lkotlin/jvm/functions/Function0;
2842-
public fun getOnError ()Lkotlin/jvm/functions/Function1;
2843-
public fun getOnMessage ()Lkotlin/jvm/functions/Function2;
28442823
public fun send (Lio/modelcontextprotocol/kotlin/sdk/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2845-
public fun setOnClose (Lkotlin/jvm/functions/Function0;)V
2846-
public fun setOnError (Lkotlin/jvm/functions/Function1;)V
2847-
public fun setOnMessage (Lkotlin/jvm/functions/Function2;)V
28482824
public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
28492825
}
28502826

@@ -2864,6 +2840,16 @@ public final class io/modelcontextprotocol/kotlin/sdk/server/WebSocketMcpServerT
28642840
public synthetic fun getSession ()Lio/ktor/websocket/WebSocketSession;
28652841
}
28662842

2843+
public abstract class io/modelcontextprotocol/kotlin/sdk/shared/AbstractTransport : io/modelcontextprotocol/kotlin/sdk/shared/Transport {
2844+
public fun <init> ()V
2845+
protected final fun get_onClose ()Lkotlin/jvm/functions/Function0;
2846+
protected final fun get_onError ()Lkotlin/jvm/functions/Function1;
2847+
protected final fun get_onMessage ()Lkotlin/jvm/functions/Function2;
2848+
public fun onClose (Lkotlin/jvm/functions/Function0;)V
2849+
public fun onError (Lkotlin/jvm/functions/Function1;)V
2850+
public fun onMessage (Lkotlin/jvm/functions/Function2;)V
2851+
}
2852+
28672853
public abstract class io/modelcontextprotocol/kotlin/sdk/shared/Protocol {
28682854
public fun <init> (Lio/modelcontextprotocol/kotlin/sdk/shared/ProtocolOptions;)V
28692855
protected abstract fun assertCapabilityForMethod (Lio/modelcontextprotocol/kotlin/sdk/Method;)V
@@ -2933,28 +2919,19 @@ public final class io/modelcontextprotocol/kotlin/sdk/shared/RequestOptions {
29332919

29342920
public abstract interface class io/modelcontextprotocol/kotlin/sdk/shared/Transport {
29352921
public abstract fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2936-
public abstract fun getOnClose ()Lkotlin/jvm/functions/Function0;
2937-
public abstract fun getOnError ()Lkotlin/jvm/functions/Function1;
2938-
public abstract fun getOnMessage ()Lkotlin/jvm/functions/Function2;
2922+
public abstract fun onClose (Lkotlin/jvm/functions/Function0;)V
2923+
public abstract fun onError (Lkotlin/jvm/functions/Function1;)V
2924+
public abstract fun onMessage (Lkotlin/jvm/functions/Function2;)V
29392925
public abstract fun send (Lio/modelcontextprotocol/kotlin/sdk/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2940-
public abstract fun setOnClose (Lkotlin/jvm/functions/Function0;)V
2941-
public abstract fun setOnError (Lkotlin/jvm/functions/Function1;)V
2942-
public abstract fun setOnMessage (Lkotlin/jvm/functions/Function2;)V
29432926
public abstract fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
29442927
}
29452928

2946-
public abstract class io/modelcontextprotocol/kotlin/sdk/shared/WebSocketMcpTransport : io/modelcontextprotocol/kotlin/sdk/shared/Transport {
2929+
public abstract class io/modelcontextprotocol/kotlin/sdk/shared/WebSocketMcpTransport : io/modelcontextprotocol/kotlin/sdk/shared/AbstractTransport {
29472930
public fun <init> ()V
29482931
public fun close (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2949-
public fun getOnClose ()Lkotlin/jvm/functions/Function0;
2950-
public fun getOnError ()Lkotlin/jvm/functions/Function1;
2951-
public fun getOnMessage ()Lkotlin/jvm/functions/Function2;
29522932
protected abstract fun getSession ()Lio/ktor/websocket/WebSocketSession;
29532933
protected abstract fun initializeSession (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
29542934
public fun send (Lio/modelcontextprotocol/kotlin/sdk/JSONRPCMessage;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2955-
public fun setOnClose (Lkotlin/jvm/functions/Function0;)V
2956-
public fun setOnError (Lkotlin/jvm/functions/Function1;)V
2957-
public fun setOnMessage (Lkotlin/jvm/functions/Function2;)V
29582935
public fun start (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
29592936
}
29602937

0 commit comments

Comments
 (0)