Skip to content

Commit 26b86e9

Browse files
committed
Preserve binary compatibility for Channels#sendBlocking
1 parent 2cd27fb commit 26b86e9

File tree

3 files changed

+7
-4
lines changed
  • binary-compatibility-validator/reference-public-api
  • common/kotlinx-coroutines-core-common/src/main/kotlin/kotlinx/coroutines/experimental/channels
  • core/kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/channels

3 files changed

+7
-4
lines changed

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-core.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,6 @@ public final class kotlinx/coroutines/experimental/channels/ChannelKt {
608608
public static final fun Channel (I)Lkotlinx/coroutines/experimental/channels/Channel;
609609
}
610610

611-
public final class kotlinx/coroutines/experimental/channels/ChannelsJvmKt {
612-
public static final fun sendBlocking (Lkotlinx/coroutines/experimental/channels/SendChannel;Ljava/lang/Object;)V
613-
}
614-
615611
public final class kotlinx/coroutines/experimental/channels/ChannelsKt {
616612
public static final fun any (Lkotlinx/coroutines/experimental/channels/ReceiveChannel;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
617613
public static final fun asReceiveChannel (Ljava/lang/Iterable;Lkotlin/coroutines/experimental/CoroutineContext;)Lkotlinx/coroutines/experimental/channels/ReceiveChannel;
@@ -664,6 +660,7 @@ public final class kotlinx/coroutines/experimental/channels/ChannelsKt {
664660
public static final fun minWith (Lkotlinx/coroutines/experimental/channels/ReceiveChannel;Ljava/util/Comparator;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
665661
public static final fun none (Lkotlinx/coroutines/experimental/channels/ReceiveChannel;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
666662
public static final fun requireNoNulls (Lkotlinx/coroutines/experimental/channels/ReceiveChannel;)Lkotlinx/coroutines/experimental/channels/ReceiveChannel;
663+
public static final fun sendBlocking (Lkotlinx/coroutines/experimental/channels/SendChannel;Ljava/lang/Object;)V
667664
public static final fun single (Lkotlinx/coroutines/experimental/channels/ReceiveChannel;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
668665
public static final fun singleOrNull (Lkotlinx/coroutines/experimental/channels/ReceiveChannel;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
669666
public static final fun take (Lkotlinx/coroutines/experimental/channels/ReceiveChannel;ILkotlin/coroutines/experimental/CoroutineContext;)Lkotlinx/coroutines/experimental/channels/ReceiveChannel;
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
@file:JvmMultifileClass
17+
@file:JvmName("ChannelsKt")
1618

1719
package kotlinx.coroutines.experimental.channels
1820

1921
import kotlinx.coroutines.experimental.*
2022
import kotlin.coroutines.experimental.*
23+
import kotlin.jvm.*
2124

2225
internal const val DEFAULT_CLOSE_MESSAGE = "Channel was closed"
2326

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@file:JvmMultifileClass
2+
@file:JvmName("ChannelsKt")
3+
14
package kotlinx.coroutines.experimental.channels
25

36
import kotlinx.coroutines.experimental.*

0 commit comments

Comments
 (0)