Skip to content

Commit cccda75

Browse files
adamintadamint
committed
fix samples
1 parent 20bcd97 commit cccda75

20 files changed

+125
-100
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ gradle-app.setting
122122
# gradle/wrapper/gradle-wrapper.properties
123123

124124
### Gradle Patch ###
125-
**/build/
125+
samples/jvm/build/
126126

127127
# End of https://www.gitignore.io/api/gradle,kotlin,intellij
128128
/.idea/

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,6 @@ For obvious reasons, in most cases, making asynchronous requests via `queue` or
199199
the synchronous format is also shown.
200200

201201
```kotlin
202-
import com.adamratzman.spotify.SpotifyApi.Companion.spotifyAppApi
203-
204202
val api = spotifyAppApi(
205203
System.getenv("SPOTIFY_CLIENT_ID"),
206204
System.getenv("SPOTIFY_CLIENT_SECRET")

‎TESTING.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ each scope or use the following code snippet to print out the Spotify token stri
2424
**How to generate an authorization URL**
2525
```kotlin
2626
import com.adamratzman.spotify.main.SpotifyScope
27-
import com.adamratzman.spotify.SpotifyApi.Companion.spotifyClientApi
28-
2927
val api = spotifyClientApi(
3028
"SPOTIFY_CLIENT_ID",
3129
"SPOTIFY_CLIENT_SECRET",
@@ -39,8 +37,6 @@ val api = spotifyClientApi(
3937

4038
**How to get a Spotify token**
4139
```kotlin
42-
import com.adamratzman.spotify.SpotifyApi.Companion.spotifyClientApi
43-
4440
val api = spotifyClientApi(
4541
"SPOTIFY_CLIENT_ID",
4642
"SPOTIFY_CLIENT_SECRET",

‎samples/build.gradle renamed to ‎samples/jvm/build.gradle

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
1-
plugins {
2-
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
3-
}
4-
5-
group 'com.adamratzman'
6-
version '3.0.1'
7-
8-
repositories {
9-
jcenter()
10-
}
11-
12-
dependencies {
13-
compile "com.adamratzman:spotify-api-kotlin:3.0.0"
14-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
15-
}
16-
17-
compileKotlin {
18-
kotlinOptions.jvmTarget = "1.8"
19-
}
20-
compileTestKotlin {
21-
kotlinOptions.jvmTarget = "1.8"
1+
plugins {
2+
id 'org.jetbrains.kotlin.jvm' version '1.3.61'
3+
}
4+
5+
group 'com.adamratzman'
6+
version '3.0.1'
7+
8+
repositories {
9+
jcenter()
10+
maven { url 'https://jitpack.io' }
11+
}
12+
13+
dependencies {
14+
compile 'com.github.adamint.spotify-web-api-kotlin:spotify-api-kotlin:dev-SNAPSHOT'
15+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
16+
}
17+
18+
compileKotlin {
19+
kotlinOptions.jvmTarget = "1.8"
20+
}
21+
compileTestKotlin {
22+
kotlinOptions.jvmTarget = "1.8"
2223
}

‎samples/settings.gradle renamed to ‎samples/jvm/settings.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
enableFeaturePreview('GRADLE_METADATA')
2-
3-
rootProject.name = 'samples'
4-
1+
enableFeaturePreview('GRADLE_METADATA')
2+
3+
rootProject.name = 'samples'
4+

‎samples/jvm/src/main/kotlin/apiUtils/ApiUtils.kt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package apiUtils
2+
3+
import com.adamratzman.spotify.spotifyAppApi
4+
import kotlinx.coroutines.runBlocking
5+
6+
fun main() {
7+
// build sync
8+
spotifyAppApi(
9+
System.getenv("SPOTIFY_CLIENT_ID"),
10+
System.getenv("SPOTIFY_CLIENT_SECRET")
11+
).build()
12+
13+
// build ASYNC
14+
15+
runBlocking {
16+
spotifyAppApi(
17+
System.getenv("SPOTIFY_CLIENT_ID"),
18+
System.getenv("SPOTIFY_CLIENT_SECRET")
19+
).buildAsyncAt(this) { api ->
20+
// do stuff
21+
}
22+
}
23+
24+
// build with options
25+
spotifyAppApi(
26+
System.getenv("SPOTIFY_CLIENT_ID"),
27+
System.getenv("SPOTIFY_CLIENT_SECRET")
28+
) {
29+
options {
30+
automaticRefresh = false
31+
useCache = false
32+
}
33+
}.build()
34+
}

‎samples/src/main/kotlin/public/AlbumApiSample.kt renamed to ‎samples/jvm/src/main/kotlin/appApi/AlbumApiSample.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2020; Original author: Adam Ratzman */
2-
package public
2+
package appApi
33

4-
import com.adamratzman.spotify.SpotifyApi.Companion.spotifyAppApi
4+
import com.adamratzman.spotify.spotifyAppApi
55

66
fun main() {
77
// instantiate api
@@ -17,5 +17,5 @@ fun main() {
1717
println(api.albums.getAlbums("spotify:album:4M2p2BIRHIeBu8Ew9IBQ0s", "nonexistantalbum"))
1818

1919
// get album "Kids in Love"'s tracks
20-
println(api.albums.getAlbumTracks("spotify:album:4M2p2BIRHIeBu8Ew9IBQ0s").complete().map { it.name })
20+
println(api.albums.getAlbumTracks("spotify:album:4M2p2BIRHIeBu8Ew9IBQ0s").complete().filterNotNull().map { it.name })
2121
}

‎samples/src/main/kotlin/public/ArtistApiSample.kt renamed to ‎samples/jvm/src/main/kotlin/appApi/ArtistApiSample.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2020; Original author: Adam Ratzman */
2-
package public
2+
package appApi
33

4-
import com.adamratzman.spotify.SpotifyApi.Companion.spotifyAppApi
4+
import com.adamratzman.spotify.spotifyAppApi
55

66
fun main() {
77
// instantiate api
@@ -17,7 +17,7 @@ fun main() {
1717
println(api.artists.getArtists("spotify:artist:26HkLAAIMh5qOFet57d1rg", "nonexistantartist"))
1818

1919
// get all of artist Cody G's albums
20-
println(api.artists.getArtistAlbums("spotify:artist:26HkLAAIMh5qOFet57d1rg").getAllItems().complete().map { it.name })
20+
println(api.artists.getArtistAlbums("spotify:artist:26HkLAAIMh5qOFet57d1rg").getAllItems().complete().filterNotNull().map { it.name })
2121

2222
// get Cody G's top tracks, in descending order, in France
2323
println(api.artists.getArtistTopTracks("spotify:artist:26HkLAAIMh5qOFet57d1rg").complete().map { it.name })

‎samples/src/main/kotlin/public/BrowseApiSample.kt renamed to ‎samples/jvm/src/main/kotlin/appApi/BrowseApiSample.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2020; Original author: Adam Ratzman */
2-
package public
2+
package appApi
33

4-
import com.adamratzman.spotify.SpotifyApi.Companion.spotifyAppApi
54
import com.adamratzman.spotify.endpoints.public.TrackAttribute
65
import com.adamratzman.spotify.endpoints.public.TuneableTrackAttribute
6+
import com.adamratzman.spotify.spotifyAppApi
77
import com.adamratzman.spotify.utils.Locale
88
import com.adamratzman.spotify.utils.Market
99

@@ -23,13 +23,13 @@ fun main() {
2323
println(api.browse.getCategoryList(limit = 20).complete().items.map { it.name })
2424

2525
// get and print all Spotify categories in the French market, with German strings
26-
println(api.browse.getCategoryList(market = Market.FR, locale = Locale.de_DE).getAllItems().complete().map { "${it.name} (${it.id})" })
26+
println(api.browse.getCategoryList(market = Market.FR, locale = Locale.de_DE).getAllItems().complete().filterNotNull().map { "${it.name} (${it.id})" })
2727

2828
// get the "Pop" category
2929
println(api.browse.getCategory("pop").complete())
3030

3131
// get 35 new featured album releases, starting with the 4th featured album (index=3)
32-
println(api.browse.getNewReleases(limit = 35, offset = 3).getAllItems().complete().map { release -> "${release.name} by ${release.artists.map { it.name }}" })
32+
println(api.browse.getNewReleases(limit = 35, offset = 3).getAllItems().complete().filterNotNull().map { release -> "${release.name} by ${release.artists.map { it.name }}" })
3333

3434
// get available genre seeds
3535
println(api.browse.getAvailableGenreSeeds().complete())

‎samples/src/main/kotlin/public/FollowingApiSample.kt renamed to ‎samples/jvm/src/main/kotlin/appApi/FollowingApiSample.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2020; Original author: Adam Ratzman */
2-
package public
2+
package appApi
3+
4+
import com.adamratzman.spotify.spotifyAppApi
35

4-
import com.adamratzman.spotify.SpotifyApi.Companion.spotifyAppApi
56

67
fun main() {
78
// instantiate api

0 commit comments

Comments
 (0)