Merge pull request #1 from ProjectOpenSea/prashan/bump-dependencies

Bump Kotlin, OkHttp, and Moshi dependencies. Also switch to Moshi cod…

Author: prashanOS

build.gradle

@@ -1,9 +1,9 @@
 buildscript {
     ext {
         versions = [
-                kotlin                    : "1.4.31",
-                moshi                     : '1.8.0',
-                okhttp                    : '3.11.0',
+                kotlin                    : "1.7.0",
+                moshi                     : '1.13.0',
+                okhttp                    : '4.10.0',
                 jupiter                   : '5.7.0',
 
                 'minSdk'                  : 14,

lib/build.gradle

@@ -1,3 +1,6 @@
+plugins {
+    id "com.google.devtools.ksp" version "1.7.0-1.0.6"
+}
 apply plugin: "kotlin"
 apply plugin: 'maven'
 
@@ -13,10 +16,8 @@ dependencies {
 
     implementation "org.bouncycastle:bcprov-jdk15to18:1.68"
 
-    implementation 'com.squareup.moshi:moshi:1.8.0'
-    // TODO: it would be better to use the generated adapter by moshi
-    // but for that we should move the implementations in different modules
-    //kapt "com.squareup.moshi:moshi-kotlin-codegen:$versions.moshi"
+    implementation "com.squareup.moshi:moshi:$versions.moshi"
+    ksp "com.squareup.moshi:moshi-kotlin-codegen:$versions.moshi"
 
     implementation "com.squareup.okhttp3:okhttp:$versions.okhttp"
 

lib/src/main/kotlin/org/walletconnect/Session.kt

@@ -1,5 +1,6 @@
 package org.walletconnect
 
+import com.squareup.moshi.JsonClass
 import java.net.URLDecoder
 import java.net.URLEncoder
 
@@ -26,6 +27,7 @@ interface Session {
     fun removeCallback(cb: Callback)
     fun clearCallbacks()
 
+    @JsonClass(generateAdapter = true)
     data class FullyQualifiedConfig(
             val handshakeTopic: String,
             val bridge: String,
@@ -154,7 +156,10 @@ interface Session {
         data class Response(val id: Long, val result: Any?, val error: Error? = null) : MethodCall(id)
     }
 
+    @JsonClass(generateAdapter = true)
     data class PeerData(val id: String, val meta: PeerMeta?)
+
+    @JsonClass(generateAdapter = true)
     data class PeerMeta(
             val url: String? = null,
             val name: String? = null,

lib/src/main/kotlin/org/walletconnect/impls/WCSession.kt

@@ -1,5 +1,6 @@
 package org.walletconnect.impls
 
+import com.squareup.moshi.JsonClass
 import org.walletconnect.Session
 import org.walletconnect.nullOnThrow
 import org.walletconnect.types.extractSessionParams
@@ -166,6 +167,12 @@ class WCSession(
                     )
                 )
             }
+            Session.Transport.Status.Disconnected -> {
+                // no-op
+            }
+            is Session.Transport.Status.Error -> {
+                // no-op
+            }
         }
         propagateToCallbacks {
             onStatus(when(status) {
@@ -211,6 +218,9 @@ class WCSession(
                 val callback = requests[data.id] ?: return
                 callback(data)
             }
+            is Session.MethodCall.Custom -> {
+                // no-op
+            }
         }
 
         if (accountToCheck?.let { accountCheck(data.id(), it) } != false) {
@@ -297,6 +307,7 @@ interface WCSessionStore {
 
     fun list(): List<State>
 
+    @JsonClass(generateAdapter = true)
     data class State(
             val config: Session.FullyQualifiedConfig,
             val clientData: Session.PeerData,