Merge pull request #212 from adamint/dev

fix android base64, pkce

Author: adamint

CONTRIBUTING.md

@@ -5,6 +5,7 @@ email, or any other method with the owners of this repository before making a ch
 
 Please note we have a code of conduct, please follow it in all your interactions with the project.
 
+
 ## Testing
 Please see [testing.md](TESTING.md) for full testing instructions. Your contributions should be able to pass every test
 

README.md

@@ -7,42 +7,20 @@ You must create a Spotify application [here](https://developer.spotify.com/dashb
 
 To run **only** public endpoint tests, run
 
-`gradle check`
+`gradle jvmTest` and `gradle testDebugUnitTest`
 
 Note: You must have `SPOTIFY_CLIENT_ID` and `SPOTIFY_CLIENT_SECRET` as environment variables.
 
 To run **all** tests, you need a valid Spotify application, redirect uri, and token string. use:
 
-`gradle check`
+`gradle jvmTest` and `gradle testDebugUnitTest`
 
 Note: In addition to `SPOTIFY_CLIENT_ID` and `SPOTIFY_CLIENT_SECRET`, you also must have the following environment 
 variables set up: `SPOTIFY_REDIRECT_URI` and `SPOTIFY_TOKEN_STRING`
 
 Some tests may fail if you do not allow access to all required scopes. To mitigate this, you can individually grant 
 each scope or use the following code snippet to print out the Spotify token string (given a generated authorization code)
 
-**How to generate an authorization URL**
-```kotlin
-import com.adamratzman.com.adamratzman.spotify.main.SpotifyScope
-val api = spotifyClientApi(
-        "SPOTIFY_CLIENT_ID",
-        "SPOTIFY_CLIENT_SECRET",
-        "SPOTIFY_REDIRECT_URI") {
-    authorization {
-        tokenString = "SPOTIFY_TOKEN_STRING"
-    }
-}.getAuthorizationUrl(*SpotifyScope.values())
-
-```
-
-**How to get a Spotify token**
-```kotlin
-val api = spotifyClientApi(
-        "SPOTIFY_CLIENT_ID",
-        "SPOTIFY_CLIENT_SECRET",
-        "SPOTIFY_REDIRECT_URI") {
-    authorization {
-        tokenString = "SPOTIFY_TOKEN_STRING"
-    }
-}.build().token.accessToken.let { println(it) }
-```
+To build the maven artifact locally, you will need to follow these steps:
+- Create `gradle.properties` if it doesn't exist already.
+- Follow [this guide](https://gist.github.com/phit/bd3c6d156a2fa5f3b1bc15fa94b3256c). Instead of `.gpg` extension, use `.kbx` for your secring.

TESTING.md

@@ -31,13 +31,7 @@ buildscript {
 }
 
 group = "com.adamratzman"
-version = "3.2.01"
-
-/*java {
-    withSourcesJar()
-    withJavadocJar()
-}
-*/
+version = "3.2.11"
 
 tasks.withType<Test> {
     this.testLogging {
@@ -47,6 +41,13 @@ tasks.withType<Test> {
 
 android {
     compileSdkVersion(30)
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    packagingOptions {
+        exclude("META-INF/*.md")
+    }
     defaultConfig {
         minSdkVersion(15)
         targetSdkVersion(30)
@@ -59,13 +60,19 @@ android {
             isMinifyEnabled = false
         }
     }
+    testOptions {
+        @Suppress("UNCHECKED_CAST")
+        this.unitTests.all(closureOf<Test> {
+            this.useJUnitPlatform()
+        } as groovy.lang.Closure<Test>)
+    }
     sourceSets {
         getByName("main") {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
             java.setSrcDirs(listOf("src/androidMain/kotlin"))
             res.setSrcDirs(listOf("src/androidMain/res"))
         }
-        getByName("androidTest") {
+        getByName("test") {
             java.setSrcDirs(listOf("src/androidTest/kotlin"))
             res.setSrcDirs(listOf("src/androidTest/res"))
         }
@@ -86,7 +93,9 @@ kotlin {
             setupPom(artifactId)
         }
 
-        publishLibraryVariants("release")
+        publishLibraryVariants("debug", "release")
+
+        publishLibraryVariantsGroupedByFlavor = true
     }
 
     jvm {
@@ -152,7 +161,7 @@ kotlin {
                 dependencies {
                     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
                     api("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serializationVersion")
-                    api("io.ktor:ktor-client-okhttp:$ktorVersion")
+                    api("io.ktor:ktor-client-cio:$ktorVersion")
                     implementation(kotlin("stdlib-jdk8"))
                 }
             }
@@ -162,10 +171,10 @@ kotlin {
                     implementation(kotlin("test"))
                     implementation(kotlin("test-junit"))
                     implementation("org.junit.jupiter:junit-jupiter:5.6.2")
+                    implementation("com.sparkjava:spark-core:2.9.1")
                     implementation("org.spekframework.spek2:spek-dsl-jvm:$spekVersion")
                     runtimeOnly("org.spekframework.spek2:spek-runner-junit5:$spekVersion")
                     runtimeOnly(kotlin("reflect"))
-                    implementation("com.sparkjava:spark-core:2.9.1")
                 }
             }
 
@@ -177,7 +186,7 @@ kotlin {
                     api("io.ktor:ktor-client-js:$ktorVersion")
                     api(npm("abort-controller", "3.0.0"))
                     api(npm("node-fetch", "2.6.0"))
-                    api(npm("btoa", "1.2.1"))
+
                     compileOnly(kotlin("stdlib-js"))
                 }
             }
@@ -199,7 +208,8 @@ kotlin {
                     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")
+                    api("io.ktor:ktor-client-cio:$ktorVersion")
+                    api("io.coil-kt:coil:0.11.0")
                     implementation(kotlin("stdlib-jdk8"))
                 }
             }
@@ -209,6 +219,8 @@ kotlin {
                     implementation(kotlin("test"))
                     implementation(kotlin("test-junit"))
                     implementation("org.junit.jupiter:junit-jupiter:5.6.2")
+                    implementation("com.sparkjava:spark-core:2.9.1")
+                    implementation("org.mockito:mockito-core:3.3.3")
                     implementation("org.spekframework.spek2:spek-dsl-jvm:$spekVersion")
                     runtimeOnly("org.spekframework.spek2:spek-runner-junit5:$spekVersion")
                     runtimeOnly(kotlin("reflect"))
@@ -253,7 +265,11 @@ publishing {
 }
 
 signing {
-    sign(publishing.publications)
+    if (project.hasProperty("signing.keyId")
+            && project.hasProperty("signing.password")
+            && project.hasProperty("signing.secretKeyRingFile")) {
+        sign(publishing.publications)
+    }
 }
 
 tasks {
@@ -265,30 +281,30 @@ tasks {
             val js by creating {
                 sourceLink {
                     path = "/src"
-                    url = "https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin/tree/master/"
+                    url = "https://github.com/adamint/spotify-web-api-kotlin/tree/master/"
                     lineSuffix = "#L"
                 }
             }
             val jvm by creating {
                 sourceLink {
                     path = "/src"
-                    url = "https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin/tree/master/"
+                    url = "https://github.com/adamint/spotify-web-api-kotlin/tree/master/"
                     lineSuffix = "#L"
                 }
             }
 
             register("common") {
                 sourceLink {
                     path = "/src"
-                    url = "https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin/tree/master/"
+                    url = "https://github.com/adamint/spotify-web-api-kotlin/tree/master/"
                     lineSuffix = "#L"
                 }
             }
 
             register("global") {
                 sourceLink {
                     path = "/src"
-                    url = "https://github.com/adamint/com.adamratzman.spotify-web-api-kotlin/tree/master/"
+                    url = "https://github.com/adamint/spotify-web-api-kotlin/tree/master/"
                     lineSuffix = "#L"
                 }
 
@@ -302,12 +318,6 @@ tasks {
         }
     }
 
-    /* val javadocJar by getting(Jar::class) {
-         dependsOn.add(javadoc)
-         archiveClassifier.set("javadoc")
-         from(javadoc)
-     }*/
-
     spotless {
         kotlin {
             target("**/*.kt")
@@ -325,7 +335,6 @@ tasks {
         useJUnitPlatform()
     }
 
-
     val publishJvm by registering(Task::class) {
         dependsOn.add(check)
         dependsOn.add(dokka)
@@ -341,12 +350,12 @@ 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/com.adamratzman.spotify-web-api-kotlin")
+        url.set("https://github.com/adamint/spotify-web-api-kotlin")
         inceptionYear.set("2018")
         scm {
-            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")
+            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")
         }
         licenses {
             license {

build.gradle.kts

@@ -82,7 +82,6 @@ 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
@@ -130,7 +129,6 @@ 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

gradle/wrapper/gradle-wrapper.jar

@@ -29,9 +29,6 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -84,7 +81,6 @@ 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%