change runBlocking to runBlockingMpp to avoid conflict

Signed-off-by: Adam Ratzman <[email protected]>

Author: adamint

README.md

@@ -39,7 +39,7 @@ repositories {
     jcenter()
 }
 
-compile group: 'com.adamratzman', name: 'spotify-api-kotlin-core', version: '3.2.11'
+compile group: 'com.adamratzman', name: 'spotify-api-kotlin-core', version: '3.2.12'
 ```
 
 Note that images and profiles are not supported on the Kotlin/JS target.

build.gradle.kts

@@ -31,7 +31,7 @@ buildscript {
 }
 
 group = "com.adamratzman"
-version = "3.2.11"
+version = "3.2.12"
 
 tasks.withType<Test> {
     this.testLogging {

src/androidMain/kotlin/com/adamratzman/spotify/utils/Concurrency.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking as kRunBlocking
 
-actual inline fun <T> runBlocking(crossinline coroutineCode: suspend () -> T): T = kRunBlocking {
+actual inline fun <T> runBlockingMpp(crossinline coroutineCode: suspend () -> T): T = kRunBlocking {
     coroutineCode()
 }
 

src/commonMain/kotlin/com.adamratzman.spotify/Builder.kt

@@ -7,7 +7,7 @@ import com.adamratzman.spotify.http.HttpRequestMethod
 import com.adamratzman.spotify.models.Token
 import com.adamratzman.spotify.models.serialization.nonstrictJson
 import com.adamratzman.spotify.models.serialization.toObject
-import com.adamratzman.spotify.utils.runBlocking
+import com.adamratzman.spotify.utils.runBlockingMpp
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -740,7 +740,7 @@ interface ISpotifyApiBuilder<T : SpotifyApi<T, B>, B : ISpotifyApiBuilder<T, B>>
     /**
      * Build the [T] by provided information
      */
-    fun build(): T = runBlocking { suspendBuild() }
+    fun build(): T = runBlockingMpp { suspendBuild() }
 
     /**
      * Build the [T] by provided information

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyApi.kt

@@ -31,7 +31,7 @@ import com.adamratzman.spotify.models.Token
 import com.adamratzman.spotify.models.TokenValidityResponse
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.asList
-import com.adamratzman.spotify.utils.runBlocking
+import com.adamratzman.spotify.utils.runBlockingMpp
 import kotlin.coroutines.CoroutineContext
 import kotlin.jvm.JvmOverloads
 import kotlinx.coroutines.Dispatchers
@@ -142,7 +142,7 @@ sealed class SpotifyApi<T : SpotifyApi<T, B>, B : ISpotifyApiBuilder<T, B>>(
      * @return The old access token if refresh was successful
      * @throws BadRequestException if refresh fails
      */
-    fun refreshToken(): Token = runBlocking {
+    fun refreshToken(): Token = runBlockingMpp {
         suspendRefreshToken()
     }
 
@@ -235,7 +235,7 @@ sealed class SpotifyApi<T : SpotifyApi<T, B>, B : ISpotifyApiBuilder<T, B>>(
      * @return [TokenValidityResponse] containing whether this token is valid, and if not, an Exception explaining why
      */
     @JvmOverloads
-    fun isTokenValid(makeTestRequest: Boolean = true): TokenValidityResponse = runBlocking {
+    fun isTokenValid(makeTestRequest: Boolean = true): TokenValidityResponse = runBlockingMpp {
         suspendIsTokenValid(makeTestRequest)
     }
 

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyRestAction.kt

@@ -5,7 +5,7 @@ import com.adamratzman.spotify.annotations.SpotifyExperimentalHttpApi
 import com.adamratzman.spotify.models.PagingObjectBase
 import com.adamratzman.spotify.utils.TimeUnit
 import com.adamratzman.spotify.utils.getCurrentTimeMs
-import com.adamratzman.spotify.utils.runBlocking
+import com.adamratzman.spotify.utils.runBlockingMpp
 import com.adamratzman.spotify.utils.schedule
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.resume
@@ -50,7 +50,7 @@ open class SpotifyRestAction<T> internal constructor(protected val api: GenericS
     /**
      * Invoke [supplier] and synchronously retrieve [T]
      */
-    fun complete(): T = runBlocking {
+    fun complete(): T = runBlockingMpp {
         suspendComplete()
     }
 
@@ -92,7 +92,7 @@ open class SpotifyRestAction<T> internal constructor(protected val api: GenericS
     @JvmOverloads
     fun queue(failure: (suspend (Throwable) -> Unit) = { throw it }, consumer: (suspend (T) -> Unit) = {}) {
         hasRunBacking = true
-        runBlocking {
+        runBlockingMpp {
             coroutineScope {
                 launch {
                     try {

src/commonMain/kotlin/com.adamratzman.spotify/models/PagingObjects.kt

@@ -8,7 +8,7 @@ import com.adamratzman.spotify.http.SpotifyEndpoint
 import com.adamratzman.spotify.models.PagingTraversalType.FORWARDS
 import com.adamratzman.spotify.models.serialization.toCursorBasedPagingObject
 import com.adamratzman.spotify.models.serialization.toPagingObject
-import com.adamratzman.spotify.utils.runBlocking
+import com.adamratzman.spotify.utils.runBlockingMpp
 import kotlin.coroutines.CoroutineContext
 import kotlin.reflect.KClass
 import kotlinx.coroutines.Dispatchers
@@ -263,7 +263,7 @@ class CursorBasedPagingObject<T : Any>(
     }
 
     override suspend fun getAllImpl(): Sequence<PagingObjectBase<T>> {
-        return generateSequence(this) { runBlocking { it.getImpl(FORWARDS) as? CursorBasedPagingObject<T> } }
+        return generateSequence(this) { runBlockingMpp { it.getImpl(FORWARDS) as? CursorBasedPagingObject<T> } }
     }
 
     @SpotifyExperimentalHttpApi

src/commonMain/kotlin/com.adamratzman.spotify/utils/Concurrency.kt

@@ -11,4 +11,4 @@ expect enum class TimeUnit {
 
 internal expect fun CoroutineScope.schedule(quantity: Int, timeUnit: TimeUnit, consumer: () -> Unit)
 
-expect fun <T> runBlocking(coroutineCode: suspend () -> T): T
+expect fun <T> runBlockingMpp(coroutineCode: suspend () -> T): T

src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientPlaylistApiTest.kt

@@ -5,7 +5,7 @@ import com.adamratzman.spotify.SpotifyClientApi
 import com.adamratzman.spotify.SpotifyException
 import com.adamratzman.spotify.api
 import com.adamratzman.spotify.endpoints.client.SpotifyTrackPositions
-import com.adamratzman.spotify.utils.runBlocking
+import com.adamratzman.spotify.utils.runBlockingMpp
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
@@ -32,7 +32,7 @@ class ClientPlaylistApiTest : Spek({
             val globalTop50Uri = "spotify:playlist:37i9dQZEVXbMDoHDwVN2tF"
             val globalViral50Uri = "spotify:playlist:37i9dQZEVXbLiRSasKsNU9"
 
-            val tracks = runBlocking {
+            val tracks = runBlockingMpp {
                 listOf(
                         GlobalScope.async { api.playlists.getPlaylist(usTop50Uri).complete()!!.tracks.getAllItemsNotNull().complete().toList() },
                         GlobalScope.async { api.playlists.getPlaylist(globalTop50Uri).complete()!!.tracks.getAllItemsNotNull().suspendComplete().toList() },

src/commonTest/kotlin/com.adamratzman/spotify/utilities/HttpConnectionTests.kt

@@ -4,7 +4,7 @@ package com.adamratzman.spotify.utilities
 import com.adamratzman.spotify.http.HttpConnection
 import com.adamratzman.spotify.http.HttpRequestMethod
 import com.adamratzman.spotify.http.HttpResponse
-import com.adamratzman.spotify.utils.runBlocking
+import com.adamratzman.spotify.utils.runBlockingMpp
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlinx.serialization.UnstableDefault
@@ -138,4 +138,4 @@ class HttpConnectionTests : Spek({
     }
 })
 
-private fun HttpConnection.executeBlocking(): HttpResponse = runBlocking { execute() }
+private fun HttpConnection.executeBlocking(): HttpResponse = runBlockingMpp { execute() }