Merge pull request #287 from adamint/dev

circleci

Author: adamint

.circleci/config.yml

@@ -0,0 +1,80 @@
+# Java Gradle CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-java/ for more details
+#
+version: 2
+orbs:
+  gradle: circleci/[email protected]
+  win: circleci/[email protected]
+jobs:
+  test_linux:
+    docker:
+      - image: mingc/android-build-box
+    working_directory: ~/repo
+    environment:
+      JVM_OPTS: -Xmx3200m
+      TERM: dumb
+
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "build.gradle.kts" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+      - run: gradle dependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: v1-dependencies-{{ checksum "build.gradle.kts" }}
+      - run: gradle linuxX64Test
+  test_js:
+    docker:
+      - image: mingc/android-build-box
+    working_directory: ~/repo
+    environment:
+      JVM_OPTS: -Xmx3200m
+      TERM: dumb
+
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "build.gradle.kts" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+      - run: gradle dependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: v1-dependencies-{{ checksum "build.gradle.kts" }}
+      - run: gradle jsIrTest jsLegacyTest
+  test_jvm:
+    docker:
+      - image: circleci/openjdk:11-jdk
+    working_directory: ~/repo
+    environment:
+      JVM_OPTS: -Xmx3200m
+      TERM: dumb
+
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "build.gradle.kts" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+      - run: gradle dependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: v1-dependencies-{{ checksum "build.gradle.kts" }}
+      - run: gradle jvmTest
+
+workflows:
+ version: 2
+ run_tests:
+   jobs:
+     - test_jvm
+     - test_js
+     - test_linux

build.gradle.kts

@@ -5,21 +5,20 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput.Target
 
 plugins {
     id("lt.petuska.npm.publish") version "1.1.2"
-    kotlin("multiplatform") version "1.5.0"
+    kotlin("multiplatform") version "1.5.21"
     `maven-publish`
     signing
     id("io.codearte.nexus-staging") version "0.30.0"
     id("com.android.library")
-    kotlin("plugin.serialization") version "1.5.0"
-    id("com.diffplug.spotless") version "5.12.4"
+    kotlin("plugin.serialization") version "1.5.21"
+    id("com.diffplug.spotless") version "5.14.2"
     id("com.moowork.node") version "1.3.1"
     id("org.jetbrains.dokka") version "1.4.30"
     id("kotlin-android-extensions")
 }
 
 repositories {
     google()
-    maven("https://kotlin.bintray.com/kotlinx")
     mavenCentral()
 }
 
@@ -29,8 +28,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.4")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0")
+        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
     }
 }
 
@@ -60,8 +59,6 @@ android {
         minSdkVersion(15)
         targetSdkVersion(30)
         compileSdkVersion(30)
-        versionCode = 1
-        versionName = "1.0"
         testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -124,7 +121,7 @@ kotlin {
     }
 
     val irOnlyJs = project.hasProperty("irOnly")
-    js(if (irOnlyJs) KotlinJsCompilerType.IR else KotlinJsCompilerType.BOTH) {
+    js(if (irOnlyJs) KotlinJsCompilerType.IR else KotlinJsCompilerType.LEGACY) {
 
         mavenPublication {
             setupPom(artifactId)
@@ -216,14 +213,14 @@ kotlin {
 
     targets {
         sourceSets {
-            val serializationVersion = "1.2.0"
-            val ktorVersion = "1.5.4"
-            val korlibsVersion = "2.0.7"
+            val serializationVersion = "1.2.2"
+            val ktorVersion = "1.6.2"
+            val korlibsVersion = "2.2.0"
             val sparkVersion = "2.9.3"
             val androidSpotifyAuthVersion = "1.2.3"
-            val androidCryptoVersion = "1.1.0-alpha03"
-            val coroutineMTVersion = "1.4.3-native-mt"
-            val kotlinxDatetimeVersion = "0.2.0"
+            val androidCryptoVersion = "1.0.0"
+            val coroutineMTVersion = "1.5.1-native-mt"
+            val kotlinxDatetimeVersion = "0.2.1"
 
             val commonMain by getting {
                 dependencies {
@@ -255,7 +252,6 @@ kotlin {
                 dependsOn(commonJvmLikeMain)
                 repositories {
                     mavenCentral()
-                    jcenter()
                 }
 
                 dependencies {
@@ -293,15 +289,14 @@ kotlin {
 
                 repositories {
                     mavenCentral()
-                    jcenter()
                 }
 
                 dependencies {
                     api("com.spotify.android:auth:$androidSpotifyAuthVersion")
                     implementation("com.pnikosis:materialish-progress:1.7")
                     implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
                     implementation("androidx.security:security-crypto:$androidCryptoVersion")
-                    implementation("androidx.appcompat:appcompat:1.2.0")
+                    implementation("androidx.appcompat:appcompat:1.3.1")
                 }
             }
 
@@ -420,7 +415,6 @@ npmPublishing {
         repository("npmjs") {
             registry = uri("https://registry.npmjs.org")
             (project.properties.get("npmauthtoken") as? String)?.let { authToken = it }
-            println("auth token: $authToken")
         }
     }
 }
@@ -433,7 +427,6 @@ tasks {
             repository("npmjs") {
                 registry = uri("https://registry.npmjs.org")
                 (project.properties.get("npmauthtoken") as? String)?.let { authToken = it }
-                println("auth token: $authToken")
             }
         }
 

gradle.properties

@@ -1,6 +1,21 @@
+## For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Mon Aug 09 00:44:27 PDT 2021
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 org.gradle.daemon=true
+kotlin.js.generate.externals=true
 org.gradle.jvmargs=-Xmx8000m
-kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
-kotlin.js.generate.externals=true
+android.useAndroidX=true
+android.enableJetifier=true
+kotlin.mpp.enableGranularSourceSetsMetadata=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -21,7 +21,6 @@ pluginManagement {
 
     repositories {
         mavenCentral()
-        jcenter()
         gradlePluginPortal()
         google()
         maven { url = java.net.URI("https://plugins.gradle.org/m2/") }

src/commonMain/kotlin/com.adamratzman.spotify/SpotifyRestAction.kt

@@ -4,6 +4,7 @@ package com.adamratzman.spotify
 import com.adamratzman.spotify.utils.TimeUnit
 import com.adamratzman.spotify.utils.getCurrentTimeMs
 import com.adamratzman.spotify.utils.runBlockingOnJvmAndNative
+import com.soywiz.korio.async.runBlockingNoJs
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException

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

@@ -61,7 +61,7 @@ public abstract class SpotifyEndpoint(public val api: GenericSpotifyApi) {
     }
 
     internal suspend fun get(url: String): String {
-        return execute(url)
+        return execute(url).apply { println("body: $url") }
     }
 
     internal suspend fun post(url: String, body: String? = null, contentType: String? = null): String {

src/commonTest/kotlin/com.adamratzman/spotify/Common.kt

@@ -1,7 +1,6 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify
 
-import kotlin.coroutines.CoroutineContext
 import kotlin.native.concurrent.ThreadLocal
 import kotlin.test.assertTrue
 import kotlinx.coroutines.CoroutineScope
@@ -13,7 +12,6 @@ val tokenString = getEnvironmentVariable("SPOTIFY_TOKEN_STRING")
 
 // https://github.com/Kotlin/kotlinx.coroutines/issues/1996#issuecomment-728562784
 expect fun runBlockingTest(block: suspend CoroutineScope.() -> Unit)
-expect val testCoroutineContext: CoroutineContext
 
 @ThreadLocal
 var instantiationCompleted: Boolean = false
@@ -47,6 +45,33 @@ suspend fun buildSpotifyApi() = when {
     else -> null.also { instantiationCompleted = true }
 }
 
+fun buildSpotifyApiSync() = when {
+    tokenString?.isNotBlank() == true -> {
+        spotifyClientApi {
+            credentials {
+                clientId = com.adamratzman.spotify.clientId
+                clientSecret = com.adamratzman.spotify.clientSecret
+                redirectUri = com.adamratzman.spotify.redirectUri
+            }
+            authorization {
+                tokenString = com.adamratzman.spotify.tokenString
+            }
+        }.buildRestAction().complete().also { instantiationCompleted = true; apiBacking = it }
+    }
+    clientId?.isNotBlank() == true -> {
+        spotifyAppApi {
+            credentials {
+                clientId = com.adamratzman.spotify.clientId
+                clientSecret = com.adamratzman.spotify.clientSecret
+            }
+        }.buildRestAction().complete().also {
+            instantiationCompleted = true; apiBacking = it
+        }
+    }
+    else -> null.also { instantiationCompleted = true }
+}
+
+
 expect fun getEnvironmentVariable(name: String): String?
 
 expect fun Exception.stackTrace()

src/commonTest/kotlin/com.adamratzman/spotify/TestUtilities.kt

@@ -4,15 +4,30 @@ package com.adamratzman.spotify
 abstract class AbstractTest<T : GenericSpotifyApi> {
     var api: T? = null
 
-    suspend fun build(): Boolean {
+    fun testPrereq() = api != null
+
+    suspend inline fun <reified Z : T> build(): Boolean {
         return try {
+            val f = buildSpotifyApi()
             @Suppress("UNCHECKED_CAST")
-            (buildSpotifyApi() as? T)?.let { api = it }
+            (f as? T)?.let { if (f is Z) api = it }
+            api != null
+        } catch (cce: Exception) {
+            println("here")
+            false
+        }
+    }
+
+    fun buildSync(): Boolean {
+        return try {
+            @Suppress("UNCHECKED_CAST")
+            (buildSpotifyApiSync() as? T)?.let { api = it }
             api != null
         } catch (cce: ClassCastException) {
             false
         }
     }
+
 }
 
 typealias GenericSpotifyApiTest = AbstractTest<GenericSpotifyApi>

src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientEpisodeApiTest.kt

@@ -1,49 +1,41 @@
 /* Spotify Web API, Kotlin Wrapper; MIT License, 2017-2021; Original author: Adam Ratzman */
 package com.adamratzman.spotify.priv
 
+import com.adamratzman.spotify.AbstractTest
 import com.adamratzman.spotify.SpotifyClientApi
 import com.adamratzman.spotify.SpotifyException.BadRequestException
-import com.adamratzman.spotify.assertFailsWithSuspend
-import com.adamratzman.spotify.buildSpotifyApi
 import com.adamratzman.spotify.runBlockingTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
-class ClientEpisodeApiTest {
-    var api: SpotifyClientApi? = null
-
-    init {
-        runBlockingTest {
-            (buildSpotifyApi() as? SpotifyClientApi)?.let { api = it }
-        }
-    }
-
-    fun testPrereq() = api != null
-
+class ClientEpisodeApiTest : AbstractTest<SpotifyClientApi>() {
     @Test
     fun testGetEpisode() {
-        runBlockingTest {
+        return runBlockingTest {
+            super.build<SpotifyClientApi>()
             if (!testPrereq()) return@runBlockingTest else api
 
             assertNull(api!!.episodes.getEpisode("nonexistant episode"))
-            assertNotNull(api!!.episodes.getEpisode("4IhgnOc8rwMW70agMWVVfh"))
+            assertNotNull(api!!.episodes.getEpisode("3lMZTE81Pbrp0U12WZe27l"))
         }
     }
 
     @Test
     fun testGetEpisodes() {
-        runBlockingTest {
+        return runBlockingTest {
+            super.build<SpotifyClientApi>()
             if (!testPrereq()) return@runBlockingTest else api!!
 
-            assertFailsWithSuspend<BadRequestException> { api!!.episodes.getEpisodes("hi", "dad") }
-            assertFailsWithSuspend<BadRequestException> {
+            assertFailsWith<BadRequestException> { api!!.episodes.getEpisodes("hi", "dad") }
+            assertFailsWith<BadRequestException> {
                 api!!.episodes.getEpisodes("1cfOhXP4GQCd5ZFHoSF8gg", "j").map { it?.name }
             }
             assertEquals(
-                listOf("The 'Murder Hornets' And The Honey Bees"),
-                api!!.episodes.getEpisodes("4IhgnOc8rwMW70agMWVVfh").map { it?.name }
+                listOf("The Great Inflation (Classic)"),
+                api!!.episodes.getEpisodes("3lMZTE81Pbrp0U12WZe27l").map { it?.name }
             )
         }
     }