Merge branch 'main' into dependabot/gradle/kotlin-2.2.20

Author: kpavlov

.github/workflows/apidocs.yaml

@@ -0,0 +1,49 @@
+name: Build and Publish API Docs to GitHub Pages
+
+on:
+  release:
+    types:
+      - published
+  # Allow running this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  deploy:
+
+    permissions:
+      pages: write      # to deploy to Pages
+      id-token: write   # to verify the deployment originates from an appropriate source
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: true  # Fetch Hugo themes (true OR recursive)
+          fetch-depth: 0    # Fetch all history for .GitInfo and .Lastmod
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Generate Dokka Site
+        run: |-
+          ./gradlew clean dokkaGenerate
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v4
+        with:
+          path: build/dokka/html
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/build.yml

@@ -16,6 +16,8 @@ jobs:
   validate-pr:
     runs-on: macos-latest-xlarge
     name: Validate PR
+    env:
+      JAVA_OPTS: "-Xmx8g -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dkotlin.daemon.jvm.options=-Xmx6g"
     steps:
       - uses: actions/checkout@v5
 
@@ -32,18 +34,41 @@ jobs:
           cache-read-only: true
 
       - name: Build with Gradle
-        run: ./gradlew clean ktlintCheck build koverLog koverHtmlReport
-        env:
-          JAVA_OPTS: "-Xmx8g -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dkotlin.daemon.jvm.options=-Xmx6g"
+        run: |-
+          ./gradlew clean ktlintCheck build koverLog koverHtmlReport
+          ./gradlew :kotlin-sdk-core:publishToMavenLocal :kotlin-sdk-client:publishToMavenLocal :kotlin-sdk-server:publishToMavenLocal
+
+      - name: Build Kotlin-MCP-Client Sample
+        working-directory: ./samples/kotlin-mcp-client
+        run: ./../../gradlew clean build
+
+      - name: Build Kotlin-MCP-Server Sample
+        working-directory: ./samples/kotlin-mcp-server
+        run: ./../../gradlew clean build
+
+      - name: Build Weather-Stdio-Server Sample
+        working-directory: ./samples/weather-stdio-server
+        run: ./../../gradlew clean build
 
       - name: Upload Reports
-        if: always()
+        if: ${{ !cancelled() }}
         uses: actions/upload-artifact@v4
         with:
           name: reports
           path: |
             **/build/reports/
 
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v5
+        if: ${{ !cancelled() }} # always run even if the previous step fails
+        with:
+          report_paths: '**/test-results/**/TEST-*.xml'
+          detailed_summary: true
+          flaky_summary: true
+          include_empty_in_summary: false
+          include_time_in_summary: true
+          annotate_only: true
+
       - name: Disable Auto-Merge on Fail
         if: failure() && github.event_name == 'pull_request'
         run: gh pr merge --disable-auto "$PR_URL"

.github/workflows/gradle-publish.yml

@@ -33,36 +33,16 @@ jobs:
       - 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 }}
-
       - 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 }}

.gitignore

@@ -11,6 +11,7 @@ build/
 .idea/compiler.xml
 .idea/libraries/
 .idea
+!.idea/icon.png
 *.iws
 *.iml
 *.ipr

build.gradle.kts

@@ -1,14 +1,19 @@
 plugins {
+    id("mcp.dokka")
     alias(libs.plugins.ktlint)
     alias(libs.plugins.kover)
 }
 
 allprojects {
     group = "io.modelcontextprotocol"
-    version = "0.7.0"
+    version = "0.7.2"
 }
 
 dependencies {
+    dokka(project(":kotlin-sdk-core"))
+    dokka(project(":kotlin-sdk-client"))
+    dokka(project(":kotlin-sdk-server"))
+
     kover(project(":kotlin-sdk-core"))
     kover(project(":kotlin-sdk-client"))
     kover(project(":kotlin-sdk-server"))
@@ -20,6 +25,14 @@ subprojects {
     apply(plugin = "org.jetbrains.kotlinx.kover")
 }
 
+dokka {
+    moduleName = "MCP Kotlin SDK"
+
+    dokkaPublications.html {
+        includes.from("docs/moduledoc.md")
+    }
+}
+
 kover {
     reports {
         filters {

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.dokka.gradle.kts

@@ -5,19 +5,35 @@ plugins {
 }
 
 dokka {
-    moduleName.set("MCP Kotlin SDK - ${project.name}")
 
     dokkaSourceSets.configureEach {
+        includes.from("Module.md")
+
+        pluginsConfiguration.html {
+            footerMessage = "Copyright © 2024-2025 Anthropic, PBC"
+        }
+
         sourceLink {
             localDirectory = projectDir.resolve("src")
             remoteUrl("https://github.com/modelcontextprotocol/kotlin-sdk/tree/main/${project.name}/src")
             remoteLineSuffix = "#L"
         }
 
         documentedVisibilities(VisibilityModifier.Public)
-    }
 
-    dokkaPublications.html {
-        outputDirectory = rootProject.layout.projectDirectory.dir("docs/${project.name}")
+        externalDocumentationLinks.register("ktor-client") {
+            url("https://api.ktor.io/ktor-client/")
+            packageListUrl("https://api.ktor.io/package-list")
+        }
+
+        externalDocumentationLinks.register("kotlinx-coroutines") {
+            url("https://kotlinlang.org/api/kotlinx.coroutines/")
+            packageListUrl("https://kotlinlang.org/api/kotlinx.coroutines/package-list")
+        }
+
+        externalDocumentationLinks.register("kotlinx-serialization") {
+            url("https://kotlinlang.org/api/kotlinx.serialization/")
+            packageListUrl("https://kotlinlang.org/api/kotlinx.serialization/package-list")
+        }
     }
-}
+}

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

@@ -10,25 +10,6 @@ plugins {
     id("org.jetbrains.kotlinx.atomicfu")
 }
 
-// Generation library versions
-val generateLibVersion by tasks.registering {
-    val outputDir = layout.buildDirectory.dir("generated-sources/libVersion")
-    outputs.dir(outputDir)
-
-    doLast {
-        val sourceFile = outputDir.get().file("io/modelcontextprotocol/kotlin/sdk/LibVersion.kt").asFile
-        sourceFile.parentFile.mkdirs()
-        sourceFile.writeText(
-            """
-            package io.modelcontextprotocol.kotlin.sdk
-
-            public const val LIB_VERSION: String = "${project.version}"
-            
-            """.trimIndent()
-        )
-    }
-}
-
 kotlin {
     jvm {
         compilerOptions.jvmTarget = JvmTarget.JVM_1_8
@@ -41,10 +22,4 @@ kotlin {
 
     explicitApi = ExplicitApiMode.Strict
     jvmToolchain(21)
-
-    sourceSets {
-        commonMain {
-            kotlin.srcDir(generateLibVersion)
-        }
-    }
 }