diff options
author | Aurimas Liutikas <aurimas@google.com> | 2021-08-17 16:49:58 -0700 |
---|---|---|
committer | Aurimas Liutikas <aurimas@google.com> | 2021-08-18 08:57:44 -0700 |
commit | 531d55eaeac09ad6cde55687ef802d4235040985 (patch) | |
tree | 747e5be83c6e6a2e2d9a164ebd03c5e45e6ec952 /integration/kotlinx-coroutines-slf4j/api/kotlinx-coroutines-slf4j.api | |
parent | b5da2582b1f1d46a92cc6ceeb1525788addd5944 (diff) | |
parent | b231887c3214187cf7f09a74073f84383a487b71 (diff) | |
download | platform_external_kotlinx.coroutines-master.tar.gz platform_external_kotlinx.coroutines-master.tar.bz2 platform_external_kotlinx.coroutines-master.zip |
Merge Kotlin coroutines 1.5.1HEADandroid-s-beta-5masterandroid-s-beta-5
https://github.com/Kotlin/kotlinx.coroutines/releases/tag/1.5.1
Test: mmma external/kotlinx.coroutines
Change-Id: I7de89ccc26113be895f28935addb27ee07e50ee7
Diffstat (limited to 'integration/kotlinx-coroutines-slf4j/api/kotlinx-coroutines-slf4j.api')
-rw-r--r-- | integration/kotlinx-coroutines-slf4j/api/kotlinx-coroutines-slf4j.api | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/integration/kotlinx-coroutines-slf4j/api/kotlinx-coroutines-slf4j.api b/integration/kotlinx-coroutines-slf4j/api/kotlinx-coroutines-slf4j.api index a8bf271b..6b565d4c 100644 --- a/integration/kotlinx-coroutines-slf4j/api/kotlinx-coroutines-slf4j.api +++ b/integration/kotlinx-coroutines-slf4j/api/kotlinx-coroutines-slf4j.api @@ -3,11 +3,7 @@ public final class kotlinx/coroutines/slf4j/MDCContext : kotlin/coroutines/Abstr public fun <init> ()V public fun <init> (Ljava/util/Map;)V public synthetic fun <init> (Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - public fun fold (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object; - public fun get (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext$Element; public final fun getContextMap ()Ljava/util/Map; - public fun minusKey (Lkotlin/coroutines/CoroutineContext$Key;)Lkotlin/coroutines/CoroutineContext; - public fun plus (Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext; public synthetic fun restoreThreadContext (Lkotlin/coroutines/CoroutineContext;Ljava/lang/Object;)V public fun restoreThreadContext (Lkotlin/coroutines/CoroutineContext;Ljava/util/Map;)V public synthetic fun updateThreadContext (Lkotlin/coroutines/CoroutineContext;)Ljava/lang/Object; |