fix #276

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

Author: adamint

build.gradle.kts

@@ -5,22 +5,22 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput.Target
 
 plugins {
    // id("lt.petuska.npm.publish") version "1.1.2"
-    kotlin("multiplatform") version "1.4.31"
+    kotlin("multiplatform") version "1.5.0"
     `maven-publish`
     signing
-    id("io.codearte.nexus-staging") version "0.22.0"
+    id("io.codearte.nexus-staging") version "0.30.0"
     id("com.android.library")
-    kotlin("plugin.serialization") version "1.4.30"
-    id("com.diffplug.spotless") version "5.9.0"
+    kotlin("plugin.serialization") version "1.5.0"
+    id("com.diffplug.spotless") version "5.12.4"
     id("com.moowork.node") version "1.3.1"
-    id("org.jetbrains.dokka") version "1.4.20"
+    id("org.jetbrains.dokka") version "1.4.30"
     id("kotlin-android-extensions")
 }
 
 repositories {
-    jcenter()
     google()
     maven("https://kotlin.bintray.com/kotlinx")
+    mavenCentral()
 }
 
 buildscript {
@@ -29,7 +29,7 @@ buildscript {
     }
     dependencies {
         classpath("com.android.tools.build:gradle:3.5.4")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0")
     }
 }
 
