Merge branch 'main' into skarpov/integration-tests

Author: skarpovdev

.github/workflows/codeql.yml

@@ -53,8 +53,13 @@ jobs:
       - name: Build Kotlin sources
         run: |
           ./gradlew \
-            :build -Pkotlin.incremental=false \
-            --no-daemon --stacktrace --parallel
+            :kotlin-sdk-core:compileKotlinJvm \
+            :kotlin-sdk-client:compileKotlinJvm \
+            :kotlin-sdk-server:compileKotlinJvm \
+            :kotlin-sdk:compileKotlinJvm \
+            :kotlin-sdk-test:compileKotlinJvm \
+            -Pkotlin.incremental=false \
+            --no-daemon --stacktrace
 
       - name: Analyze
         uses: github/codeql-action/analyze@v3

.gitignore

@@ -51,3 +51,7 @@ bin/
 ### Node.js ###
 node_modules
 dist
+
+### SWE agents ###
+.claude/
+.junie/

build.gradle.kts

@@ -1,278 +1,4 @@
-@file:OptIn(ExperimentalWasmDsl::class)
-
-import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
-import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jreleaser.model.Active
-
-plugins {
-    alias(libs.plugins.kotlin.multiplatform)
-    alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.kotlin.atomicfu)
-    alias(libs.plugins.dokka)
-    alias(libs.plugins.jreleaser)
-    `maven-publish`
-    signing
-    alias(libs.plugins.kotlinx.binary.compatibility.validator)
-}
-
-group = "io.modelcontextprotocol"
-version = "0.6.0"
-
-val javadocJar by tasks.registering(Jar::class) {
-    archiveClassifier.set("javadoc")
-}
-
-publishing {
-    publications.withType(MavenPublication::class).all {
-        if (name.contains("jvm", ignoreCase = true)) {
-            artifact(javadocJar)
-        }
-        pom.configureMavenCentralMetadata()
-        signPublicationIfKeyPresent()
-    }
-
-    repositories {
-        maven(url = layout.buildDirectory.dir("staging-deploy"))
-    }
-}
-
-jreleaser {
-    gitRootSearch = true
-    strict = true
-
-    signing {
-        active = Active.ALWAYS
-        armored = true
-        artifacts = true
-        files = true
-    }
-
-    deploy {
-        active.set(Active.ALWAYS)
-        maven {
-            active.set(Active.ALWAYS)
-            mavenCentral {
-                val ossrh by creating {
-                    active.set(Active.ALWAYS)
-                    url.set("https://central.sonatype.com/api/v1/publisher")
-                    applyMavenCentralRules = false
-                    maxRetries = 240
-                    stagingRepository(layout.buildDirectory.dir("staging-deploy").get().asFile.path)
-                    // workaround: https://github.com/jreleaser/jreleaser/issues/1784
-                    afterEvaluate {
-                        publishing.publications.forEach { publication ->
-                            if (publication is MavenPublication) {
-                                val pubName = publication.name
-
-                                if (!pubName.contains("jvm", ignoreCase = true)
-                                    && !pubName.contains("metadata", ignoreCase = true)
-                                    && !pubName.contains("kotlinMultiplatform", ignoreCase = true)
-                                ) {
-
-                                    artifactOverride {
-                                        artifactId = when {
-                                            pubName.contains("wasm", ignoreCase = true) ->
-                                                "${project.name}-wasm-${pubName.lowercase().substringAfter("wasm")}"
-
-                                            else -> "${project.name}-${pubName.lowercase()}"
-                                        }
-                                        jar = false
-                                        verifyPom = false
-                                        sourceJar = false
-                                        javadocJar = false
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    release {
-        github {
-            changelog.enabled = false
-            skipRelease = true
-            skipTag = true
-            overwrite = false
-            token = "none"
-        }
-    }
-
-    checksum {
-        individual = false
-        artifacts = false
-        files = false
-    }
-}
-
-fun MavenPom.configureMavenCentralMetadata() {
-    name by project.name
-    description by "Kotlin implementation of the Model Context Protocol (MCP)"
-    url by "https://github.com/modelcontextprotocol/kotlin-sdk"
-
-    licenses {
-        license {
-            name by "MIT License"
-            url by "https://github.com/modelcontextprotocol/kotlin-sdk/blob/main/LICENSE"
-            distribution by "repo"
-        }
-    }
-
-    developers {
-        developer {
-            id by "Anthropic"
-            name by "Anthropic Team"
-            organization by "Anthropic"
-            organizationUrl by "https://www.anthropic.com"
-        }
-    }
-
-    scm {
-        url by "https://github.com/modelcontextprotocol/kotlin-sdk"
-        connection by "scm:git:git://github.com/modelcontextprotocol/kotlin-sdk.git"
-        developerConnection by "scm:git:[email protected]:modelcontextprotocol/kotlin-sdk.git"
-    }
-}
-
-fun MavenPublication.signPublicationIfKeyPresent() {
-    val signingKey = project.getSensitiveProperty("GPG_SECRET_KEY")
-    val signingKeyPassphrase = project.getSensitiveProperty("SIGNING_PASSPHRASE")
-
-    if (!signingKey.isNullOrBlank()) {
-        the<SigningExtension>().apply {
-            useInMemoryPgpKeys(signingKey, signingKeyPassphrase)
-
-            sign(this@signPublicationIfKeyPresent)
-        }
-    }
-}
-
-fun Project.getSensitiveProperty(name: String?): String? {
-    if (name == null) {
-        error("Expected not null property '$name' for publication repository config")
-    }
-
-    return project.findProperty(name) as? String
-        ?: System.getenv(name)
-        ?: System.getProperty(name)
-}
-
-infix fun <T> Property<T>.by(value: T) {
-    set(value)
-}
-
-tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-}
-
-abstract class GenerateLibVersionTask @Inject constructor(
-    @get:Input val libVersion: String,
-    @get:OutputDirectory val sourcesDir: File,
-) : DefaultTask() {
-    @TaskAction
-    fun generate() {
-        val sourceFile = File(sourcesDir.resolve("io/modelcontextprotocol/kotlin/sdk"), "LibVersion.kt")
-
-        if (!sourceFile.exists()) {
-            sourceFile.parentFile.mkdirs()
-            sourceFile.createNewFile()
-        }
-
-        sourceFile.writeText(
-            """
-            package io.modelcontextprotocol.kotlin.sdk
-
-            public const val LIB_VERSION: String = "$libVersion"
-
-            """.trimIndent()
-        )
-    }
-}
-
-dokka {
-    moduleName.set("MCP Kotlin SDK")
-
-    dokkaSourceSets.configureEach {
-        sourceLink {
-            localDirectory.set(file("src/main/kotlin"))
-            remoteUrl("https://github.com/modelcontextprotocol/kotlin-sdk")
-            remoteLineSuffix.set("#L")
-            documentedVisibilities(VisibilityModifier.Public)
-        }
-    }
-    dokkaPublications.html {
-        outputDirectory.set(project.layout.projectDirectory.dir("docs"))
-    }
-}
-
-val sourcesDir = File(project.layout.buildDirectory.asFile.get(), "generated-sources/libVersion")
-
-val generateLibVersionTask =
-    tasks.register<GenerateLibVersionTask>("generateLibVersion", version.toString(), sourcesDir)
-
-kotlin {
-    jvm {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_1_8
-        }
-    }
-
-    iosArm64()
-    iosX64()
-    iosSimulatorArm64()
-
-    js(IR) {
-        nodejs {
-            testTask {
-                useMocha {
-                    timeout = "30s"
-                }
-            }
-        }
-    }
-
-    wasmJs {
-        nodejs()
-    }
-
-    explicitApi = ExplicitApiMode.Strict
-
-    jvmToolchain(21)
-
-    sourceSets {
-        commonMain {
-            kotlin.srcDir(generateLibVersionTask.map { it.sourcesDir })
-            dependencies {
-                api(libs.kotlinx.serialization.json)
-                api(libs.kotlinx.collections.immutable)
-                api(libs.ktor.client.cio)
-                api(libs.ktor.server.cio)
-                api(libs.ktor.server.sse)
-                api(libs.ktor.server.websockets)
-
-                implementation(libs.kotlin.logging)
-            }
-        }
-
-        commonTest {
-            dependencies {
-                implementation(libs.kotlin.test)
-                implementation(libs.ktor.server.test.host)
-                implementation(libs.kotlinx.coroutines.test)
-                implementation(libs.kotest.assertions.json)
-            }
-        }
-
-        jvmTest {
-            dependencies {
-                implementation(libs.ktor.client.mock)
-                implementation(libs.mockk)
-                implementation(libs.slf4j.simple)
-            }
-        }
-    }
-}
+allprojects {
+    group = "io.modelcontextprotocol"
+    version = "0.6.0"
+}

buildSrc/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+    mavenCentral()
+}
+
+dependencies {
+    implementation(libs.kotlin.gradle)
+    implementation(libs.kotlin.serialization)
+    implementation(libs.kotlinx.atomicfu.gradle)
+    implementation(libs.dokka.gradle)
+    implementation(libs.jreleaser.gradle)
+}

buildSrc/settings.gradle.kts

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

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

@@ -0,0 +1,23 @@
+import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
+
+plugins {
+    id("org.jetbrains.dokka")
+}
+
+dokka {
+    moduleName.set("MCP Kotlin SDK - ${project.name}")
+
+    dokkaSourceSets.configureEach {
+        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}")
+    }
+}