begin adding android target

Author: adamint

README.md

@@ -15,7 +15,7 @@ repositories {
     jcenter()
 }
 
-compile group: 'com.adamratzman', name: 'spotify-api-kotlin', version: '3.1.0-rc.1'
+compile group: 'com.adamratzman', name: 'com.adamratzman.spotify-api-kotlin', version: '3.1.0-rc.1'
 ```
 
 To use the latest snapshot instead, you must add the Jitpack repository as well
@@ -28,15 +28,15 @@ repositories {
 Then, you can use the following:
 ```
 dependencies {
-	compile 'com.github.adamint:spotify-web-api-kotlin:dev-SNAPSHOT'
+	compile 'com.github.adamint:com.adamratzman.spotify-web-api-kotlin:dev-SNAPSHOT'
 }
 ```
 
 ### Maven
 ```
 <dependency>
     <groupId>com.adamratzman</groupId>
-    <artifactId>spotify-api-kotlin</artifactId>
+    <artifactId>com.adamratzman.spotify-api-kotlin</artifactId>
     <version>SPOTIFY_API_VERSION</version>
 </dependency>
 ```
@@ -53,7 +53,7 @@ JCenter Maven Repository:
 This library will work out of the box on Android.
 
 ## Documentation
-The `spotify-web-api-kotlin` JavaDocs are hosted at https://adamint.github.io/spotify-web-api-kotlin/docs/spotify-web-api-kotlin/
+The `com.adamratzman.spotify-web-api-kotlin` JavaDocs are hosted at https://adamint.github.io/com.adamratzman.spotify-web-api-kotlin/docs/com.adamratzman.spotify-web-api-kotlin/
 
 ## Samples
 Samples for all APIs are located in the `samples` directory
@@ -67,7 +67,7 @@ If you have a question, you can:
 
 ## Creating a new api instance
 To decide which api you need (SpotifyAppApi, SpotifyClientApi, SpotifyImplicitGrantApi), please refer to 
-https://developer.spotify.com/documentation/general/guides/authorization-guide/. In general:
+https://developer.com.adamratzman.spotify.com/documentation/general/guides/authorization-guide/. In general:
 - If you don't need client resources, use SpotifyAppApi
 - If you're using the api in a backend application, use SpotifyClientApi
 - If you're using the api in a frontend application, use SpotifyImplicitGrantApi
@@ -217,7 +217,7 @@ println(api.browse.getFeaturedPlaylists().complete().message)
 // let's find out Bénabar's Spotify ID, find his top tracks, and print them out
 
 val benabarId = api.search.searchArtist("Bénabar").complete()[0].id
-// this works; a redundant way would be: api.artists.getArtist("spotify:artist:6xoAWsIOZxJVPpo7Qvqaqv").complete().id
+// this works; a redundant way would be: api.artists.getArtist("com.adamratzman.spotify:artist:6xoAWsIOZxJVPpo7Qvqaqv").complete().id
 
 println(api.artists.getArtistTopTracks(benabarId).complete().joinToString { it.name })
 ```

TESTING.md

