Merge branch 'main' into jetbrains-junie/issue-KTOR-8523-run-1d200765-01c9-481c-865a-a1f63e217d3a

Author: e5l

CHANGELOG.md

@@ -1,3 +1,53 @@
+# 3.2.0
+> Published 12 June 2025
+
+### Features
+* Dependency injection Ktor extension ([KTOR-8267](https://youtrack.jetbrains.com/issue/KTOR-8267))
+* Support Version Catalog ([KTOR-8162](https://youtrack.jetbrains.com/issue/KTOR-8162))
+* Unix domain socket support at the Ktor Engine level ([KTOR-4766](https://youtrack.jetbrains.com/issue/KTOR-4766))
+* Allow suspend Ktor modules ([KTOR-8005](https://youtrack.jetbrains.com/issue/KTOR-8005))
+* Ability to use browser cookie storage ([KTOR-539](https://youtrack.jetbrains.com/issue/KTOR-539))
+* Configuration file deserialization ([KTOR-7874](https://youtrack.jetbrains.com/issue/KTOR-7874))
+* HttpCache: Support evicting/clearing cache ([KTOR-6653](https://youtrack.jetbrains.com/issue/KTOR-6653))
+* File configuration for dependencies ([KTOR-8304](https://youtrack.jetbrains.com/issue/KTOR-8304))
+
+### Improvements
+* Excessive allocation of ApplicationConfig when loading multiple files from CLI ([KTOR-8563](https://youtrack.jetbrains.com/issue/KTOR-8563))
+* Linux curl engine doesn't work for simultaneous websocket and http request ([KTOR-8259](https://youtrack.jetbrains.com/issue/KTOR-8259))
+* ktor-network produces ProGuard warning ([KTOR-8525](https://youtrack.jetbrains.com/issue/KTOR-8525))
+* More overloads for StringValuesBuilder.appendAll ([KTOR-8573](https://youtrack.jetbrains.com/issue/KTOR-8573))
+* HttpClientCall: Deprecate `wrapWithContent` and `wrap` ([KTOR-8378](https://youtrack.jetbrains.com/issue/KTOR-8378))
+* Add a way to create an `ApplicationCall` for testing ([KTOR-7607](https://youtrack.jetbrains.com/issue/KTOR-7607))
+* Configuration access API improvements ([KTOR-8185](https://youtrack.jetbrains.com/issue/KTOR-8185))
+* Application instance access in testApplication ([KTOR-8215](https://youtrack.jetbrains.com/issue/KTOR-8215))
+* The TestApplication client should be configurable and mutable ([KTOR-8465](https://youtrack.jetbrains.com/issue/KTOR-8465))
+* Support accessing resolved IP address on an instance of `io.ktor.network.sockets.InetSocketAddress` ([KTOR-8490](https://youtrack.jetbrains.com/issue/KTOR-8490))
+* Deprecate SaveBodyPlugin in favor of HttpClientCall.save ([KTOR-8367](https://youtrack.jetbrains.com/issue/KTOR-8367))
+* Obscure log message on server startup ([KTOR-8519](https://youtrack.jetbrains.com/issue/KTOR-8519))
+* Routing: `accept` should return 406 if the `Accept` header isn't matched ([KTOR-8416](https://youtrack.jetbrains.com/issue/KTOR-8416))
+* MicrometerMetrics: the `route` label can exceed length limit ([KTOR-7274](https://youtrack.jetbrains.com/issue/KTOR-7274))
+* Micrometer: Make route label configurable ([KTOR-8183](https://youtrack.jetbrains.com/issue/KTOR-8183))
+* Add more common ContentType values ([KTOR-7108](https://youtrack.jetbrains.com/issue/KTOR-7108))
+
+### Bugfixes
+* Logging/Darwin: IOException is thrown when detecting if body is a binary ([KTOR-8581](https://youtrack.jetbrains.com/issue/KTOR-8581))
+* Netty: NoSuchElementException or empty headers when responding with 204 ([KTOR-8528](https://youtrack.jetbrains.com/issue/KTOR-8528))
+* YAML configuration: NoSuchElementException when parameter is expanded with curly braces ([KTOR-8575](https://youtrack.jetbrains.com/issue/KTOR-8575))
+* ApplicationConfig: Most of the content is absent after merging configs ([KTOR-8565](https://youtrack.jetbrains.com/issue/KTOR-8565))
+* Android: "ProtocolException: TRACE does not support writing" when sending TRACE request ([KTOR-8352](https://youtrack.jetbrains.com/issue/KTOR-8352))
+* The "Content-Length: 0" header is added for GET requests sent to some servers ([KTOR-6508](https://youtrack.jetbrains.com/issue/KTOR-6508))
+* HttpRequestRetry: requests with some IOException's thrown by Java engine aren't retried ([KTOR-6770](https://youtrack.jetbrains.com/issue/KTOR-6770))
+* HttpCookies: Encoding of request cookies is not preserved in CookiesStorage ([KTOR-8343](https://youtrack.jetbrains.com/issue/KTOR-8343))
+* Url class mangles data URLs ([KTOR-5708](https://youtrack.jetbrains.com/issue/KTOR-5708))
+* SaveBodyPlugin: Logging plugin consumes response body ([KTOR-6474](https://youtrack.jetbrains.com/issue/KTOR-6474))
+* Config deserialization does not respect `testApplication` environment ([KTOR-8436](https://youtrack.jetbrains.com/issue/KTOR-8436))
+* Resources: Exclude a parent from query params when it is an object ([KTOR-8507](https://youtrack.jetbrains.com/issue/KTOR-8507))
+* BearerAuthProvider does not clear token if refreshTokens returns null ([KTOR-8470](https://youtrack.jetbrains.com/issue/KTOR-8470))
+* Coroutines launched from RoutingContext are not cancelled upon server shutdown ([KTOR-8338](https://youtrack.jetbrains.com/issue/KTOR-8338))
+* Application job is not joined during shutdown ([KTOR-8291](https://youtrack.jetbrains.com/issue/KTOR-8291))
+* HttpCache: InvalidCacheStateException thrown when Vary header has different entries is overly severe ([KTOR-8345](https://youtrack.jetbrains.com/issue/KTOR-8345))
+* Fix socket channel close handling ([KTOR-8201](https://youtrack.jetbrains.com/issue/KTOR-8201))
+
 # 3.1.3
 > Published 5 May 2025
 

build-logic/src/main/kotlin/ktorbuild.base.gradle.kts

@@ -9,3 +9,5 @@ version = resolveVersion()
 
 ProjectTagsService.register(project)
 extensions.create<KtorBuildExtension>(KtorBuildExtension.NAME)
+
+registerPackageJsonAggregationTask()

build-logic/src/main/kotlin/ktorbuild.publish.gradle.kts

@@ -66,6 +66,18 @@ plugins.withId("ktorbuild.kmp") {
     configureJavadocArtifact()
 }
 
+pluginManager.withPlugin("java-platform") {
+    publishing.publications.register<MavenPublication>("maven") {
+        from(components["javaPlatform"])
+    }
+}
+
+pluginManager.withPlugin("version-catalog") {
+    publishing.publications.register<MavenPublication>("maven") {
+        from(components["versionCatalog"])
+    }
+}
+
 private fun Project.configureSigning() {
     extra["signing.gnupg.keyName"] = (System.getenv("SIGN_KEY_ID") ?: return)
     extra["signing.gnupg.passphrase"] = (System.getenv("SIGN_KEY_PASSPHRASE") ?: return)

build-logic/src/main/kotlin/ktorbuild/PackageJsonTask.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package ktorbuild
+
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.targets.js.npm.PublicPackageJsonTask
+
+/**
+ * Register an empty task that will trigger all [PublicPackageJsonTask] tasks in the project.
+ * This task should be registered for every project to make [dependsOnPackageJsonAggregation] work.
+ */
+internal fun Project.registerPackageJsonAggregationTask() {
+    tasks.register(TASK_NAME) {
+        dependsOn(tasks.withType<PublicPackageJsonTask>())
+    }
+}
+
+/**
+ * Ensures that all [PublicPackageJsonTask] tasks are executed before the task is executed.
+ */
+fun Task.dependsOnPackageJsonAggregation() {
+    dependsOn(project.subprojects.map { subproject -> "${subproject.path}:$TASK_NAME" })
+}
+
+private const val TASK_NAME = "packageJsonAggregation"

build.gradle.kts

@@ -2,10 +2,17 @@
  * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
+import ktorbuild.dependsOnPackageJsonAggregation
+
 plugins {
     id("ktorbuild.doctor")
     id("ktorbuild.publish.verifier")
 }
 
 println("Build version: ${project.version}")
 println("Kotlin version: ${libs.versions.kotlin.get()}")
+
+// Workaround to make the ':packageJsonUmbrella' task compatible with configuration on demand
+// Issue: https://youtrack.jetbrains.com/issue/KT-55701
+tasks.named { it == "packageJsonUmbrella" }
+    .configureEach { dependsOnPackageJsonAggregation() }

gradle.properties

@@ -7,7 +7,7 @@ kotlin.code.style=official
 
 # config
 group=io.ktor
-version=3.2.0-SNAPSHOT
+version=3.2.0
 
 ## Performance
 
@@ -48,8 +48,13 @@ org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.configuration-cache=true
 org.gradle.configuration-cache.parallel=true
+org.gradle.configuration-cache.entries-per-key=3
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
 
+# Speeds up the configuration phase but might cause problems with running some tasks on a single module.
+# If you experience problems with this flag, try to add `--no-configure-on-demand` or set this flag to `false`
+org.gradle.configureondemand=true
+
 # kotlin
 kotlin.native.ignoreDisabledTargets=true
 kotlin.mpp.stability.nowarn=true

gradle/artifacts/publishJvmAndCommonPublications.txt

@@ -623,6 +623,7 @@ io.ktor:ktor-utils-jvm/sources.jar
 io.ktor:ktor-utils/.jar
 io.ktor:ktor-utils/kotlin-tooling-metadata.json
 io.ktor:ktor-utils/sources.jar
+io.ktor:ktor-version-catalog/.toml
 io.ktor:ktor-websocket-serialization-jvm/.jar
 io.ktor:ktor-websocket-serialization-jvm/javadoc.jar
 io.ktor:ktor-websocket-serialization-jvm/sources.jar

gradle/libs.versions.toml

@@ -10,39 +10,39 @@ serialization = "1.8.1"
 binaryCompatibilityValidator = "0.17.0"
 dokka = "2.0.0"
 kover = "0.9.1"
-kotlinter = "5.0.2"
+kotlinter = "5.1.1"
 kotlinx-browser = "0.3"
 
 # Used for test server in buildSrc
-ktor = "3.2.0-eap-1264"
+ktor = "3.2.0-eap-1336"
 
-netty = "4.1.119.Final"
-netty-tcnative = "2.0.71.Final"
+netty = "4.2.2.Final"
+netty-tcnative = "2.0.72.Final"
 
 jetty = "9.4.57.v20241219"
 jetty-jakarta = "11.0.25"
 jetty-alpn-api = "1.1.3.v20160715"
 jetty-alpn-openjdk8 = "9.4.57.v20241219"
 
-tomcat = "9.0.105"
-tomcat-jakarta = "10.1.40"
+tomcat = "9.0.106"
+tomcat-jakarta = "10.1.42"
 
 apache = "4.1.5"
-apache5 = "5.4.4"
+apache5 = "5.5"
 apacheds = "2.0.0.AM27"
 okhttp = "4.12.0"
-okio = "3.11.0"
+okio = "3.12.0"
 
 json-simple = "1.1.1"
 gson = "2.13.1"
 jackson = "2.19.0"
 
-junit = "5.12.2"
+junit = "5.13.1"
 slf4j = "2.0.17"
 logback = "1.5.18"
 
-dropwizard = "4.2.30"
-micrometer = "1.15.0"
+dropwizard = "4.2.32"
+micrometer = "1.15.1"
 
 jansi = "2.4.2"
 typesafe = "1.4.3"
@@ -66,21 +66,21 @@ javax-servlet = "4.0.1"
 jakarta-servlet = "5.0.0"
 
 ws = "8.18.0"
-xmlutil = "0.91.0"
+xmlutil = "0.91.1"
 yamlkt = "0.13.0"
 kaml = "0.77.1"
 
 swagger-codegen = "3.0.68"
 swagger-codegen-generators = "1.0.56"
-swagger-parser = "2.1.28"
+swagger-parser = "2.1.29"
 
 puppeteer = "21.5.0"
 tomlj = "1.1.1"
 
 # Keep it in sync with build-settings-logic/settings.gradle.kts
-develocity = "3.18.2" # Should be compatible with our server: ge.jetbrains.com
-develocity-commonCustomUserData = "2.2.1"
-gradleDoctor = "0.10.0"
+develocity = "3.19.2" # Should be compatible with our server: ge.jetbrains.com
+develocity-commonCustomUserData = "2.3"
+gradleDoctor = "0.11.0"
 
 [libraries]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME