Update WalletConnect library to the latest (#19)

* Update WalletConnect library * Update version
dydxprotocol · Mar 21, 2024 · c11ea42 · c11ea42
1 parent 8af11e1
commit c11ea42
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace 'exchange.dydx.carteraexample'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "exchange.dydx.carteraexample"
         minSdk 24
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -38,15 +38,19 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion "1.4.7"
     }
+
+    configurations{
+        all*.exclude module: 'bcprov-jdk15on'
+    }
 }
 
 dependencies {
     implementation project(path: ':cartera')
 
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
+    implementation 'androidx.activity:activity-compose:1.8.2'
     implementation platform('androidx.compose:compose-bom:2022.10.00')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'

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.2.1' apply false
-    id 'com.android.library' version '8.2.1' apply false
+    id 'com.android.application' version '8.2.2' apply false
+    id 'com.android.library' version '8.2.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/build.gradle b/cartera/build.gradle
@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace 'exchange.dydx.cartera'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 24
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -47,21 +47,21 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.11.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
    // implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
 
     //
     // https://github.com/WalletConnect/WalletConnectKotlinV2
     //
 
-    implementation platform('com.walletconnect:android-bom:1.18.0')
+    implementation platform('com.walletconnect:android-bom:1.23.0')
     implementation('com.walletconnect:android-core')
     implementation 'com.walletconnect:sign'
     //implementation 'com.walletconnect:push'

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
@@ -199,6 +199,14 @@ class WalletConnectV2Provider(
 
             Log.d(tag(this@WalletConnectV2Provider), "onError: $error")
         }
+
+        override fun onProposalExpired(proposal: Sign.Model.ExpiredProposal) {
+            Log.d(tag(this@WalletConnectV2Provider), "onProposalExpired: $proposal")
+        }
+
+        override fun onRequestExpired(request: Sign.Model.ExpiredRequest) {
+            Log.d(tag(this@WalletConnectV2Provider), "onRequestExpired: $request")
+        }
     }
 
     init {
@@ -433,11 +441,11 @@ class WalletConnectV2Provider(
 
             SignClient.connect(
                 connect = connectParams,
-                onSuccess = {
-                    Log.d(tag(this@WalletConnectV2Provider), "Connected to wallet")
+                onSuccess = { value ->
+                    Log.d(tag(this@WalletConnectV2Provider), "Connected to wallet: $value")
                     completion(pairing, null)
                 },
-                onError = { error ->
+                onError = { error: Sign.Model.Error ->
                     Log.e(tag(this@WalletConnectV2Provider), error.throwable.stackTraceToString())
                     completion(
                         null,

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.12
+LIBRARY_VERSION_NAME=0.1.13
 
 android.enableR8.fullMode = false