make additional data classes serializable when possible

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

Author: adamint

.gitignore

@@ -333,3 +333,4 @@ gradle-app.setting
 **/build/
 
 # End of https://www.toptal.com/developers/gitignore/api/gradle,kotlin,android,intellij+all,node
+/docs/

README.md

@@ -37,7 +37,7 @@ repositories {
     jcenter()
 }
 
-implementation("com.adamratzman:spotify-api-kotlin-core:3.3.01")
+implementation("com.adamratzman:spotify-api-kotlin-core:3.3.02")
 ```
 
 Note that images and profiles are not supported on the Kotlin/JS target.

build.gradle.kts

@@ -32,7 +32,7 @@ buildscript {
 }
 
 group = "com.adamratzman"
-version = "3.3.01"
+version = "3.3.02"
 
 tasks.withType<Test> {
     this.testLogging {

src/commonMain/kotlin/com.adamratzman.spotify/endpoints/public/BrowseApi.kt

@@ -24,6 +24,7 @@ import com.adamratzman.spotify.utils.Locale
 import com.adamratzman.spotify.utils.Market
 import com.adamratzman.spotify.utils.formatDate
 import kotlin.reflect.KClass
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
 
@@ -313,6 +314,7 @@ public class BrowseApi(api: GenericSpotifyApi) : SpotifyEndpoint(api) {
  *
  * @param attribute The spotify id for the track attribute
  */
+@Serializable
 public sealed class TuneableTrackAttribute<T : Number>(
     public val attribute: String,
     public val integerOnly: Boolean,
@@ -460,6 +462,7 @@ public sealed class TuneableTrackAttribute<T : Number>(
 /**
  * The track attribute wrapper contains a set value for a specific [TuneableTrackAttribute]
  */
+@Serializable
 public data class TrackAttribute<T : Number>(val tuneableTrackAttribute: TuneableTrackAttribute<T>, val value: T) {
     public companion object {
         public fun <T : Number> create(tuneableTrackAttribute: TuneableTrackAttribute<T>, value: T): TrackAttribute<T> =

src/commonMain/kotlin/com.adamratzman.spotify/http/Endpoints.kt

@@ -14,6 +14,8 @@ import com.adamratzman.spotify.utils.getCurrentTimeMs
 import kotlin.math.ceil
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.withTimeout
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
 public abstract class SpotifyEndpoint(public val api: GenericSpotifyApi) {
     public val cache: SpotifyCache = SpotifyCache()
@@ -225,7 +227,9 @@ public data class SpotifyRequest(
     val api: GenericSpotifyApi
 )
 
+@Serializable
 public data class CacheState(val data: String, val eTag: String?, val expireBy: Long = 0) {
+    @Transient
     private val cacheRegex = "max-age=(\\d+)".toRegex()
     internal fun isStillValid(): Boolean = getCurrentTimeMs() <= this.expireBy
 

src/commonMain/kotlin/com.adamratzman.spotify/http/HttpConnection.kt

@@ -24,6 +24,7 @@ import io.ktor.http.content.ByteArrayContent
 import io.ktor.utils.io.core.toByteArray
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
+import kotlinx.serialization.Serializable
 
 public enum class HttpRequestMethod(internal val externalMethod: HttpMethod) {
     GET(HttpMethod.Get),
@@ -32,8 +33,10 @@ public enum class HttpRequestMethod(internal val externalMethod: HttpMethod) {
     DELETE(HttpMethod.Delete);
 }
 
+@Serializable
 public data class HttpHeader(val key: String, val value: String)
 
+@Serializable
 public data class HttpResponse(val responseCode: Int, val body: String, val headers: List<HttpHeader>)
 
 /**

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

@@ -71,6 +71,7 @@ public data class SimpleAlbum(
     public suspend fun toFullAlbum(market: Market? = null): Album? = api.albums.getAlbum(id, market)
 }
 
+@Serializable
 public data class ReleaseDate(val year: Int, val month: Int?, val day: Int?)
 
 /**

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

@@ -6,6 +6,7 @@ import com.adamratzman.spotify.SpotifyScope
 import com.adamratzman.spotify.utils.getCurrentTimeMs
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
 /**
  * Represents a Spotify Token, retrieved through instantiating a [SpotifyApi]
@@ -42,4 +43,8 @@ public data class Token(
     }
 }
 
-public data class TokenValidityResponse(val isValid: Boolean, val exception: Exception?)
+@Serializable
+public data class TokenValidityResponse(
+    val isValid: Boolean,
+    @Transient val exception: Exception? = null
+)