Restoring binary compatibility: another attempt

Author: dkhalanskyjb

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

@@ -160,6 +160,11 @@ public abstract interface class kotlinx/coroutines/CopyableThrowable {
 }
 
 public final class kotlinx/coroutines/CoroutineContextKt {
+	public static final synthetic fun newCoroutineContext (Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+	public static final synthetic fun newCoroutineContext (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
+}
+
+public final class kotlinx/coroutines/CoroutineContext_commonKt {
 	public static final fun newCoroutineContext (Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
 	public static final fun newCoroutineContext (Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;)Lkotlin/coroutines/CoroutineContext;
 }

kotlinx-coroutines-core/common/src/CoroutineContext.common.kt

@@ -1,11 +1,7 @@
-@file:JvmMultifileClass
-@file:JvmName("CoroutineContextKt")
 package kotlinx.coroutines
 
 import kotlinx.coroutines.internal.*
 import kotlin.coroutines.*
-import kotlin.jvm.JvmMultifileClass
-import kotlin.jvm.JvmName
 
 @PublishedApi // to have unmangled name when using from other modules via suppress
 @Suppress("PropertyName")

kotlinx-coroutines-core/jvm/src/CoroutineContext.kt

@@ -1,10 +1,7 @@
-@file:JvmMultifileClass
-@file:JvmName("CoroutineContextKt")
 package kotlinx.coroutines
 
 import kotlinx.coroutines.internal.*
 import kotlin.coroutines.*
-import kotlin.coroutines.jvm.internal.CoroutineStackFrame
 
 /**
  *  Adds optional support for debugging facilities (when turned on)
@@ -53,3 +50,15 @@ internal data class CoroutineId(
         Thread.currentThread().name = oldState
     }
 }
+
+@Deprecated(level = DeprecationLevel.HIDDEN, message = "Binary compatibility with 1.10.0 and earlier, was experimental")
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+@kotlin.internal.LowPriorityInOverloadResolution
+public fun CoroutineScope.newCoroutineContext(context: CoroutineContext): CoroutineContext =
+    newCoroutineContext(context)
+
+@Deprecated(level = DeprecationLevel.HIDDEN, message = "Binary compatibility with 1.10.0 and earlier, was internal")
+@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
+@kotlin.internal.LowPriorityInOverloadResolution
+public fun CoroutineContext.newCoroutineContext(addedContext: CoroutineContext): CoroutineContext =
+    newCoroutineContext(addedContext)