Merge pull request #176 from adamint/dev

bug fixes, avoid name shadowing, fix uri serialization

Author: adamint

build.gradle.kts

@@ -1,21 +1,20 @@
-
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile
 
 plugins {
     `maven-publish`
     signing
     `java-library`
-    id("io.codearte.nexus-staging") version "0.21.1"
+    id("io.codearte.nexus-staging") version "0.21.2"
     kotlin("multiplatform") version "1.3.61"
     kotlin("plugin.serialization") version "1.3.61"
-    id("com.diffplug.gradle.spotless") version "3.26.0"
+    id("com.diffplug.gradle.spotless") version "3.26.1"
     id("com.moowork.node") version "1.3.1"
     id("org.jetbrains.dokka") version "0.10.0"
 }
 
 group = "com.adamratzman"
-version = "3.0.0-rc.5"
+version = "3.0.0"
 
 java {
     withSourcesJar()
@@ -34,10 +33,10 @@ kotlin {
 
     targets {
         sourceSets {
-            val coroutineVersion = "1.3.2"
+            val coroutineVersion = "1.3.3"
             val serializationVersion = "0.14.0"
-            val spekVersion = "2.0.8"
-            val ktorVersion = "1.2.6"
+            val spekVersion = "2.0.9"
+            val ktorVersion = "1.3.0-rc2"
 
             val commonMain by getting {
                 dependencies {
@@ -62,7 +61,6 @@ kotlin {
                 }
 
                 dependencies {
-                    implementation("com.neovisionaries:nv-i18n:1.26")
                     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serializationVersion")
                     implementation("io.ktor:ktor-client-apache:$ktorVersion")
@@ -74,7 +72,7 @@ kotlin {
                 dependencies {
                     implementation(kotlin("test"))
                     implementation(kotlin("test-junit"))
-                    implementation("org.junit.jupiter:junit-jupiter:5.5.2")
+                    implementation("org.junit.jupiter:junit-jupiter:5.6.0-M1")
                     implementation("org.spekframework.spek2:spek-dsl-jvm:$spekVersion")
                     runtimeOnly("org.spekframework.spek2:spek-runner-junit5:$spekVersion")
                     runtimeOnly(kotlin("reflect"))
@@ -83,7 +81,7 @@ kotlin {
 
             val jsMain by getting {
                 dependencies {
-                    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.3.2")
+                    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutineVersion")
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:$serializationVersion")
                     implementation("io.ktor:ktor-client-js:$ktorVersion")
                     compileOnly(kotlin("stdlib-js"))

docs/docs/spotify-web-api-kotlin/com.adamratzman.spotify.endpoints.client/-client-library-api/get-saved-albums.html

@@ -9,7 +9,7 @@
 <br/>
 <h1>getSavedAlbums</h1>
 <a name="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedAlbums(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)"></a>
-(common, js, jvm) <code><span class="keyword">fun </span><span class="identifier">getSavedAlbums</span><span class="symbol">(</span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedAlbums(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/limit">limit</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">, </span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedAlbums(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/offset">offset</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">, </span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedAlbums(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/market">market</span><span class="symbol">:</span>&nbsp;<a href="../../com.adamratzman.spotify.models/-country-code.html"><span class="identifier">CountryCode</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">)</span><span class="symbol">: </span><a href="../../com.adamratzman.spotify/-spotify-rest-action-paging/index.html"><span class="identifier">SpotifyRestActionPaging</span></a><span class="symbol">&lt;</span><a href="../../com.adamratzman.spotify.models/-saved-album/index.html"><span class="identifier">SavedAlbum</span></a><span class="symbol">,</span>&nbsp;<a href="../../com.adamratzman.spotify.models/-paging-object/index.html"><span class="identifier">PagingObject</span></a><span class="symbol">&lt;</span><a href="../../com.adamratzman.spotify.models/-saved-album/index.html"><span class="identifier">SavedAlbum</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code>
+(common, js, jvm) <code><span class="keyword">fun </span><span class="identifier">getSavedAlbums</span><span class="symbol">(</span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedAlbums(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/limit">limit</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">, </span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedAlbums(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/offset">offset</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">, </span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedAlbums(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/market">market</span><span class="symbol">:</span>&nbsp;<a href="../../com.adamratzman.spotify.utils/-market/index.html"><span class="identifier">Market</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">)</span><span class="symbol">: </span><a href="../../com.adamratzman.spotify/-spotify-rest-action-paging/index.html"><span class="identifier">SpotifyRestActionPaging</span></a><span class="symbol">&lt;</span><a href="../../com.adamratzman.spotify.models/-saved-album/index.html"><span class="identifier">SavedAlbum</span></a><span class="symbol">,</span>&nbsp;<a href="../../com.adamratzman.spotify.models/-paging-object/index.html"><span class="identifier">PagingObject</span></a><span class="symbol">&lt;</span><a href="../../com.adamratzman.spotify.models/-saved-album/index.html"><span class="identifier">SavedAlbum</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code>
 <p>Get a list of the albums saved in the current Spotify user’s ‘Your Music’ library.</p>
 <p><strong>Requires</strong> the <a href="../../com.adamratzman.spotify/-spotify-scope/-u-s-e-r_-l-i-b-r-a-r-y_-r-e-a-d.html#com.adamratzman.spotify.SpotifyScope.USER_LIBRARY_READ">SpotifyScope.USER_LIBRARY_READ</a> scope</p>
 <h3>Parameters</h3>

docs/docs/spotify-web-api-kotlin/com.adamratzman.spotify.endpoints.client/-client-library-api/get-saved-tracks.html

@@ -9,7 +9,7 @@
 <br/>
 <h1>getSavedTracks</h1>
 <a name="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedTracks(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)"></a>
-(common, js, jvm) <code><span class="keyword">fun </span><span class="identifier">getSavedTracks</span><span class="symbol">(</span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedTracks(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/limit">limit</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">, </span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedTracks(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/offset">offset</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">, </span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedTracks(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/market">market</span><span class="symbol">:</span>&nbsp;<a href="../../com.adamratzman.spotify.models/-country-code.html"><span class="identifier">CountryCode</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">)</span><span class="symbol">: </span><a href="../../com.adamratzman.spotify/-spotify-rest-action-paging/index.html"><span class="identifier">SpotifyRestActionPaging</span></a><span class="symbol">&lt;</span><a href="../../com.adamratzman.spotify.models/-saved-track/index.html"><span class="identifier">SavedTrack</span></a><span class="symbol">,</span>&nbsp;<a href="../../com.adamratzman.spotify.models/-paging-object/index.html"><span class="identifier">PagingObject</span></a><span class="symbol">&lt;</span><a href="../../com.adamratzman.spotify.models/-saved-track/index.html"><span class="identifier">SavedTrack</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code>
+(common, js, jvm) <code><span class="keyword">fun </span><span class="identifier">getSavedTracks</span><span class="symbol">(</span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedTracks(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/limit">limit</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">, </span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedTracks(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/offset">offset</span><span class="symbol">:</span>&nbsp;<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html"><span class="identifier">Int</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">, </span><span class="identifier" id="com.adamratzman.spotify.endpoints.client.ClientLibraryApi$getSavedTracks(kotlin.Int, kotlin.Int, com.adamratzman.spotify.utils.Market)/market">market</span><span class="symbol">:</span>&nbsp;<a href="../../com.adamratzman.spotify.utils/-market/index.html"><span class="identifier">Market</span></a><span class="symbol">?</span>&nbsp;<span class="symbol">=</span>&nbsp;null<span class="symbol">)</span><span class="symbol">: </span><a href="../../com.adamratzman.spotify/-spotify-rest-action-paging/index.html"><span class="identifier">SpotifyRestActionPaging</span></a><span class="symbol">&lt;</span><a href="../../com.adamratzman.spotify.models/-saved-track/index.html"><span class="identifier">SavedTrack</span></a><span class="symbol">,</span>&nbsp;<a href="../../com.adamratzman.spotify.models/-paging-object/index.html"><span class="identifier">PagingObject</span></a><span class="symbol">&lt;</span><a href="../../com.adamratzman.spotify.models/-saved-track/index.html"><span class="identifier">SavedTrack</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code>
 <p>Get a list of the songs saved in the current Spotify user’s ‘Your Music’ library.</p>
 <p><strong>Requires</strong> the <a href="../../com.adamratzman.spotify/-spotify-scope/-u-s-e-r_-l-i-b-r-a-r-y_-r-e-a-d.html#com.adamratzman.spotify.SpotifyScope.USER_LIBRARY_READ">SpotifyScope.USER_LIBRARY_READ</a> scope</p>
 <h3>Parameters</h3>