Merge pull request #243 from adamint/dev

fallback to gradle properties if env variables are not found

Author: adamint

build.gradle.kts

@@ -200,8 +200,8 @@ kotlin {
                 url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
 
                 credentials {
-                    val nexusUsername: String? = System.getenv("nexus.username")
-                    val nexusPassword: String? = System.getenv("nexus.password")
+                    val nexusUsername: String? = System.getenv("nexus.username") ?: project.extra["nexusUsername"] as? String
+                    val nexusPassword: String? = System.getenv("nexus.password") ?: project.extra["nexusPassword"] as? String
                     username = nexusUsername
                     password = nexusPassword
                 }

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

@@ -10,9 +10,8 @@ import com.adamratzman.spotify.models.ErrorResponse
 import com.adamratzman.spotify.models.serialization.toObject
 import com.adamratzman.spotify.utils.ConcurrentHashMap
 import com.adamratzman.spotify.utils.getCurrentTimeMs
-import kotlinx.coroutines.CancellationException
 import kotlin.math.ceil
-import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.withTimeout
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient

src/commonMain/kotlin/com.adamratzman.spotify/models/PagingObjects.kt

@@ -5,8 +5,8 @@ import com.adamratzman.spotify.GenericSpotifyApi
 import com.adamratzman.spotify.annotations.SpotifyExperimentalHttpApi
 import com.adamratzman.spotify.models.PagingTraversalType.BACKWARDS
 import com.adamratzman.spotify.models.PagingTraversalType.FORWARDS
-import com.adamratzman.spotify.models.serialization.instantiateLateinitsForPagingObject
 import com.adamratzman.spotify.models.serialization.instantiateAllNeedsApiObjects
+import com.adamratzman.spotify.models.serialization.instantiateLateinitsForPagingObject
 import com.adamratzman.spotify.models.serialization.toCursorBasedPagingObject
 import com.adamratzman.spotify.models.serialization.toNonNullablePagingObject
 import kotlin.coroutines.CoroutineContext

src/commonMain/kotlin/com.adamratzman.spotify/models/serialization/SerializationUtils.kt

@@ -9,13 +9,13 @@ import com.adamratzman.spotify.models.NullablePagingObject
 import com.adamratzman.spotify.models.PagingObject
 import com.adamratzman.spotify.models.PagingObjectBase
 import com.adamratzman.spotify.models.instantiateLateinitsIfPagingObjects
+import kotlin.reflect.KClass
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.MapSerializer
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
-import kotlin.reflect.KClass
 
 internal val nonstrictJson =
     Json {
@@ -219,4 +219,4 @@ internal fun <T : Any, Z : PagingObjectBase<T, Z>> PagingObjectBase<T, Z>.instan
     getMembersThatNeedApiInstantiation().instantiateAllNeedsApiObjects(api)
     this.api = api
     this.itemClazz = tClazz
-}
+}