Merge branch 'main' into skarpov/workflow

Author: skarpovdev

.github/workflows/apidocs.yaml

@@ -33,7 +33,7 @@ jobs:
           cache: gradle
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Generate Dokka Site
         run: |-

.github/workflows/build.yml

@@ -43,7 +43,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
         with:
           add-job-summary: 'always'
           cache-read-only: true

.github/workflows/gradle-publish.yml

@@ -31,38 +31,18 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Verify publication configuration
-        run: ./gradlew jreleaserConfig
-        env:
-          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
-          JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
-          JRELEASER_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
-          JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Clean Build with Gradle
         run: ./gradlew clean build
-        env:
-          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
-          JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
-          JRELEASER_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
-          GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
-          SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
 
       - name: Publish to Maven Central Portal
         id: publish
-        run: ./gradlew publish jreleaserFullRelease --info --stacktrace -Djreleaser.verbose=true
+        run: ./gradlew publishToMavenCentral --no-configuration-cache
         env:
-          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
-          JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
-          JRELEASER_GPG_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
-          JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_TOKEN }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSPHRASE }}
           GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
           SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}

README.md

@@ -112,7 +112,9 @@ val server = Server(
             )
         )
     )
-)
+){ 
+    "This server provides example resources and demonstrates MCP capabilities." 
+}
 
 // Add a resource
 server.addResource(
@@ -156,8 +158,10 @@ fun Application.module() {
                     prompts = ServerCapabilities.Prompts(listChanged = null),
                     resources = ServerCapabilities.Resources(subscribe = null, listChanged = null)
                 )
-            )
-        )
+            ),
+        ) { 
+            "This SSE server provides prompts and resources via Server-Sent Events."
+        }
     }
 }
 ```
@@ -184,8 +188,10 @@ fun Application.module() {
                             prompts = ServerCapabilities.Prompts(listChanged = null),
                             resources = ServerCapabilities.Resources(subscribe = null, listChanged = null)
                         )
-                    )
-                )
+                    ),
+                ) {
+                    "Connect via SSE to interact with this MCP server."
+                }
             }
         }
     }

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 
 allprojects {
     group = "io.modelcontextprotocol"
-    version = "0.7.1"
+    version = "0.7.2"
 }
 
 dependencies {
@@ -33,10 +33,18 @@ dokka {
     }
 }
 
+ktlint {
+    filter {
+        exclude("**/generated*/**")
+    }
+}
+
 kover {
     reports {
         filters {
             includes.classes("io.modelcontextprotocol.kotlin.sdk.*")
+            excludes.classes("io.modelcontextprotocol.kotlin.sdk.models.*") // temporary
+            excludes.classes("io.modelcontextprotocol.kotlin.sdk.models.infrastructure.*") // generated
         }
         total {
             log {

buildSrc/build.gradle.kts

@@ -12,5 +12,5 @@ dependencies {
     implementation(libs.kotlin.serialization)
     implementation(libs.kotlinx.atomicfu.gradle)
     implementation(libs.dokka.gradle)
-    implementation(libs.jreleaser.gradle)
-}
+    implementation(libs.maven.publish)
+}

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

@@ -1,71 +1,60 @@
+import com.vanniktech.maven.publish.MavenPublishBaseExtension
+
 plugins {
     `maven-publish`
+    id("com.vanniktech.maven.publish")
     signing
 }
 
-val javadocJar by tasks.registering(Jar::class) {
-    archiveClassifier.set("javadoc")
-}
-
-publishing {
-    publications.withType<MavenPublication>().configureEach {
-        if (name.contains("jvm", ignoreCase = true)) {
-            artifact(javadocJar)
-        }
+mavenPublishing {
+    publishToMavenCentral(automaticRelease = true)
+    configureSigning(this)
 
-        pom {
-            name = project.name
-            description = "Kotlin implementation of the Model Context Protocol (MCP)"
-            url = "https://github.com/modelcontextprotocol/kotlin-sdk"
-
-            licenses {
-                license {
-                    name = "MIT License"
-                    url = "https://github.com/modelcontextprotocol/kotlin-sdk/blob/main/LICENSE"
-                    distribution = "repo"
-                }
-            }
+    pom {
+        name = project.name
+        description = "Kotlin implementation of the Model Context Protocol (MCP)"
+        url = "https://github.com/modelcontextprotocol/kotlin-sdk"
 
-            organization {
-                name = "Anthropic"
-                url = "https://www.anthropic.com"
+        licenses {
+            license {
+                name = "MIT License"
+                url = "https://github.com/modelcontextprotocol/kotlin-sdk/blob/main/LICENSE"
+                distribution = "repo"
             }
+        }
 
-            developers {
-                developer {
-                    id = "JetBrains"
-                    name = "JetBrains Team"
-                    organization = "JetBrains"
-                    organizationUrl = "https://www.jetbrains.com"
-                }
-            }
+        organization {
+            name = "Anthropic"
+            url = "https://www.anthropic.com"
+        }
 
-            scm {
-                url = "https://github.com/modelcontextprotocol/kotlin-sdk"
-                connection = "scm:git:git://github.com/modelcontextprotocol/kotlin-sdk.git"
-                developerConnection = "scm:git:[email protected]:modelcontextprotocol/kotlin-sdk.git"
+        developers {
+            developer {
+                id = "JetBrains"
+                name = "JetBrains Team"
+                organization = "JetBrains"
+                organizationUrl = "https://www.jetbrains.com"
             }
         }
-    }
 
-    repositories {
-        maven {
-            name = "staging"
-            url = uri(layout.buildDirectory.dir("staging-deploy"))
+        scm {
+            url = "https://github.com/modelcontextprotocol/kotlin-sdk"
+            connection = "scm:git:git://github.com/modelcontextprotocol/kotlin-sdk.git"
+            developerConnection = "scm:git:[email protected]:modelcontextprotocol/kotlin-sdk.git"
         }
     }
 }
 
-signing {
-    val gpgKeyName = "GPG_SIGNING_KEY"
+private fun Project.configureSigning(mavenPublishing: MavenPublishBaseExtension) {
+    val gpgKeyName = "GPG_SECRET_KEY"
     val gpgPassphraseName = "SIGNING_PASSPHRASE"
     val signingKey = providers.environmentVariable(gpgKeyName)
         .orElse(providers.gradleProperty(gpgKeyName))
     val signingPassphrase = providers.environmentVariable(gpgPassphraseName)
         .orElse(providers.gradleProperty(gpgPassphraseName))
 
     if (signingKey.isPresent) {
-        useInMemoryPgpKeys(signingKey.get(), signingPassphrase.get())
-        sign(publishing.publications)
+        mavenPublishing.signAllPublications()
+        signing.useInMemoryPgpKeys(signingKey.get(), signingPassphrase.get())
     }
-}
+}

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

@@ -7,6 +7,8 @@ org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 # Kotlin
 kotlin.code.style=official
 kotlin.daemon.jvmargs=-Xmx4G
+# Build JS targets using npm package manager https://kotlinlang.org/docs/js-project-setup.html#npm-dependencies
+kotlin.js.yarn=false
 # MPP
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.native.ignoreDisabledTargets=true

gradle.properties

@@ -4,7 +4,9 @@ kotlin = "2.2.10"
 dokka = "2.0.0"
 atomicfu = "0.29.0"
 ktlint = "13.1.0"
-kover = "0.9.1"
+kover = "0.9.2"
+mavenPublish = "0.34.0"
+binaryCompatibilityValidatorPlugin = "0.18.1"
 
 # libraries version
 serialization = "1.9.0"
@@ -13,14 +15,12 @@ coroutines = "1.10.2"
 kotlinx-io = "0.8.0"
 ktor = "3.3.0"
 logging = "7.0.13"
-jreleaser = "1.19.0"
-binaryCompatibilityValidatorPlugin = "0.18.1"
 slf4j = "2.0.17"
-kotest = "5.9.1"
+kotest = "6.0.3"
 awaitility = "4.3.0"
 
 # Samples
-mcp-kotlin = "0.7.1"
+mcp-kotlin = "0.7.2"
 anthropic = "2.7.0"
 shadow = "8.1.1"
 
@@ -30,7 +30,7 @@ kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.
 kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
 kotlinx-atomicfu-gradle = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" }
 dokka-gradle = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
-jreleaser-gradle = { module = "org.jreleaser:jreleaser-gradle-plugin", version.ref = "jreleaser" }
+maven-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "mavenPublish" }
 
 # Kotlinx libraries
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }
@@ -48,6 +48,7 @@ ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref =
 
 # Testing
 awaitility = { group = "org.awaitility", name = "awaitility-kotlin", version.ref = "awaitility" }
+kotest-assertions-core = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest" }
 kotest-assertions-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotest" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref = "ktor" }
@@ -57,7 +58,8 @@ slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4
 # Samples
 ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
 ktor-server-cio = { group = "io.ktor", name = "ktor-server-cio", version.ref = "ktor" }
-mcp-kotlin = { group = "io.modelcontextprotocol", name = "kotlin-sdk", version.ref = "mcp-kotlin" }
+mcp-kotlin-client = { group = "io.modelcontextprotocol", name = "kotlin-sdk-client", version.ref = "mcp-kotlin" }
+mcp-kotlin-server = { group = "io.modelcontextprotocol", name = "kotlin-sdk-server", version.ref = "mcp-kotlin" }
 anthropic-java = { group = "com.anthropic", name = "anthropic-java", version.ref = "anthropic" }
 ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }