abstract desktop logic into desktop source set

Signed-off-by: Adam Ratzman <[email protected]>

Author: adamint

build.gradle.kts

@@ -6,12 +6,12 @@ plugins {
     `maven-publish`
     signing
     id("io.codearte.nexus-staging") version "0.22.0"
+    id("com.android.library")
     kotlin("multiplatform") version "1.4.21"
     kotlin("plugin.serialization") version "1.4.21"
     id("com.diffplug.gradle.spotless") version "4.4.0"
     id("com.moowork.node") version "1.3.1"
     id("org.jetbrains.dokka") version "1.4.20"
-    id("com.android.library")
     id("kotlin-android-extensions")
 }
 
@@ -148,13 +148,10 @@ kotlin {
 
     val hostOs = System.getProperty("os.name")
     val isMingwX64 = hostOs.startsWith("Windows")
-    val nativeTarget = when {
-        hostOs == "Mac OS X" -> macosX64("native")
-        hostOs == "Linux" -> linuxX64("native")
-        isMingwX64 -> mingwX64("native")
-        else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
-    }
 
+    macosX64()
+    linuxX64()
+    mingwX64()
 
     targets {
         sourceSets {
@@ -169,9 +166,9 @@ kotlin {
                     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion")
                     implementation("io.ktor:ktor-client-core:$ktorVersion")
                     implementation("org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDatetimeVersion")
-                    implementation("com.autodesk:coroutineworker:0.6.2")
                 }
             }
+
             val commonTest by getting {
                 dependencies {
                     implementation(kotlin("test-common"))
@@ -234,17 +231,44 @@ kotlin {
                 }
             }
 
-            val nativeMain by getting {
+            val desktopMain by creating {
+                dependsOn(commonMain)
+
                 dependencies {
                     implementation("io.ktor:ktor-client-curl:$ktorVersion")
                 }
             }
-            val nativeTest by getting {
+
+            val desktopTest by creating {
                 dependencies {
 
                 }
             }
 
+            val linuxX64Main by getting {
+                dependsOn(desktopMain)
+            }
+
+            val linuxX64Test by getting {
+                dependsOn(desktopTest)
+            }
+
+            val mingwX64Main by getting {
+                dependsOn(desktopMain)
+            }
+
+            val mingwX64Test by getting {
+                dependsOn(desktopTest)
+            }
+
+            val macosX64Main by getting {
+                dependsOn(desktopMain)
+            }
+
+            val macosX64Test by getting {
+                dependsOn(desktopTest)
+            }
+
             all {
                 languageSettings.useExperimentalAnnotation("kotlin.Experimental")
             }
@@ -259,10 +283,10 @@ publishing {
             setupPom(artifactId)
         }
 
-        val metadata by getting(MavenPublication::class) {
+        /*val metadata by getting(MavenPublication::class) {
             artifactId = "spotify-api-kotlin-metadata"
             setupPom(artifactId)
-        }
+        }*/
     }
 
     repositories {

gradle.properties

@@ -1,3 +1,5 @@
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx4000m
+org.gradle.jvmargs=-Xmx8000m
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.native.enableDependencyPropagation=false

settings.gradle.kts

@@ -28,5 +28,5 @@ pluginManagement {
     }
 }
 
-rootProject.name = "spotify-web-api-kotlin"
+rootProject.name = "spotify-api-kotlin"
 

src/nativeMain/kotlin/com/adamratzman/spotify/Pkce.kt renamed to src/desktopMain/kotlin/com/adamratzman/spotify/Pkce.kt

@@ -1,14 +1,14 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.utils
 
-import platform.posix.__sFILE
-
-public actual typealias File = __sFILE
+public actual typealias File = String
 
 internal actual fun convertFileToBufferedImage(file: File): BufferedImage = file
 internal actual fun convertUrlPathToBufferedImage(url: String): BufferedImage =
-        throw NotImplementedError("Images not implemented yet.")
+    throw NotImplementedError("Images not implemented yet.")
+
 internal actual fun convertLocalImagePathToBufferedImage(path: String): BufferedImage =
-        throw NotImplementedError("Images not implemented yet.")
+    throw NotImplementedError("Images not implemented yet.")
+
 internal actual fun encodeBufferedImageToBase64String(image: BufferedImage): String =
-        throw NotImplementedError("Images not implemented yet.")
+    throw NotImplementedError("Images not implemented yet.")