WIP

dydxprotocol · Jun 13, 2024 · a016449 · a016449
1 parent c885b0f
commit a016449
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git 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/publishLocal.gradle b/cartera/publishLocal.gradle
@@ -3,7 +3,7 @@ project.afterEvaluate {
     publishToMavenLocal { 
         def groupId = LIBRARY_GROUP 
         def artifactId = LIBRARY_ARTIFACT_ID 
-        def versionName = LIBRARY_VERSION_NAME + "-local" 
+        def versionName = LIBRARY_VERSION_NAME
         def debugSuffix = "-debug" 
         def releaseSuffix = "-release" 
         publishing { 
@@ -13,14 +13,14 @@ project.afterEvaluate {
                 //    artifact(sourceJar)
                     setGroupId groupId 
                     setArtifactId artifactId 
-                    version versionName + releaseSuffix 
+                    version versionName //  + releaseSuffix 
                 } 
                 LibraryDebug(MavenPublication) { 
                     from components.debug 
                 //    artifact(sourceJar)
                     setGroupId groupId 
                     setArtifactId artifactId 
-                    version versionName + debugSuffix 
+                    version versionName // + debugSuffix 
                 } 
             } 
             publications.all {

diff --git a/...a/src/main/java/exchange/dydx/cartera/walletprovider/providers/WalletConnectV2Provider.kt b/...a/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
@@ -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
diff --git 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