Merge pull request #328 from adamint/dev/adamint/update-gradle-deps

update gradle/dependencies

Author: adamint

.github/workflows/ci-client.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Install curl
         run: sudo apt-get install -y curl libcurl4-openssl-dev
       - name: Verify Android

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '17'
     - name: Install curl
       run: sudo apt-get install -y curl libcurl4-openssl-dev
     - name: Test android

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Install curl
         run: sudo apt-get install -y curl libcurl4-openssl-dev
       - name: Verify Android
@@ -58,7 +58,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Publish macOS/iOS
         run: ./gradlew publishMacosX64PublicationToNexusRepository publishIosX64PublicationToNexusRepository publishIosArm64PublicationToNexusRepository
   release_windows:
@@ -72,7 +72,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - run: choco install curl
       - name: Publish windows
         run: ./gradlew publishMingwX64PublicationToNexusRepository
@@ -86,7 +86,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
       - name: Build docs
         run: ./gradlew dokkaHtml
       - name: Push docs to docs repo

build.gradle.kts

@@ -12,9 +12,9 @@ plugins {
     signing
     id("com.android.library")
     kotlin("plugin.serialization")
-    id("com.diffplug.spotless") version "6.11.0"
+    id("com.diffplug.spotless") version "6.21.0"
     id("com.moowork.node") version "1.3.1"
-    id("org.jetbrains.dokka") version "1.8.20"
+    id("org.jetbrains.dokka") version "1.9.0"
 }
 
 repositories {
@@ -45,17 +45,18 @@ version = libraryVersion
 
 
 android {
+    namespace = "com.adamratzman.spotify"
     compileSdk = 30
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
-    packagingOptions {
+    packaging {
         resources.excludes.add("META-INF/*.md") // needed to prevent android compilation errors
     }
     defaultConfig {
         minSdk = 23
-        targetSdk = 30
+        targetSdk = 31
         setCompileSdkVersion(30)
         testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -82,9 +83,10 @@ val dokkaJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
 
 kotlin {
     explicitApiWarning()
+    jvmToolchain(17)
 
     androidTarget {
-        compilations.all { kotlinOptions.jvmTarget = "1.8" }
+        compilations.all { kotlinOptions.jvmTarget = "17" }
 
         mavenPublication { setupPom(artifactId) }
 

gradle.properties

@@ -6,21 +6,20 @@ org.gradle.jvmargs=-Xmx8000m
 # android target settings
 android.useAndroidX=true
 android.enableJetifier=true
-android.disableAutomaticComponentCreation=false
 
 # language dependencies
-kotlinVersion=1.9.0
+kotlinVersion=1.9.10
 
 # library dependencies
-kotlinxDatetimeVersion=0.4.0
-kotlinxSerializationVersion=1.5.1
-ktorVersion=2.1.3
+kotlinxDatetimeVersion=0.4.1
+kotlinxSerializationVersion=1.6.0
+ktorVersion=2.3.4
 korlibsVersion=3.4.0
-kotlinxCoroutinesVersion=1.7.2
+kotlinxCoroutinesVersion=1.7.3
 
-androidBuildToolsVersion=7.2.0
-androidSpotifyAuthVersion=1.2.5
+androidBuildToolsVersion=8.1.0
+androidSpotifyAuthVersion=2.1.0
 androidCryptoVersion=1.0.0
-androidxCompatVersion=1.5.1
+androidxCompatVersion=1.6.1
 
 sparkVersion=2.9.4

gradle/wrapper/gradle-wrapper.properties

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

src/androidMain/kotlin/com/adamratzman/spotify/auth/pkce/AbstractSpotifyPkceLoginActivity.kt

@@ -53,7 +53,7 @@ public abstract class AbstractSpotifyPkceLoginActivity : AppCompatActivity() {
      * Custom logic to invoke when loading begins ([isLoading] is true) or ends ([isLoading] is false).
      * You can update the view here.
      */
-    public open fun setLoadingContent(isLoading: Boolean) = {}
+    public open fun setLoadingContent(isLoading: Boolean): () -> Unit = {}
 
     private lateinit var authorizationIntent: Intent
     private lateinit var credentialStore: SpotifyDefaultCredentialStore

src/commonJvmLikeTest/kotlin/com/adamratzman/spotify/CommonImpl.kt

@@ -38,7 +38,6 @@ private suspend fun buildSpotifyApiInternal(): GenericSpotifyApi? {
 
     val optionsCreator: (SpotifyApiOptions.() -> Unit) = {
         this.enableDebugMode = logHttp
-        this.enableLogger = logHttp
     }
 
     return when {

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

@@ -663,12 +663,6 @@ public class SpotifyApiBuilder(
     public fun retryWhenRateLimited(retryWhenRateLimited: Boolean): SpotifyApiBuilder =
         apply { this.options.retryWhenRateLimited = retryWhenRateLimited }
 
-    /**
-     * Set whether to enable to the exception logger
-     */
-    public fun enableLogger(enableLogger: Boolean): SpotifyApiBuilder =
-        apply { this.options.enableLogger = enableLogger }
-
     /**
      * Set the maximum time, in milliseconds, before terminating an http request
      */
@@ -1133,7 +1127,6 @@ public class SpotifyUserAuthorization(
  * @param cacheLimit The maximum amount of cached requests allowed at one time. Null means no limit
  * @param automaticRefresh Enable or disable automatic refresh of the Spotify access token
  * @param retryWhenRateLimited Set whether to block the current thread and wait until the API can retry the request
- * @param enableLogger Set whether to enable to the exception logger
  * @param testTokenValidity After API creation, test whether the token is valid by performing a lightweight request
  * @param defaultLimit The default amount of objects to retrieve in one request
  * @param json The Json serializer/deserializer instance
@@ -1155,7 +1148,6 @@ public data class SpotifyApiOptions(
     public var cacheLimit: Int? = 200,
     public var automaticRefresh: Boolean = true,
     public var retryWhenRateLimited: Boolean = true,
-    public var enableLogger: Boolean = true,
     public var testTokenValidity: Boolean = false,
     public var defaultLimit: Int = 50,
     public var allowBulkRequests: Boolean = true,

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

@@ -243,13 +243,16 @@ public class HttpRequest constructor(
     }
 
     override fun toString(): String {
-        return """HttpConnection  (
+        // we don't want to print this sensitive information
+        val headersWithoutAuthorization = headers.filter { it.key != "Authorization" }
+        val hasAuthorizationHeader = headersWithoutAuthorization.size != headers.size
+        return """HttpConnection(
             |url=$url,
             |method=$method,
             |body=${bodyString ?: bodyMap},
             |contentType=$contentType,
-            |headers=${headers.toList()}
-            |  )
+            |headers=${headersWithoutAuthorization.toList()}
+            |${if (hasAuthorizationHeader) "The authorization header was hidden." else "There was no authorization header."})
         """.trimMargin()
     }