diff --git a/libraries/kotlin.test/common/src/main/kotlin/org/junit/Test.kt b/libraries/kotlin.test/common/src/main/kotlin/org/junit/Test.kt deleted file mode 100644 index 093231344d8..00000000000 --- a/libraries/kotlin.test/common/src/main/kotlin/org/junit/Test.kt +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.junit - -/** @suppress */ -@Suppress("NO_ACTUAL_FOR_EXPECT") -@Deprecated( - "Use 'Test' from kotlin.test package", - replaceWith = ReplaceWith("kotlin.test.Test", "kotlin.test.Test"), - level = DeprecationLevel.ERROR -) -expect annotation class Test() diff --git a/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt b/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt deleted file mode 100644 index c7e241ce886..00000000000 --- a/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.junit - -@Deprecated( - "Use 'Test' from kotlin.test package", - replaceWith = ReplaceWith("kotlin.test.Test", "kotlin.test.Test"), - level = DeprecationLevel.ERROR -) -actual typealias Test = kotlin.test.Test diff --git a/libraries/stdlib/js/src/kotlin/annotations.kt b/libraries/stdlib/js/src/kotlin/annotations.kt index edfd52fff14..90ad9009fb6 100644 --- a/libraries/stdlib/js/src/kotlin/annotations.kt +++ b/libraries/stdlib/js/src/kotlin/annotations.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -7,10 +7,6 @@ package kotlin.js import kotlin.annotation.AnnotationTarget.* -@Target(CLASS, FUNCTION, PROPERTY, CONSTRUCTOR, VALUE_PARAMETER, PROPERTY_GETTER, PROPERTY_SETTER) -@Deprecated("Use `external` modifier instead", level = DeprecationLevel.ERROR) -public annotation class native(public val name: String = "") - @Target(FUNCTION) @Deprecated("Use inline extension function with body using dynamic") public annotation class nativeGetter diff --git a/libraries/stdlib/js/src/kotlin/concurrent.kt b/libraries/stdlib/js/src/kotlin/concurrent.kt index 2fec9c59494..e50939f02ac 100644 --- a/libraries/stdlib/js/src/kotlin/concurrent.kt +++ b/libraries/stdlib/js/src/kotlin/concurrent.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -8,12 +8,6 @@ package kotlin import kotlin.contracts.* -@Deprecated("Do not use Synchronized annotation in pure Kotlin/JS code", level = DeprecationLevel.ERROR) -public typealias Synchronized = kotlin.jvm.Synchronized - -@Deprecated("Do not use Volatile annotation in pure Kotlin/JS code", level = DeprecationLevel.ERROR) -public typealias Volatile = kotlin.jvm.Volatile - @kotlin.internal.InlineOnly public actual inline fun synchronized(lock: Any, block: () -> R): R { contract {