Merge pull request #206 from adamint/dev

add android target

Author: adamint

README.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",

TESTING.md

@@ -1,42 +1,107 @@
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput.Target
-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.02"
+version = "3.2.0"
 
-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"))
+        }
+    }
+}
+
+val dokkaJar by tasks.registering(Jar::class) {
+    group = JavaBasePlugin.DOCUMENTATION_GROUP
+    description = "Docs"
+    classifier = "javadoc"
+    from(tasks.dokka)
 }
 
 kotlin {
-    jvm()
+    android {
+        mavenPublication {
+            artifactId = "spotify-api-kotlin-android"
+            setupPom(artifactId)
+        }
+
+        publishLibraryVariants("release")
+    }
+
+    jvm {
+        mavenPublication {
+            artifactId = "spotify-api-kotlin"
+            setupPom(artifactId)
+        }
+    }
+
     js {
+        mavenPublication {
+            artifactId = "spotify-api-kotlin-js"
+            setupPom(artifactId)
+        }
+
         browser {
             dceTask {
                 keep("ktor-ktor-io.\$\$importsForInline\$\$.ktor-ktor-io.io.ktor.utils.io")
@@ -88,7 +153,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 +188,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")
             }
@@ -133,145 +223,71 @@ kotlin {
 
 publishing {
     publications {
-        val jvm by getting(MavenPublication::class) {
-            artifactId = "spotify-api-kotlin"
-            artifact(tasks.getByName("javadocJar"))
-            versionMapping {
-                usage("java-api") {
-                    fromResolutionOf("runtimeClasspath")
-                }
-                usage("java-runtime") {
-                    fromResolutionResult()
-                }
-            }
+        val kotlinMultiplatform by getting(MavenPublication::class) {
+            artifactId = "spotify-api-kotlin-core"
+            setupPom(artifactId)
+        }
 
-            pom {
-                name.set("spotify-api-kotlin")
-                description.set("A Kotlin wrapper for the Spotify Web API.")
-                url.set("https://github.com/adamint/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")
-                }
-                licenses {
-                    license {
-                        name.set("The Apache Software License, Version 2.0")
-                        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                        distribution.set("repo")
-                    }
-                }
-                developers {
-                    developer {
-                        id.set("adamratzman")
-                        name.set("Adam Ratzman")
-                        email.set("[email protected]")
-                    }
-                }
-            }
+        val metadata by getting(MavenPublication::class) {
+            artifactId = "spotify-api-kotlin-metadata"
+            setupPom(artifactId)
         }
     }
+
     repositories {
-        if (System.getenv("publishLocation") == "nexus") {
-            maven {
-                name = "nexus"
-                val releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                val snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-                url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
-
-                credentials {
-                    val nexusUsername: String? by project.extra
-                    val nexusPassword: String? by project.extra
-                    username = nexusUsername
-                    password = nexusPassword
-                }
-            }
-        } else {
-            if (project.extra.has("spaceUser") && project.extra.has("spacePassword")) {
-                maven {
-                    credentials {
-                        username = project.extra["spaceUser"]?.toString()
-                        password = project.extra["spacePassword"]?.toString()
-                    }
-
-                    url = URI.create("https://maven.jetbrains.space/adam/ratzman")
-                }
+        maven {
+            name = "nexus"
+            val releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            val snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+            url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
+
+            credentials {
+                val nexusUsername: String? by project.extra
+                val nexusPassword: String? by project.extra
+                username = nexusUsername
+                password = nexusPassword
             }
         }
     }
 }
 
 signing {
-    if (System.getenv("publishLocation") == "nexus") {
-        sign(publishing.publications["jvm"])
-        sign(publishing.publications["js"])
-    }
-}
-
-// get signing confs interactively if needed
-gradle.taskGraph.whenReady {
-    val alreadyConfigured = with(project.extra) {
-        (has("signing.keyId") && has("signing.secretKeyRingFile") && has("signing.password"))
-                || (has("signing.notNeeded") && get("signing.notNeeded") == "true")
-    }
-    if (!alreadyConfigured && allTasks.any { it is Sign }) {
-        // Use Java's console to read from the console (no good for
-        // a CI environment)
-        val console = System.console()
-        requireNotNull(console) { "Could not get signing config: please provide yours in the gradle.properties file." }
-        console.printf(
-                "\n\nWe have to sign some things in this build." +
-                        "\n\nPlease enter your signing details.\n\n"
-        )
-
-        val id = console.readLine("PGP Key Id: ")
-        val file = console.readLine("PGP Secret Key Ring File (absolute path): ")
-        val password = console.readPassword("PGP Private Key Password: ")
-
-        allprojects {
-            project.extra["signing.keyId"] = id
-            project.extra["signing.secretKeyRingFile"] = file
-            project.extra["signing.password"] = password
-        }
-
-        console.printf("\nThanks.\n\n")
-    }
+    sign(publishing.publications)
 }
 
 tasks {
     val dokka by getting(DokkaTask::class) {
-        outputDirectory = "docs/docs"
         outputFormat = "html"
+        outputDirectory = "$buildDir/javadoc"
 
         multiplatform {
             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"
                 }
 
@@ -285,15 +301,11 @@ tasks {
         }
     }
 
-    val javadocJar by getting(Jar::class) {
-        dependsOn.add(javadoc)
-        archiveClassifier.set("javadoc")
-        from(javadoc)
-    }
-
-    artifacts {
-        archives(javadocJar)
-    }
+    /* val javadocJar by getting(Jar::class) {
+         dependsOn.add(javadoc)
+         archiveClassifier.set("javadoc")
+         from(javadoc)
+     }*/
 
     spotless {
         kotlin {
@@ -318,4 +330,36 @@ tasks {
         dependsOn.add(dokka)
         dependsOn.add("publishJvmPublicationToNexusRepository")
     }
+
+}
+
+
+fun MavenPublication.setupPom(publicationName: String) {
+    artifact(dokkaJar.get())
+
+    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")
+        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")
+        }
+        licenses {
+            license {
+                name.set("The Apache Software License, Version 2.0")
+                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                distribution.set("repo")
+            }
+        }
+        developers {
+            developer {
+                id.set("adamratzman")
+                name.set("Adam Ratzman")
+                email.set("[email protected]")
+            }
+        }
+    }
 }