diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2118c95fa27..b5703408e3f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,7 +58,7 @@ If targeting macOS and/or iOS, install `Xcode` and `Xcode command line tools` on **Windows** For development on Windows, it is recommended to use [Cygwin](http://cygwin.com/) which will provide the necessary -libaries such as `libncurses`. +libraries such as `libncurses`. #### Referencing artifacts locally diff --git a/ktor-client/ktor-client-plugins/ktor-client-tracing/ktor-client-tracing-stetho/build.gradle.kts b/ktor-client/ktor-client-plugins/ktor-client-tracing/ktor-client-tracing-stetho/build.gradle.kts index e2695d54f5c..e7b9a345d42 100644 --- a/ktor-client/ktor-client-plugins/ktor-client-tracing/ktor-client-tracing-stetho/build.gradle.kts +++ b/ktor-client/ktor-client-plugins/ktor-client-tracing/ktor-client-tracing-stetho/build.gradle.kts @@ -31,7 +31,7 @@ kotlin { dependencies { implementation(project(":ktor-client:ktor-client-cio")) implementation(kotlin("test-junit5")) - implementation("org.mockito:mockito-core:3.12.4") + implementation("org.mockito:mockito-core:5.12.0") } } } diff --git a/ktor-http/ktor-http-cio/common/src/io/ktor/http/cio/HttpBody.kt b/ktor-http/ktor-http-cio/common/src/io/ktor/http/cio/HttpBody.kt index 4d87db1cf9d..b55dab89439 100644 --- a/ktor-http/ktor-http-cio/common/src/io/ktor/http/cio/HttpBody.kt +++ b/ktor-http/ktor-http-cio/common/src/io/ktor/http/cio/HttpBody.kt @@ -10,7 +10,7 @@ import io.ktor.utils.io.* import io.ktor.utils.io.errors.* /** - * @return `true` if an http upgrade is expected accoding to request [method], [upgrade] header value and + * @return `true` if an http upgrade is expected according to request [method], [upgrade] header value and * parsed [connectionOptions] */ public fun expectHttpUpgrade( diff --git a/ktor-http/ktor-http-cio/jvm/test/io/ktor/tests/http/cio/MultipartTest.kt b/ktor-http/ktor-http-cio/jvm/test/io/ktor/tests/http/cio/MultipartTest.kt index c262a930ab5..32aff21b386 100644 --- a/ktor-http/ktor-http-cio/jvm/test/io/ktor/tests/http/cio/MultipartTest.kt +++ b/ktor-http/ktor-http-cio/jvm/test/io/ktor/tests/http/cio/MultipartTest.kt @@ -182,7 +182,7 @@ class MultipartTest { "resolve": { "modules": [ "node_modules" // this works well - //"/absolute/path/to/dir/node_modules" // this doens't + //"/absolute/path/to/dir/node_modules" // this doesn't ] } ``` diff --git a/ktor-utils/common/src/io/ktor/util/debug/IntellijIdeaDebugDetector.kt b/ktor-utils/common/src/io/ktor/util/debug/IntellijIdeaDebugDetector.kt index faea6317bb2..44908dd2ec7 100644 --- a/ktor-utils/common/src/io/ktor/util/debug/IntellijIdeaDebugDetector.kt +++ b/ktor-utils/common/src/io/ktor/util/debug/IntellijIdeaDebugDetector.kt @@ -6,7 +6,7 @@ package io.ktor.util.debug internal expect object IntellijIdeaDebugDetector { /** - * Checks whether Intellij Idea debugger is conected to the current Ktor server. + * Checks whether Intellij Idea debugger is connected to the current Ktor server. * May return true only for JVM debugger. * */ val isDebuggerConnected: Boolean