@@ -211,19 +211,20 @@ kotlin {
 
     targets {
         sourceSets {
-            val serializationVersion = "1.1.0"
-            val ktorVersion = "1.5.1"
-            val korlibsVersion = "2.0.6"
+            val serializationVersion = "1.2.0"
+            val ktorVersion = "1.5.4"
+            val korlibsVersion = "2.0.7"
             val sparkVersion = "2.9.3"
             val androidSpotifyAuthVersion = "1.2.3"
             val androidCryptoVersion = "1.1.0-alpha03"
-            val coroutineMTVersion = "1.4.2-native-mt"
+            val coroutineMTVersion = "1.4.3-native-mt"
+            val kotlinxDatetimeVersion = "0.2.0"
 
             val commonMain by getting {
                 dependencies {
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
                     implementation("io.ktor:ktor-client-core:$ktorVersion")
-                    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.1.1")
+                    implementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDatetimeVersion")
                     implementation("com.soywiz.korlibs.krypto:krypto:$korlibsVersion")
                     implementation("com.soywiz.korlibs.korim:korim:$korlibsVersion")
 

settings.gradle.kts

@@ -1,5 +1,5 @@
 pluginManagement {
-    val mainKotlinVersion = "1.4.31"
+    val mainKotlinVersion = "1.5.0"
 
     resolutionStrategy {
         eachPlugin {

src/androidTest/kotlin/com/adamratzman/spotify/CommonImpl.kt

@@ -31,4 +31,4 @@ public actual fun Exception.stackTrace() {
 public actual val testCoroutineContext: CoroutineContext =
         Executors.newSingleThreadExecutor().asCoroutineDispatcher()
 
-public actual fun runBlockingTest(block: suspend () -> Unit): Unit = runBlocking(testCoroutineContext) { this.block() }
+public actual fun runBlockingTest(block: suspend CoroutineScope.() -> Unit): Unit = runBlocking(testCoroutineContext) { this.block() }

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/client/ClientPlaylistApi.kt

@@ -155,7 +155,7 @@ public class ClientPlaylistApi(api: GenericSpotifyApi) : PlaylistApi(api) {
      * Adding tracks to the current user’s public playlists requires authorization of the [SpotifyScope.PLAYLIST_MODIFY_PUBLIC] scope;
      * adding tracks to the current user’s private playlist (including collaborative playlists) requires the [SpotifyScope.PLAYLIST_MODIFY_PRIVATE] scope.
      *
-     * **[Api Reference](https://developer.spotify.com/documentation/web-api/reference/playlists/add-tracks-to-playlist/)**
+     * **[Api Reference] (https://developer.spotify.com/documentation/web-api/reference/playlists/add-tracks-to-playlist/)**
      *
      * @param playlist The id or uri for the playlist.
      * @param tracks Spotify track ids. Maximum 100

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

@@ -3,15 +3,12 @@ package com.adamratzman.spotify.models
 
 import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.SpotifyRestAction
-import com.adamratzman.spotify.annotations.SpotifyExperimentalHttpApi
 import com.adamratzman.spotify.models.PagingTraversalType.BACKWARDS
 import com.adamratzman.spotify.models.PagingTraversalType.FORWARDS
 import com.adamratzman.spotify.models.serialization.instantiateAllNeedsApiObjects
 import com.adamratzman.spotify.models.serialization.instantiateLateinitsForPagingObject
 import com.adamratzman.spotify.models.serialization.toCursorBasedPagingObject
 import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
-import kotlin.coroutines.CoroutineContext
-import kotlin.reflect.KClass
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
@@ -25,6 +22,8 @@ import kotlinx.coroutines.flow.toList
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
+import kotlin.coroutines.CoroutineContext
+import kotlin.reflect.KClass
 
 /*
     Types used in PagingObjects and CursorBasedPagingObjects:
@@ -70,7 +69,7 @@ public class NullablePagingObject<T : Any>(
         val pagingObject = PagingObject(
             href, items.filterNotNull(), limit, next, offset, previous, total
         )
-        pagingObject.instantiateLateinitsForPagingObject(itemClazz, api)
+        pagingObject.instantiateLateinitsForPagingObject(itemClass, api)
 
         return pagingObject
     }
@@ -127,7 +126,7 @@ public abstract class AbstractPagingObject<T : Any, Z : AbstractPagingObject<T,
     @Suppress("UNCHECKED_CAST")
     override suspend fun get(type: PagingTraversalType): Z? {
         return (if (type == FORWARDS) next else previous)?.let { api.defaultEndpoint.get(it) }?.let { json ->
-            when (itemClazz) {
+            when (itemClass) {
                 SimpleTrack::class -> json.toNonNullablePagingObject(
                     SimpleTrack.serializer(),
                     null,
@@ -191,7 +190,7 @@ public abstract class AbstractPagingObject<T : Any, Z : AbstractPagingObject<T,
                     api.spotifyApiOptions.json,
                     true
                 )
-                else -> throw IllegalArgumentException("Unknown type in $href response")
+                else -> throw IllegalArgumentException("Unknown type ($itemClass) in $href response")
             } as? Z
         }
     }
@@ -290,7 +289,7 @@ public data class CursorBasedPagingObject<T : Any>(
     @Suppress("UNCHECKED_CAST")
     public suspend fun getCursorBasedPagingObject(url: String): CursorBasedPagingObject<T>? {
         val json = api.defaultEndpoint.get(url)
-        return when (itemClazz) {
+        return when (itemClass) {
             PlayHistory::class -> json.toCursorBasedPagingObject(
                 PlayHistory::class,
                 PlayHistory.serializer(),
@@ -378,7 +377,7 @@ public abstract class PagingObjectBase<T : Any, Z : PagingObjectBase<T, Z>> : Li
     }
 
     @Transient
-    internal var itemClazz: KClass<T>? = null
+    internal var itemClass: KClass<T>? = null
 
     internal abstract suspend fun get(type: PagingTraversalType): Z?
 
@@ -417,7 +416,8 @@ public abstract class PagingObjectBase<T : Any, Z : PagingObjectBase<T, Z>> : Li
      * @param total The total amount of [PagingObjectBase] to request, which includes this [PagingObjectBase].
      * @since 3.0.0
      */
-    public fun getWithNextTotalPagingObjectsRestAction(total: Int): SpotifyRestAction<List<Z>> = SpotifyRestAction { getWithNextTotalPagingObjects(total) }
+    public fun getWithNextTotalPagingObjectsRestAction(total: Int): SpotifyRestAction<List<Z>> =
+        SpotifyRestAction { getWithNextTotalPagingObjects(total) }
 
     public suspend fun getNext(): Z? = get(FORWARDS)
 
@@ -452,7 +452,9 @@ public abstract class PagingObjectBase<T : Any, Z : PagingObjectBase<T, Z>> : Li
      * @param total The total amount of [PagingObjectBase] to request, including the [PagingObjectBase] associated with the current request.
      * @since 3.0.0
      */
-    public fun getWithNextItemsRestAction(total: Int): SpotifyRestAction<List<T?>> = SpotifyRestAction { getWithNextItems(total) }
+    public fun getWithNextItemsRestAction(total: Int): SpotifyRestAction<List<T?>> =
+        SpotifyRestAction { getWithNextItems(total) }
+
     /**
      * Flow from current page backwards.
      * */
@@ -556,9 +558,35 @@ public abstract class PagingObjectBase<T : Any, Z : PagingObjectBase<T, Z>> : Li
 }
 
 internal fun Any.instantiateLateinitsIfPagingObjects(api: GenericSpotifyApi) = when (this) {
-    is FeaturedPlaylists -> this.playlists
-    is Show -> this.episodes
-    is Album -> this.tracks
-    is Playlist -> this.tracks
+    is FeaturedPlaylists -> {
+        this.playlists.itemClass = SimplePlaylist::class
+        listOf(this.playlists)
+    }
+    is Show -> {
+        this.episodes.itemClass = SimpleEpisode::class
+        listOf(this.episodes)
+    }
+    is Album -> {
+        this.tracks.itemClass = SimpleTrack::class
+        listOf(this.tracks)
+    }
+    is Playlist -> {
+        this.tracks.itemClass = PlaylistTrack::class
+        listOf(this.tracks)
+    }
+    is SpotifySearchResult -> {
+        this.albums?.itemClass = SimpleAlbum::class
+        this.artists?.itemClass = Artist::class
+        this.episodes?.itemClass = SimpleEpisode::class
+        this.playlists?.itemClass = SimplePlaylist::class
+        this.shows?.itemClass = SimpleShow::class
+        this.tracks?.itemClass = Track::class
+        listOfNotNull(albums, artists, episodes, playlists, shows, tracks)
+    }
     else -> null
-}?.let { it.api = api; it.getMembersThatNeedApiInstantiation().instantiateAllNeedsApiObjects(api) }
+}?.let { objs ->
+    objs.forEach { obj ->
+        obj.api = api
+        obj.getMembersThatNeedApiInstantiation().instantiateAllNeedsApiObjects(api)
+    }
+}

src/commonMain/kotlin/com.adamratzman.spotify/models/serialization/SerializationUtils.kt

@@ -218,5 +218,5 @@ internal fun <T : Any, Z : PagingObjectBase<T, Z>> PagingObjectBase<T, Z>.instan
 ) {
     getMembersThatNeedApiInstantiation().instantiateAllNeedsApiObjects(api)
     this.api = api
-    this.itemClazz = tClazz
+    this.itemClass = tClazz
 }

src/commonTest/kotlin/com.adamratzman/spotify/Common.kt

@@ -12,7 +12,7 @@ val redirectUri = getEnvironmentVariable("SPOTIFY_REDIRECT_URI")
 val tokenString = getEnvironmentVariable("SPOTIFY_TOKEN_STRING")
 
 // https://github.com/Kotlin/kotlinx.coroutines/issues/1996#issuecomment-728562784
-expect fun runBlockingTest(block: suspend () -> Unit)
+expect fun runBlockingTest(block: suspend CoroutineScope.() -> Unit)
 expect val testCoroutineContext: CoroutineContext
 
 @ThreadLocal

src/commonTest/kotlin/com.adamratzman/spotify/TestUtilities.kt

@@ -2,14 +2,13 @@
 package com.adamratzman.spotify
 
 abstract class AbstractTest<T : GenericSpotifyApi> {
-    lateinit var api: T
+    var api: T? = null
 
     suspend fun build(): Boolean {
         return try {
             @Suppress("UNCHECKED_CAST")
             (buildSpotifyApi() as? T)?.let { api = it }
-            println(api as? T)
-            ::api.isInitialized
+            api != null
         } catch (cce: ClassCastException) {
             false
         }

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

@@ -12,38 +12,38 @@ import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
 class ClientEpisodeApiTest {
-    lateinit var api: SpotifyClientApi
+    var api: SpotifyClientApi? = null
 
     init {
         runBlockingTest {
             (buildSpotifyApi() as? SpotifyClientApi)?.let { api = it }
         }
     }
 
-    fun testPrereq() = ::api.isInitialized
+    fun testPrereq() = api != null
 
     @Test
     fun testGetEpisode() {
         runBlockingTest {
-            if (!testPrereq()) return@runBlockingTest
+            if (!testPrereq()) return@runBlockingTest else api
 
-            assertNull(api.episodes.getEpisode("nonexistant episode"))
-            assertNotNull(api.episodes.getEpisode("4IhgnOc8rwMW70agMWVVfh"))
+            assertNull(api!!.episodes.getEpisode("nonexistant episode"))
+            assertNotNull(api!!.episodes.getEpisode("4IhgnOc8rwMW70agMWVVfh"))
         }
     }
 
     @Test
     fun testGetEpisodes() {
         runBlockingTest {
-            if (!testPrereq()) return@runBlockingTest
-
-            assertFailsWithSuspend<BadRequestException> { api.episodes.getEpisodes("hi", "dad") }
+            if (!testPrereq()) return@runBlockingTest else api!!
+            
+            assertFailsWithSuspend<BadRequestException> { api!!.episodes.getEpisodes("hi", "dad") }
             assertFailsWithSuspend<BadRequestException> {
-                api.episodes.getEpisodes("1cfOhXP4GQCd5ZFHoSF8gg", "j").map { it?.name }
+                api!!.episodes.getEpisodes("1cfOhXP4GQCd5ZFHoSF8gg", "j").map { it?.name }
             }
             assertEquals(
                 listOf("The 'Murder Hornets' And The Honey Bees"),
-                api.episodes.getEpisodes("4IhgnOc8rwMW70agMWVVfh").map { it?.name }
+                api!!.episodes.getEpisodes("4IhgnOc8rwMW70agMWVVfh").map { it?.name }
             )
         }
     }