@@ -23,7 +23,7 @@ each scope or use the following code snippet to print out the Spotify token stri
 
 **How to generate an authorization URL**
 ```kotlin
-import com.adamratzman.spotify.main.SpotifyScope
+import com.adamratzman.com.adamratzman.spotify.main.SpotifyScope
 val api = spotifyClientApi(
         "SPOTIFY_CLIENT_ID",
         "SPOTIFY_CLIENT_SECRET",

build.gradle.kts

@@ -5,36 +5,79 @@ import java.net.URI
 plugins {
     `maven-publish`
     signing
-    `java-library`
     id("io.codearte.nexus-staging") version "0.21.2"
     kotlin("multiplatform") version "1.3.72"
     kotlin("plugin.serialization") version "1.3.72"
     id("com.diffplug.gradle.spotless") version "4.4.0"
     id("com.moowork.node") version "1.3.1"
     id("org.jetbrains.dokka") version "0.10.1"
+    id("com.android.library")
+    id("kotlin-android-extensions")
+}
+
+repositories {
+    jcenter()
+    google()
+    maven("https://kotlin.bintray.com/kotlinx")
+}
+
+buildscript {
+    repositories {
+        google()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:3.5.4")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
+    }
 }
 
 group = "com.adamratzman"
 version = "3.1.03"
 
-java {
+/*java {
     withSourcesJar()
     withJavadocJar()
 }
+*/
 
 tasks.withType<Test> {
     this.testLogging {
         this.showStandardStreams = true
     }
 }
 
-repositories {
-    mavenCentral()
-    jcenter()
-    maven("https://kotlin.bintray.com/kotlinx")
+android {
+    compileSdkVersion(30)
+    defaultConfig {
+        minSdkVersion(15)
+        targetSdkVersion(30)
+        versionCode = 1
+        versionName = "1.0"
+        testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+        }
+    }
+    sourceSets {
+        getByName("main") {
+            manifest.srcFile("src/androidMain/AndroidManifest.xml")
+            java.setSrcDirs(listOf("src/androidMain/kotlin"))
+            res.setSrcDirs(listOf("src/androidMain/res"))
+        }
+        getByName("androidTest") {
+            java.setSrcDirs(listOf("src/androidTest/kotlin"))
+            res.setSrcDirs(listOf("src/androidTest/res"))
+        }
+    }
 }
 
 kotlin {
+    android() {
+
+    }
+
     jvm()
     js {
         browser {
@@ -88,7 +131,6 @@ kotlin {
                     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
                     api("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serializationVersion")
                     api("io.ktor:ktor-client-okhttp:$ktorVersion")
-                    api("commons-codec:commons-codec:1.14")
                     implementation(kotlin("stdlib-jdk8"))
                 }
             }
@@ -124,6 +166,32 @@ kotlin {
                 }
             }
 
+            val androidMain by getting {
+                repositories {
+                    mavenCentral()
+                    jcenter()
+                }
+
+                dependencies {
+                    api("net.sourceforge.streamsupport:android-retrofuture:1.7.2")
+                    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
+                    api("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serializationVersion")
+                    api("io.ktor:ktor-client-okhttp:$ktorVersion")
+                    implementation(kotlin("stdlib-jdk8"))
+                }
+            }
+
+            val androidTest by getting {
+                dependencies {
+                    implementation(kotlin("test"))
+                    implementation(kotlin("test-junit"))
+                    implementation("org.junit.jupiter:junit-jupiter:5.6.2")
+                    implementation("org.spekframework.spek2:spek-dsl-jvm:$spekVersion")
+                    runtimeOnly("org.spekframework.spek2:spek-runner-junit5:$spekVersion")
+                    runtimeOnly(kotlin("reflect"))
+                }
+            }
+
             all {
                 languageSettings.useExperimentalAnnotation("kotlin.Experimental")
             }
@@ -134,18 +202,18 @@ kotlin {
 publishing {
     publications {
         val js by getting(MavenPublication::class) {
-            artifactId = "spotify-api-kotlin-js"
-            setupPom("spotify-api-kotlin-js")
+            artifactId = "com.adamratzman.spotify-api-kotlin-js"
+            setupPom("com.adamratzman.spotify-api-kotlin-js")
         }
 
         val kotlinMultiplatform by getting(MavenPublication::class) {
-            artifactId = "spotify-api-kotlin-core"
-            setupPom("spotify-api-kotlin-core")
+            artifactId = "com.adamratzman.spotify-api-kotlin-core"
+            setupPom("com.adamratzman.spotify-api-kotlin-core")
         }
 
         val jvm by getting(MavenPublication::class) {
-            artifactId = "spotify-api-kotlin"
-            artifact(tasks.getByName("javadocJar"))
+            artifactId = "com.adamratzman.spotify-api-kotlin"
+//            artifact(tasks.getByName("javadocJar"))
             versionMapping {
                 usage("java-api") {
                     fromResolutionOf("runtimeClasspath")
@@ -155,7 +223,7 @@ publishing {
                 }
             }
 
-            setupPom("spotify-api-kotlin")
+            setupPom("com.adamratzman.spotify-api-kotlin")
         }
     }
     repositories {
@@ -233,30 +301,30 @@ tasks {
             val js by creating {
                 sourceLink {
                     path = "/src"
-                    url = "https://github.com/adamint/spotify-web-api-kotlin/tree/master/"
+                    url = "https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin/tree/master/"
                     lineSuffix = "#L"
                 }
             }
             val jvm by creating {
                 sourceLink {
                     path = "/src"
-                    url = "https://github.com/adamint/spotify-web-api-kotlin/tree/master/"
+                    url = "https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin/tree/master/"
                     lineSuffix = "#L"
                 }
             }
 
             register("common") {
                 sourceLink {
                     path = "/src"
-                    url = "https://github.com/adamint/spotify-web-api-kotlin/tree/master/"
+                    url = "https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin/tree/master/"
                     lineSuffix = "#L"
                 }
             }
 
             register("global") {
                 sourceLink {
                     path = "/src"
-                    url = "https://github.com/adamint/spotify-web-api-kotlin/tree/master/"
+                    url = "https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin/tree/master/"
                     lineSuffix = "#L"
                 }
 
@@ -270,14 +338,14 @@ tasks {
         }
     }
 
-    val javadocJar by getting(Jar::class) {
-        dependsOn.add(javadoc)
-        archiveClassifier.set("javadoc")
-        from(javadoc)
-    }
+    /* val javadocJar by getting(Jar::class) {
+         dependsOn.add(javadoc)
+         archiveClassifier.set("javadoc")
+         from(javadoc)
+     }*/
 
     artifacts {
-        archives(javadocJar)
+        // archives(javadocJar)
     }
 
     spotless {
@@ -303,18 +371,19 @@ tasks {
         dependsOn.add(dokka)
         dependsOn.add("publishJvmPublicationToNexusRepository")
     }
+
 }
 
 fun MavenPublication.setupPom(publicationName: String) {
     pom {
         name.set(publicationName)
         description.set("A Kotlin wrapper for the Spotify Web API.")
-        url.set("https://github.com/adamint/spotify-web-api-kotlin")
+        url.set("https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin")
         inceptionYear.set("2018")
         scm {
-            url.set("https://github.com/adamint/spotify-web-api-kotlin")
-            connection.set("scm:https://github.com/adamint/spotify-web-api-kotlin.git")
-            developerConnection.set("scm:git://github.com/adamint/spotify-web-api-kotlin.git")
+            url.set("https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin")
+            connection.set("scm:https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin.git")
+            developerConnection.set("scm:git://github.com/adamint/com.adamratzman.spotify-web-api-kotlin.git")
         }
         licenses {
             license {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Fri May 08 04:56:22 EDT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

gradlew.bat

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.github.adamint.spotify-web-api-kotlin:spotify-api-kotlin:dev-SNAPSHOT'
+    compile 'com.github.adamint.com.adamratzman.spotify-web-api-kotlin:com.adamratzman.spotify-api-kotlin:dev-SNAPSHOT'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 }
 

samples/jvm/build.gradle

@@ -11,11 +11,11 @@ fun main() {
     ).build()
 
     // get album "Kids in Love" by the Mowgli's release date
-    println(api.albums.getAlbum("spotify:album:4M2p2BIRHIeBu8Ew9IBQ0s").complete()!!.releaseDate)
+    println(api.albums.getAlbum("com.adamratzman.spotify:album:4M2p2BIRHIeBu8Ew9IBQ0s").complete()!!.releaseDate)
 
     // get album "Kids in Love" and a non-existant album
-    println(api.albums.getAlbums("spotify:album:4M2p2BIRHIeBu8Ew9IBQ0s", "nonexistantalbum"))
+    println(api.albums.getAlbums("com.adamratzman.spotify:album:4M2p2BIRHIeBu8Ew9IBQ0s", "nonexistantalbum"))
 
     // get album "Kids in Love"'s tracks
-    println(api.albums.getAlbumTracks("spotify:album:4M2p2BIRHIeBu8Ew9IBQ0s").complete().filterNotNull().map { it.name })
+    println(api.albums.getAlbumTracks("com.adamratzman.spotify:album:4M2p2BIRHIeBu8Ew9IBQ0s").complete().filterNotNull().map { it.name })
 }

samples/jvm/src/main/kotlin/appApi/AlbumApiSample.kt

@@ -11,17 +11,17 @@ fun main() {
     ).build()
 
     // get artist Cody G's total follower count
-    println(api.artists.getArtist("spotify:artist:26HkLAAIMh5qOFet57d1rg").complete()!!.followers.total)
+    println(api.artists.getArtist("com.adamratzman.spotify:artist:26HkLAAIMh5qOFet57d1rg").complete()!!.followers.total)
 
     // get artist Cody G and a non-existant artist
-    println(api.artists.getArtists("spotify:artist:26HkLAAIMh5qOFet57d1rg", "nonexistantartist"))
+    println(api.artists.getArtists("com.adamratzman.spotify:artist:26HkLAAIMh5qOFet57d1rg", "nonexistantartist"))
 
     // get all of artist Cody G's albums
-    println(api.artists.getArtistAlbums("spotify:artist:26HkLAAIMh5qOFet57d1rg").getAllItems().complete().filterNotNull().map { it.name })
+    println(api.artists.getArtistAlbums("com.adamratzman.spotify:artist:26HkLAAIMh5qOFet57d1rg").getAllItems().complete().filterNotNull().map { it.name })
 
     // get Cody G's top tracks, in descending order, in France
-    println(api.artists.getArtistTopTracks("spotify:artist:26HkLAAIMh5qOFet57d1rg").complete().map { it.name })
+    println(api.artists.getArtistTopTracks("com.adamratzman.spotify:artist:26HkLAAIMh5qOFet57d1rg").complete().map { it.name })
 
     // get Cody G's related artists
-    println(api.artists.getRelatedArtists("spotify:artist:26HkLAAIMh5qOFet57d1rg").complete().map { it.name })
+    println(api.artists.getRelatedArtists("com.adamratzman.spotify:artist:26HkLAAIMh5qOFet57d1rg").complete().map { it.name })
 }