From 39f4a449ad43bf1a5496e96c9d0e48b0c342e764 Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Mon, 23 Apr 2018 22:20:41 +0300 Subject: [PATCH] Remove JvmVersion from kotlin-stdlib-coroutines --- .../jvm/src/kotlin/coroutines/SafeContinuationJvm.kt | 3 +-- .../jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt | 5 +---- .../jvm/src/kotlin/coroutines/jvm/internal/CoroutineImpl.kt | 2 -- .../kotlin/coroutines/jvm/internal/CoroutineIntrinsics.kt | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt index bcb4952e9a7..d6d7bc5fc54 100644 --- a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt +++ b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/SafeContinuationJvm.kt @@ -2,8 +2,7 @@ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ -@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") -@file:kotlin.jvm.JvmVersion + package kotlin.coroutines import java.util.concurrent.atomic.AtomicReferenceFieldUpdater diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt index b979cb0d3f1..560492e6fe2 100644 --- a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt +++ b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/intrinsics/IntrinsicsJvm.kt @@ -6,8 +6,8 @@ @file:kotlin.jvm.JvmName("IntrinsicsKt") @file:kotlin.jvm.JvmMultifileClass @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") -@file:kotlin.jvm.JvmVersion package kotlin.coroutines.intrinsics + import kotlin.coroutines.* /** @@ -53,7 +53,6 @@ public actual inline fun (suspend R.() -> T).startCoroutineUninterceptedO * state machine of the coroutine and may result in arbitrary behaviour or exception. */ @SinceKotlin("1.3") -@kotlin.jvm.JvmVersion public actual fun (suspend () -> T).createCoroutineUnchecked( completion: Continuation ): Continuation = @@ -76,7 +75,6 @@ public actual fun (suspend () -> T).createCoroutineUnchecked( * state machine of the coroutine and may result in arbitrary behaviour or exception. */ @SinceKotlin("1.3") -@kotlin.jvm.JvmVersion public actual fun (suspend R.() -> T).createCoroutineUnchecked( receiver: R, completion: Continuation @@ -91,7 +89,6 @@ public actual fun (suspend R.() -> T).createCoroutineUnchecked( // INTERNAL DEFINITIONS -@kotlin.jvm.JvmVersion private inline fun buildContinuationByInvokeCall( completion: Continuation, crossinline block: () -> Any? diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/CoroutineImpl.kt b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/CoroutineImpl.kt index 9a5045c10ed..1d910ded4be 100644 --- a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/CoroutineImpl.kt +++ b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/CoroutineImpl.kt @@ -3,8 +3,6 @@ * that can be found in the license/LICENSE.txt file. */ -@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") -@file:JvmVersion package kotlin.coroutines.jvm.internal import java.lang.IllegalStateException diff --git a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/CoroutineIntrinsics.kt b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/CoroutineIntrinsics.kt index 7aed4044eda..f493ca7726e 100644 --- a/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/CoroutineIntrinsics.kt +++ b/libraries/stdlib/coroutines/jvm/src/kotlin/coroutines/jvm/internal/CoroutineIntrinsics.kt @@ -3,8 +3,6 @@ * that can be found in the license/LICENSE.txt file. */ -@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER") -@file:JvmVersion @file:JvmName("CoroutineIntrinsics") package kotlin.coroutines.jvm.internal