Skip to content

Commit c75d834

Browse files
committed
Comment out lint deprecations that are too breaking for non-major 1.3.7 release
1 parent 2f87fe4 commit c75d834

File tree

2 files changed

+27
-31
lines changed

2 files changed

+27
-31
lines changed

kotlinx-coroutines-core/api/kotlinx-coroutines-core.api

-4
Original file line numberDiff line numberDiff line change
@@ -1001,13 +1001,9 @@ public final class kotlinx/coroutines/flow/FlowKt {
10011001
}
10021002

10031003
public final class kotlinx/coroutines/flow/LintKt {
1004-
public static final fun cancel (Lkotlinx/coroutines/flow/FlowCollector;Ljava/util/concurrent/CancellationException;)V
1005-
public static synthetic fun cancel$default (Lkotlinx/coroutines/flow/FlowCollector;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
10061004
public static final fun conflate (Lkotlinx/coroutines/flow/StateFlow;)Lkotlinx/coroutines/flow/Flow;
10071005
public static final fun distinctUntilChanged (Lkotlinx/coroutines/flow/StateFlow;)Lkotlinx/coroutines/flow/Flow;
10081006
public static final fun flowOn (Lkotlinx/coroutines/flow/StateFlow;Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/flow/Flow;
1009-
public static final fun getCoroutineContext (Lkotlinx/coroutines/flow/FlowCollector;)Lkotlin/coroutines/CoroutineContext;
1010-
public static final fun isActive (Lkotlinx/coroutines/flow/FlowCollector;)Z
10111007
}
10121008

10131009
public abstract interface class kotlinx/coroutines/flow/MutableStateFlow : kotlinx/coroutines/flow/StateFlow {

kotlinx-coroutines-core/common/src/flow/operators/Lint.kt

+27-27
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,30 @@ public fun <T> StateFlow<T>.conflate(): Flow<T> = noImpl()
4343
)
4444
public fun <T> StateFlow<T>.distinctUntilChanged(): Flow<T> = noImpl()
4545

46-
@Deprecated(
47-
message = "isActive is resolved into the extension of outer CoroutineScope which is likely to be an error." +
48-
"Use currentCoroutineContext().isActive or cancellable() operator instead " +
49-
"or specify the receiver of isActive explicitly. " +
50-
"Additionally, flow {} builder emissions are cancellable by default.",
51-
level = DeprecationLevel.WARNING, // ERROR in 1.4
52-
replaceWith = ReplaceWith("currentCoroutineContext().isActive")
53-
)
54-
public val FlowCollector<*>.isActive: Boolean
55-
get() = noImpl()
56-
57-
@Deprecated(
58-
message = "cancel() is resolved into the extension of outer CoroutineScope which is likely to be an error." +
59-
"Use currentCoroutineContext().cancel() instead or specify the receiver of cancel() explicitly",
60-
level = DeprecationLevel.WARNING, // ERROR in 1.4
61-
replaceWith = ReplaceWith("currentCoroutineContext().cancel(cause)")
62-
)
63-
public fun FlowCollector<*>.cancel(cause: CancellationException? = null): Unit = noImpl()
64-
65-
@Deprecated(
66-
message = "coroutineContext is resolved into the property of outer CoroutineScope which is likely to be an error." +
67-
"Use currentCoroutineContext() instead or specify the receiver of coroutineContext explicitly",
68-
level = DeprecationLevel.WARNING, // ERROR in 1.4
69-
replaceWith = ReplaceWith("currentCoroutineContext()")
70-
)
71-
public val FlowCollector<*>.coroutineContext: CoroutineContext
72-
get() = noImpl()
46+
//@Deprecated(
47+
// message = "isActive is resolved into the extension of outer CoroutineScope which is likely to be an error." +
48+
// "Use currentCoroutineContext().isActive or cancellable() operator instead " +
49+
// "or specify the receiver of isActive explicitly. " +
50+
// "Additionally, flow {} builder emissions are cancellable by default.",
51+
// level = DeprecationLevel.WARNING, // ERROR in 1.4
52+
// replaceWith = ReplaceWith("currentCoroutineContext().isActive")
53+
//)
54+
//public val FlowCollector<*>.isActive: Boolean
55+
// get() = noImpl()
56+
//
57+
//@Deprecated(
58+
// message = "cancel() is resolved into the extension of outer CoroutineScope which is likely to be an error." +
59+
// "Use currentCoroutineContext().cancel() instead or specify the receiver of cancel() explicitly",
60+
// level = DeprecationLevel.WARNING, // ERROR in 1.4
61+
// replaceWith = ReplaceWith("currentCoroutineContext().cancel(cause)")
62+
//)
63+
//public fun FlowCollector<*>.cancel(cause: CancellationException? = null): Unit = noImpl()
64+
//
65+
//@Deprecated(
66+
// message = "coroutineContext is resolved into the property of outer CoroutineScope which is likely to be an error." +
67+
// "Use currentCoroutineContext() instead or specify the receiver of coroutineContext explicitly",
68+
// level = DeprecationLevel.WARNING, // ERROR in 1.4
69+
// replaceWith = ReplaceWith("currentCoroutineContext()")
70+
//)
71+
//public val FlowCollector<*>.coroutineContext: CoroutineContext
72+
// get() = noImpl()

0 commit comments

Comments
 (0)