replace base64 w/datatypeconverter in jvm

Author: adamint

build.gradle.kts

@@ -31,6 +31,7 @@ tasks.withType<Test> {
 repositories {
     mavenCentral()
     jcenter()
+    google()
     maven("https://kotlin.bintray.com/kotlinx")
 }
 
@@ -44,7 +45,6 @@ kotlin {
             val serializationVersion = "0.20.0"
             val spekVersion = "2.0.9"
             val ktorVersion = "1.3.0-rc2"
-            val kotlinVersion = "1.3.71"
 
             val commonMain by getting {
                 dependencies {
@@ -72,8 +72,8 @@ kotlin {
                     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutineVersion")
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serializationVersion")
                     implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
+                    implementation("jakarta.xml.bind:jakarta.xml.bind-api:2.3.3")
                     implementation(kotlin("stdlib-jdk8"))
-
                 }
             }
 
@@ -105,13 +105,13 @@ kotlin {
             }
 
 
-           /* val androidMain by getting {
-                dependsOn(commonJvmMain)
-            }
+            /* val androidMain by getting {
+                 dependsOn(commonJvmMain)
+             }
 
-            val androidTest by getting {
-                dependsOn(commonJvmTest)
-            }*/
+             val androidTest by getting {
+                 dependsOn(commonJvmTest)
+             }*/
 
             all {
                 languageSettings.useExperimentalAnnotation("kotlin.Experimental")

settings.gradle

@@ -1,4 +1,6 @@
 pluginManagement {
+    def mainKotlinVersion = "1.3.71"
+
     resolutionStrategy {
         eachPlugin {
             if (requested.id.id == "kotlin-multiplatform") {
@@ -10,9 +12,11 @@ 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}")
+            if (requested.id.id == "com.android.library" || requested.id.id == "kotlin-android-extensions"
+                    || requested.id.id == "kotlin-android") {
+                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:$mainKotlinVersion")
             }
+
         }
     }
 

src/jvmMain/kotlin/com/adamratzman/spotify/http/Endpoints.kt

@@ -2,9 +2,9 @@
 package com.adamratzman.spotify.http
 
 import java.net.URLEncoder
-import java.util.Base64
+import javax.xml.bind.DatatypeConverter
 
 internal actual fun String.encodeUrl() = URLEncoder.encode(this, "UTF-8")!!
 internal actual fun String.base64ByteEncode(): String {
-    return String(Base64.getEncoder().encode(toByteArray()))
+    return DatatypeConverter.printBase64Binary(toByteArray())
 }

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

@@ -4,12 +4,13 @@ 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 javax.xml.bind.DatatypeConverter.printBase64Binary(bos.toByteArray())
+    return DatatypeConverter.printBase64Binary(bos.toByteArray())
 }
 
 internal actual fun convertFileToBufferedImage(file: File): BufferedImage = ImageIO.read(file)