Update kotlin and deps (#236)

Author: itaihanski

descopesdk/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -7,16 +9,22 @@ plugins {
 
 android {
     namespace = "com.descope"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 24
-        targetSdk = 35
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
 
+    testOptions {
+        targetSdk = 36
+    }
+
+    lint {
+        targetSdk = 36
+    }
+
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -27,9 +35,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
 
     publishing {
         singleVariant("release") {
@@ -39,6 +44,10 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
+}
+
 dependencies {
     implementation(descopeLibs.kotlinx.coroutines.android)
     implementation(descopeLibs.androidx.lifecycle.common)

descopesdk/src/main/java/com/descope/Descope.kt

@@ -1,4 +1,4 @@
-@file:Suppress("MemberVisibilityCanBePrivate", "unused")
+@file:Suppress("MemberVisibilityCanBePrivate", "unused", "DEPRECATION")
 
 package com.descope
 

descopesdk/src/main/java/com/descope/android/DescopeFlow.kt

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package com.descope.android
 
 import android.content.Context

descopesdk/src/main/java/com/descope/android/DescopeFlowCoordinator.kt

@@ -642,7 +642,7 @@ internal fun findJwtInCookies(cookieString: String?, name: String): String? {
         cookieString?.split("; ")?.forEach {
             try {
                 addAll(HttpCookie.parse(it))
-            } catch (ignored: Exception) {
+            } catch (_: Exception) {
             }
         }
     }
@@ -651,7 +651,7 @@ internal fun findJwtInCookies(cookieString: String?, name: String): String? {
         .mapNotNull { httpCookie -> // parse token
             try {
                 Token(httpCookie.value)
-            } catch (e: Exception) {
+            } catch (_: Exception) {
                 null
             }
         }
@@ -663,7 +663,7 @@ internal fun findJwtInCookies(cookieString: String?, name: String): String? {
 private fun String.toUri(): Uri? {
     return try {
         Uri.parse(this)
-    } catch (ignored: Exception) {
+    } catch (_: Exception) {
         null
     }
 }

descopesdk/src/main/java/com/descope/android/DescopeFlowHook.kt

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package com.descope.android
 
 import android.webkit.WebView

descopesdk/src/main/java/com/descope/android/DescopeFlowView.kt

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package com.descope.android
 
 import android.content.Context
@@ -157,7 +159,7 @@ class DescopeFlowView : ViewGroup {
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
         for (i in 0 until childCount) {
             val child = getChildAt(i)
-            child.layout(0, 0, width, height);
+            child.layout(0, 0, width, height)
         }
     }
 

descopesdk/src/main/java/com/descope/android/Utils.kt

@@ -3,12 +3,13 @@ package com.descope.android
 import android.content.Context
 import android.net.Uri
 import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.net.toUri
 import com.descope.internal.others.activityHelper
 
 // Custom Tab
 
 fun launchCustomTab(context: Context, url: String, customTabsIntent: CustomTabsIntent? = null) {
-    launchCustomTab(context, Uri.parse(url), customTabsIntent)
+    launchCustomTab(context, url.toUri(), customTabsIntent)
 }
 
 fun launchCustomTab(context: Context, uri: Uri, customTabsIntent: CustomTabsIntent? = null) {

descopesdk/src/main/java/com/descope/extensions/URLConnection.kt

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package com.descope.extensions
 
 import com.descope.session.DescopeSession

descopesdk/src/main/java/com/descope/internal/http/HttpClient.kt

@@ -1,6 +1,6 @@
 package com.descope.internal.http
 
-import android.net.Uri
+import androidx.core.net.toUri
 import com.descope.internal.others.debug
 import com.descope.internal.others.error
 import com.descope.internal.others.info
@@ -118,7 +118,7 @@ internal open class HttpClient(
     private fun makeUrl(route: String, params: Map<String, String?>): URL {
         val composed = "$baseUrl$basePath$route"
         val urlString = if (params.isNotEmpty()) {
-            Uri.parse(composed).buildUpon().apply {
+            composed.toUri().buildUpon().apply {
                 params
                     .filterValues { it != null }
                     .forEach { appendQueryParameter(it.key, it.value) }
@@ -135,7 +135,7 @@ private val Map<String, List<String>>.cookies: List<HttpCookie>
             this[key]?.forEach {
                 try {
                     cookies.addAll(HttpCookie.parse(it))
-                } catch (ignored: Exception) {}
+                } catch (_: Exception) {}
             }
         }
         return cookies.toList()

descopesdk/src/main/java/com/descope/internal/http/SystemInfo.kt

@@ -14,13 +14,13 @@ internal class DescopeSystemInfo private constructor(context: Context) : SystemI
 
     override val appName: String? = try {
         context.applicationInfo.loadLabel(context.packageManager).toString()
-    } catch (ignored: Exception) {
+    } catch (_: Exception) {
         null
     }
 
     override val appVersion: String? = try {
         context.packageManager.getPackageInfo(context.packageName, 0)?.versionName
-    } catch (ignored: Exception) {
+    } catch (_: Exception) {
         null
     }