Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update kotlin to 1.9.10 #3761

Merged
merged 4 commits into from
Sep 28, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix js compilation
e5l committed Sep 28, 2023

Verified

This commit was signed with the committer’s verified signature. The key has expired.
colombod Diego Colombo
commit caf1cbe485af26c3b3916b11f437523a4d198bb4
Original file line number Diff line number Diff line change
@@ -80,17 +80,17 @@ class CallLoggingTest {
assertTrue(messages.size >= 3, "It should be at least 3 message logged:\n$messages")
assertTrue {
messages[messages.size - 3].startsWith(
"INFO: Application started: io.ktor.server.application.Application(0x$hash)"
"INFO: Application started: class io.ktor.server.application.Application(0x$hash)"
)
}
assertTrue {
messages[messages.size - 2].startsWith(
"INFO: Application stopping: io.ktor.server.application.Application(0x$hash)"
"INFO: Application stopping: class io.ktor.server.application.Application(0x$hash)"
)
}
assertTrue {
messages[messages.size - 1].startsWith(
"INFO: Application stopped: io.ktor.server.application.Application(0x$hash)"
"INFO: Application stopped: class io.ktor.server.application.Application(0x$hash)"
)
}
}
2 changes: 1 addition & 1 deletion ktor-utils/common/src/io/ktor/util/pipeline/Pipeline.kt
Original file line number Diff line number Diff line change
@@ -248,7 +248,7 @@ public open class Pipeline<TSubject : Any, TContext : Any>(
val interceptors = interceptorsForTests()
.joinToString("\n") { " " + it::class.toString() }

return "${this::class.qualifiedName}(0x${hashCode().toString(16)}) [\n$interceptors\n]"
return "${this::class}(0x${hashCode().toString(16)}) [\n$interceptors\n]"
}

internal fun phaseInterceptors(phase: PipelinePhase): List<PipelineInterceptorFunction<TSubject, TContext>> =