Merge branch 'main' into features/drop_quotes

# Conflicts:
#	gradle.properties

app/proguard-rules.pro

@@ -28,4 +28,14 @@
 -dontwarn org.conscrypt.ConscryptHostnameVerifier
 -dontwarn org.openjsse.javax.net.ssl.SSLParameters
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
+-dontwarn org.openjsse.net.ssl.OpenJSSE
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+-keep class com.google.gson.reflect.TypeToken
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep public class * implements java.lang.reflect.Type
+
+-dontwarn java.beans.ConstructorProperties
+-dontwarn java.beans.Transient

build.gradle

@@ -40,6 +40,5 @@ allprojects {
 
 
 tasks.named('check') {
-    dependsOn buildHealth
     dependsOn spotlessApply
 }

cartera/build.gradle

@@ -61,10 +61,10 @@ dependencies {
     // https://github.com/WalletConnect/WalletConnectKotlinV2
     //
 
-    implementation platform('com.walletconnect:android-bom:1.15.0')
+    implementation platform('com.walletconnect:android-bom:1.18.0')
     implementation('com.walletconnect:android-core')
     implementation 'com.walletconnect:sign'
-    implementation 'com.walletconnect:push'
+    //implementation 'com.walletconnect:push'
 
     //
     // https://docs.cloud.coinbase.com/wallet-sdk/docs/android-install

cartera/proguard-rules.pro

@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile

cartera/src/main/java/exchange/dydx/cartera/CarteraConfig.kt

@@ -136,7 +136,7 @@ class CarteraConfig(
 
     private fun registerWalletsInternal(walletConfigJsonData: String): List<Wallet>? {
         val gson = Gson()
-        val walletListType: Type = object : TypeToken<ArrayList<Wallet?>?>() {}.type
+        val walletListType: Type = object : TypeToken<List<Wallet?>?>() {}.type
         return gson.fromJson(walletConfigJsonData, walletListType)
     }
 

gradle.properties

@@ -26,4 +26,6 @@ android.nonTransitiveRClass=true
 
 LIBRARY_GROUP=dydxprotocol
 LIBRARY_ARTIFACT_ID=cartera-android
-LIBRARY_VERSION_NAME=0.0.10
+LIBRARY_VERSION_NAME=0.0.11
+
+android.enableR8.fullMode = false