From a3a4ccbfc27cab32f764661883c185651f9a03dc Mon Sep 17 00:00:00 2001
From: Rui <102453770+ruixhuang@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:43:37 -0700
Subject: [PATCH] Update Android version (#21)

* WIP

* Revert some changes
---
 build.gradle                                           |  4 ++--
 .../providers/WalletConnectV2Provider.kt               | 10 +++++-----
 gradle.properties                                      |  2 +-
 gradle/wrapper/gradle-wrapper.properties               |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index fad3c76..5796e01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,8 +10,8 @@ buildscript {
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.3.1' apply false
-    id 'com.android.library' version '8.3.1' apply false
+    id 'com.android.application' version '8.4.2' apply false
+    id 'com.android.library' version '8.4.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
     id 'com.google.dagger.hilt.android' version '2.41' apply false
     id "com.diffplug.spotless" version "6.22.0" // apply false
diff --git a/cartera/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt b/cartera/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt
index 4472928..2a1e69a 100644
--- a/cartera/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt
+++ b/cartera/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt
@@ -57,8 +57,8 @@ class WalletConnectV2Provider(
     override var walletStatusDelegate: WalletStatusDelegate? = null
     override var userConsentDelegate: WalletUserConsentProtocol? = null
 
-    private var connectCompletions: MutableList<WalletConnectCompletion> = mutableListOf()
-    private var operationCompletions: MutableMap<String, WalletOperationCompletion> = mutableMapOf()
+    private val connectCompletions: MutableList<WalletConnectCompletion> = mutableListOf()
+    private val operationCompletions: MutableMap<String, WalletOperationCompletion> = mutableMapOf()
 
     private var requestingWallet: WalletRequest? = null
     private var currentSession: Sign.Model.ApprovedSession? = null
@@ -423,10 +423,10 @@ class WalletConnectV2Provider(
 
         val pairing: Core.Model.Pairing?
         val pairings = CoreClient.Pairing.getPairings()
-        if (pairings.isNotEmpty()) {
-            pairing = pairings.first()
+        pairing = if (pairings.isNotEmpty()) {
+            pairings.first()
         } else {
-            pairing = CoreClient.Pairing.create() { error ->
+            CoreClient.Pairing.create() { error ->
                 Log.e(tag(this@WalletConnectV2Provider), error.throwable.stackTraceToString())
             }
         }
diff --git a/gradle.properties b/gradle.properties
index 151ccd0..0fa1676 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,6 +26,6 @@ android.nonTransitiveRClass=true
 
 LIBRARY_GROUP=dydxprotocol
 LIBRARY_ARTIFACT_ID=cartera-android
-LIBRARY_VERSION_NAME=0.1.14
+LIBRARY_VERSION_NAME=0.1.15
 
 android.enableR8.fullMode = false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 377d345..9e1bdd2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 02 11:57:06 PDT 2023
+#Wed Jun 12 15:23:49 PDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists