prep for android

Author: adamint

build.gradle.kts

@@ -7,8 +7,8 @@ plugins {
     signing
     `java-library`
     id("io.codearte.nexus-staging") version "0.21.2"
-    kotlin("multiplatform") version "1.3.61"
-    kotlin("plugin.serialization") version "1.3.61"
+    kotlin("multiplatform") version "1.3.71"
+    kotlin("plugin.serialization") version "1.3.71"
     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"
@@ -44,6 +44,7 @@ kotlin {
             val serializationVersion = "0.14.0"
             val spekVersion = "2.0.9"
             val ktorVersion = "1.3.0-rc2"
+            val kotlinVersion = "1.3.71"
 
             val commonMain by getting {
                 dependencies {
@@ -72,6 +73,7 @@ kotlin {
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serializationVersion")
                     implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
                     implementation(kotlin("stdlib-jdk8"))
+
                 }
             }
 
@@ -102,6 +104,15 @@ kotlin {
                 }
             }
 
+
+           /* val androidMain by getting {
+                dependsOn(commonJvmMain)
+            }
+
+            val androidTest by getting {
+                dependsOn(commonJvmTest)
+            }*/
+
             all {
                 languageSettings.useExperimentalAnnotation("kotlin.Experimental")
             }

settings.gradle

@@ -10,12 +10,16 @@ pluginManagement {
             if (requested.id.id == "kotlinx-serialization") {
                 useModule("org.jetbrains.kotlin:kotlin-serialization:$mainKotlinVersion")
             }
+            if (requested.id.id == "com.android.library") {
+                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
+            }
         }
     }
 
     repositories {
         mavenCentral()
         jcenter()
+        google()
         maven { url 'https://plugins.gradle.org/m2/' }
     }
 }

src/commonMain/kotlin/com.adamratzman.spotify/annotations/ExperimentalAnnotations.kt

@@ -1,12 +1,10 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2020; Original author: Adam Ratzman */
 package com.adamratzman.spotify.annotations
 
-@Experimental
 @Retention(AnnotationRetention.BINARY)
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 annotation class SpotifyExperimentalHttpApi
 
-@Experimental
 @Retention(AnnotationRetention.BINARY)
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 annotation class SpotifyExperimentalFunctionApi

src/jvmMain/kotlin/com/adamratzman/spotify/utils/IO.kt

@@ -4,13 +4,12 @@ package com.adamratzman.spotify.utils
 import java.io.ByteArrayOutputStream
 import java.net.URL
 import javax.imageio.ImageIO
-import javax.xml.bind.DatatypeConverter
 
 internal actual fun encodeBufferedImageToBase64String(image: BufferedImage): String {
     val bos = ByteArrayOutputStream()
     ImageIO.write(image, "jpg", bos)
     bos.close()
-    return DatatypeConverter.printBase64Binary(bos.toByteArray())
+    return javax.xml.bind.DatatypeConverter.printBase64Binary(bos.toByteArray())
 }
 
 internal actual fun convertFileToBufferedImage(file: File): BufferedImage = ImageIO.read(file)