Skip to content

Commit 904b6c2

Browse files
committed
Move common parts to the nonJvm source set
1 parent 26ed3b1 commit 904b6c2

File tree

9 files changed

+5
-4
lines changed

9 files changed

+5
-4
lines changed

ktor-server/ktor-server-core/posix/src/io/ktor/server/application/NixApplicationEnvironment.kt ktor-server/ktor-server-core/nonJvm/src/io/ktor/server/application/ApplicationEnvironment.nonJvm.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package io.ktor.server.application
77
import io.ktor.events.*
88
import io.ktor.server.config.*
99
import io.ktor.util.logging.*
10-
import kotlin.coroutines.*
10+
import kotlin.coroutines.CoroutineContext
1111

1212
public actual interface ApplicationEnvironment {
1313

ktor-server/ktor-server-core/posix/src/io/ktor/server/application/internal/TypeUtilsNix.kt ktor-server/ktor-server-core/nonJvm/src/io/ktor/server/application/internal/TypeUtils.nonJvm.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44

55
package io.ktor.server.application.internal
66

7-
import kotlin.reflect.*
7+
import kotlin.reflect.KClass
8+
import kotlin.reflect.KClassifier
9+
import kotlin.reflect.KType
10+
import kotlin.reflect.KTypeProjection
811

912
internal actual fun <T : Any> starProjectedTypeBridge(klass: KClass<T>): KType = ErasedType(klass)
1013

ktor-server/ktor-server-core/posix/src/io/ktor/server/engine/internal/ExceptionUtilsNix.kt ktor-server/ktor-server-core/nonJvm/src/io/ktor/server/engine/internal/ExceptionUtils.nonJvm.kt

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
package io.ktor.server.engine.internal
66

7-
import io.ktor.utils.io.errors.*
87
import kotlinx.io.IOException
98

109
public actual open class ClosedChannelException(message: String) : IOException(message)

ktor-server/ktor-server-core/posix/src/io/ktor/server/http/content/NixDefaultTransform.kt ktor-server/ktor-server-core/nonJvm/src/io/ktor/server/http/content/DefaultTransform.nonJvm.kt

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package io.ktor.server.http.content
66

77
import io.ktor.http.content.*
88
import io.ktor.server.application.*
9-
import io.ktor.util.pipeline.*
109

1110
internal actual fun platformTransformDefaultContent(
1211
call: ApplicationCall,

0 commit comments

Comments
 (0)