diff --git a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/DefaultAsserter.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/DefaultAsserter.kt index a72c8d9d365..b5cedf80a61 100644 --- a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/DefaultAsserter.kt +++ b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/DefaultAsserter.kt @@ -11,7 +11,4 @@ class DefaultAsserter() : Asserter { else throw AssertionError(message) } -} - -header fun AssertionError(message: String): Throwable -header fun AssertionError(): Throwable +} \ No newline at end of file diff --git a/libraries/kotlin.test/js/src/main/kotlin/AssertionError.kt b/libraries/kotlin.test/js/src/main/kotlin/AssertionError.kt deleted file mode 100644 index a46535636b0..00000000000 --- a/libraries/kotlin.test/js/src/main/kotlin/AssertionError.kt +++ /dev/null @@ -1,4 +0,0 @@ -package kotlin.test - -impl fun AssertionError(message: String): Throwable = kotlin.AssertionError(message) -impl fun AssertionError(): Throwable = kotlin.AssertionError() diff --git a/libraries/kotlin.test/jvm/src/main/kotlin/AssertionError.kt b/libraries/kotlin.test/jvm/src/main/kotlin/AssertionError.kt deleted file mode 100644 index cfe76d065c9..00000000000 --- a/libraries/kotlin.test/jvm/src/main/kotlin/AssertionError.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package kotlin.test - -impl fun AssertionError(message: String): Throwable = java.lang.AssertionError(message) -impl fun AssertionError(): Throwable = java.lang.AssertionError() - diff --git a/libraries/stdlib/common/src/kotlin/KotlinH.kt b/libraries/stdlib/common/src/kotlin/KotlinH.kt index 2cb9af57e42..1674d90ffdb 100644 --- a/libraries/stdlib/common/src/kotlin/KotlinH.kt +++ b/libraries/stdlib/common/src/kotlin/KotlinH.kt @@ -58,6 +58,12 @@ open header class UnsupportedOperationException : RuntimeException { constructor(message: String) } +// TODO: Provide typealias impl in stdlib-jvm +open header class AssertionError : Error { + constructor() + constructor(message: String) +} + header interface Comparator { fun compare(a: T, b: T): Int