Skip to content

Commit 7fb590d

Browse files
committed
Make some internal API public, but deprecated as error, exposing internal supertypes does not work in K/N (JetBrains/kotlin-native#2167), add workaround for KT-27534
1 parent 5a74c75 commit 7fb590d

File tree

14 files changed

+87
-271
lines changed

14 files changed

+87
-271
lines changed

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

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
public abstract class kotlinx/coroutines/AbstractCoroutine : kotlin/coroutines/Continuation, kotlinx/coroutines/CoroutineScope, kotlinx/coroutines/Job {
1+
public abstract class kotlinx/coroutines/AbstractCoroutine : kotlinx/coroutines/JobSupport, kotlin/coroutines/Continuation, kotlinx/coroutines/CoroutineScope, kotlinx/coroutines/Job {
22
protected final field parentContext Lkotlin/coroutines/CoroutineContext;
33
public fun <init> (Lkotlin/coroutines/CoroutineContext;Z)V
44
public synthetic fun <init> (Lkotlin/coroutines/CoroutineContext;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -67,6 +67,22 @@ public final class kotlinx/coroutines/CancellableContinuationKt {
6767
public static final fun disposeOnCancellation (Lkotlinx/coroutines/CancellableContinuation;Lkotlinx/coroutines/DisposableHandle;)V
6868
}
6969

70+
public abstract interface class kotlinx/coroutines/ChildHandle : kotlinx/coroutines/DisposableHandle {
71+
public abstract fun childCancelled (Ljava/lang/Throwable;)Z
72+
}
73+
74+
public abstract interface class kotlinx/coroutines/ChildJob : kotlinx/coroutines/Job {
75+
public abstract fun parentCancelled (Lkotlinx/coroutines/ParentJob;)V
76+
}
77+
78+
public final class kotlinx/coroutines/ChildJob$DefaultImpls {
79+
public static fun fold (Lkotlinx/coroutines/ChildJob;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
80+
public static fun get (Lkotlinx/coroutines/ChildJob;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
81+
public static fun minusKey (Lkotlinx/coroutines/ChildJob;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
82+
public static fun plus (Lkotlinx/coroutines/ChildJob;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
83+
public static fun plus (Lkotlinx/coroutines/ChildJob;Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/Job;
84+
}
85+
7086
public abstract interface class kotlinx/coroutines/CompletableDeferred : kotlinx/coroutines/Deferred {
7187
public abstract fun complete (Ljava/lang/Object;)Z
7288
public abstract fun completeExceptionally (Ljava/lang/Throwable;)Z
@@ -307,6 +323,41 @@ public final class kotlinx/coroutines/JobKt {
307323
public static final fun isActive (Lkotlin/coroutines/CoroutineContext;)Z
308324
}
309325

326+
public class kotlinx/coroutines/JobSupport : kotlinx/coroutines/ChildJob, kotlinx/coroutines/Job, kotlinx/coroutines/ParentJob, kotlinx/coroutines/selects/SelectClause0 {
327+
public fun <init> (Z)V
328+
public final fun attachChild (Lkotlinx/coroutines/ChildJob;)Lkotlinx/coroutines/ChildHandle;
329+
public fun cancel ()Z
330+
public fun cancel (Ljava/lang/Throwable;)Z
331+
public fun childCancelled (Ljava/lang/Throwable;)Z
332+
public fun fold (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
333+
public fun get (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
334+
public final fun getCancellationException ()Ljava/util/concurrent/CancellationException;
335+
protected fun getCancelsParent ()Z
336+
public fun getChildJobCancellationCause ()Ljava/lang/Throwable;
337+
public final fun getChildren ()Lkotlin/sequences/Sequence;
338+
protected final fun getCompletionCause ()Ljava/lang/Throwable;
339+
public final fun getCompletionExceptionOrNull ()Ljava/lang/Throwable;
340+
protected fun getHandlesException ()Z
341+
public final fun getKey ()Lkotlin/coroutines/CoroutineContext$Key;
342+
public final fun getOnJoin ()Lkotlinx/coroutines/selects/SelectClause0;
343+
protected fun handleJobException (Ljava/lang/Throwable;)V
344+
public final fun invokeOnCompletion (Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/DisposableHandle;
345+
public final fun invokeOnCompletion (ZZLkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/DisposableHandle;
346+
public fun isActive ()Z
347+
public final fun isCancelled ()Z
348+
public final fun isCompleted ()Z
349+
public final fun isCompletedExceptionally ()Z
350+
public final fun join (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
351+
public fun minusKey (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
352+
protected fun onCancellation (Ljava/lang/Throwable;)V
353+
public final fun parentCancelled (Lkotlinx/coroutines/ParentJob;)V
354+
public fun plus (Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
355+
public fun plus (Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/Job;
356+
public final fun registerSelectClause0 (Lkotlinx/coroutines/selects/SelectInstance;Lkotlin/jvm/functions/Function1;)V
357+
public final fun start ()Z
358+
public fun toString ()Ljava/lang/String;
359+
}
360+
310361
public abstract class kotlinx/coroutines/MainCoroutineDispatcher : kotlinx/coroutines/CoroutineDispatcher {
311362
public fun <init> ()V
312363
public abstract fun getImmediate ()Lkotlinx/coroutines/MainCoroutineDispatcher;
@@ -340,6 +391,18 @@ public final class kotlinx/coroutines/NonDisposableHandle : kotlinx/coroutines/C
340391
public abstract interface annotation class kotlinx/coroutines/ObsoleteCoroutinesApi : java/lang/annotation/Annotation {
341392
}
342393

394+
public abstract interface class kotlinx/coroutines/ParentJob : kotlinx/coroutines/Job {
395+
public abstract fun getChildJobCancellationCause ()Ljava/lang/Throwable;
396+
}
397+
398+
public final class kotlinx/coroutines/ParentJob$DefaultImpls {
399+
public static fun fold (Lkotlinx/coroutines/ParentJob;Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
400+
public static fun get (Lkotlinx/coroutines/ParentJob;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element;
401+
public static fun minusKey (Lkotlinx/coroutines/ParentJob;Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext;
402+
public static fun plus (Lkotlinx/coroutines/ParentJob;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
403+
public static fun plus (Lkotlinx/coroutines/ParentJob;Lkotlinx/coroutines/Job;)Lkotlinx/coroutines/Job;
404+
}
405+
343406
public final class kotlinx/coroutines/RunnableKt {
344407
public static final fun Runnable (Lkotlin/jvm/functions/Function0;)Ljava/lang/Runnable;
345408
}

0 commit comments

Comments
 (0)