Merge pull request #851 from WalletConnect/develop

BOM 1.9.3
WalletConnect · May 5, 2023 · a156d94 · a156d94
2 parents 132c8e2 + cbb9f28
commit a156d94
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/ReadMe.md b/ReadMe.md
@@ -10,6 +10,7 @@ WalletConnect v2 protocols for Android applications.
 
 | BOM                                                                                     | [Core SDK](androidCore) | [web3wallet](web3/wallet) | [Sign SDK](sign) | [Auth SDK](auth) | [Chat SDK](chat) | [web3inbox](web3/inbox) |
 |-----------------------------------------------------------------------------------------|-------------------------|---------------------------|------------------|------------------|------------------|-------------------------|
+| 1.9.3                                                                                   | 1.14.3                  | 1.7.3                     | 2.12.3           | 1.12.3           | 1.0.0-beta09     | 1.0.0-alpha09           |
 | 1.9.2                                                                                   | 1.14.2                  | 1.7.2                     | 2.12.2           | 1.12.2           | 1.0.0-beta08     | 1.0.0-alpha08           |
 | 1.9.1                                                                                   | 1.14.1                  | 1.7.1                     | 2.12.1           | 1.12.1           | 1.0.0-beta07     | 1.0.0-alpha07           |
 | 1.9.0<sup>[**](https://github.com/WalletConnect/WalletConnectKotlinV2/issues/821)</sup> | 1.14.0                  | 1.7.0                     | 2.12.0           | 1.12.0           | 1.0.0-beta06     | 1.0.0-alpha06           |

diff --git a/androidCore/sdk/src/debug/kotlin/com/walletconnect/android/di/CoreStorageModule.kt b/androidCore/sdk/src/debug/kotlin/com/walletconnect/android/di/CoreStorageModule.kt
@@ -13,7 +13,6 @@ import org.koin.dsl.module
 fun coreStorageModule() = module {
 
     includes(baseStorageModule())
-    includes(syncStorageModule())
 
     single<SqlDriver>(named(AndroidCoreDITags.ANDROID_CORE_DATABASE_DRIVER)) {
         AndroidSqliteDriver(

diff --git a/androidCore/sdk/src/main/kotlin/com/walletconnect/android/CoreClient.kt b/androidCore/sdk/src/main/kotlin/com/walletconnect/android/CoreClient.kt
@@ -68,9 +68,9 @@ object CoreClient {
         }
 
         Verify.initialize(metaData.verifyUrl)
-        Sync.initialize() { error -> onError(Core.Model.Error(error.throwable)) }
         PairingProtocol.initialize()
         PairingController.initialize()
+        Sync.initialize() { error -> onError(Core.Model.Error(error.throwable)) }
     }
 
     fun setDelegate(delegate: CoreDelegate) {

diff --git a/...ore/sdk/src/main/kotlin/com/walletconnect/android/internal/common/di/BaseStorageModule.kt b/...ore/sdk/src/main/kotlin/com/walletconnect/android/internal/common/di/BaseStorageModule.kt
@@ -7,6 +7,7 @@ import com.walletconnect.android.internal.common.model.AppMetaDataType
 import com.walletconnect.android.internal.common.storage.*
 import com.walletconnect.android.sdk.core.AndroidCoreDatabase
 import com.walletconnect.android.sdk.storage.data.dao.MetaData
+import com.walletconnect.android.sync.di.syncStorageModule
 import org.koin.core.qualifier.named
 import org.koin.core.scope.Scope
 import org.koin.dsl.module
@@ -76,4 +77,6 @@ fun baseStorageModule() = module {
     single { JsonRpcHistory(get(), get()) }
 
     single { IdentitiesStorageRepository(get()) }
+
+    includes(syncStorageModule())
 }
diff --git a/androidCore/sdk/src/main/kotlin/com/walletconnect/android/sync/di/SyncStorageModule.kt b/androidCore/sdk/src/main/kotlin/com/walletconnect/android/sync/di/SyncStorageModule.kt
@@ -1,16 +1,18 @@
 package com.walletconnect.android.sync.di
 
+import com.walletconnect.android.di.AndroidCoreDITags
 import com.walletconnect.android.sdk.core.AndroidCoreDatabase
 import com.walletconnect.android.sync.storage.AccountsStorageRepository
 import com.walletconnect.android.sync.storage.StoresStorageRepository
+import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 @JvmSynthetic
 internal fun syncStorageModule() = module {
 
-    single { get<AndroidCoreDatabase>().accountsQueries }
-    single { get<AndroidCoreDatabase>().storesQueries }
-    single { get<AndroidCoreDatabase>().storeValuesQueries }
+    single { get<AndroidCoreDatabase>(named(AndroidCoreDITags.ANDROID_CORE_DATABASE)).accountsQueries }
+    single { get<AndroidCoreDatabase>(named(AndroidCoreDITags.ANDROID_CORE_DATABASE)).storesQueries }
+    single { get<AndroidCoreDatabase>(named(AndroidCoreDITags.ANDROID_CORE_DATABASE)).storeValuesQueries }
 
     single { AccountsStorageRepository(get()) }
     single { StoresStorageRepository(get(), get()) }

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -5,16 +5,15 @@ const val KEY_PUBLISH_ARTIFACT_ID = "PUBLISH_ARTIFACT_ID"
 const val KEY_SDK_NAME = "SDK_NAME"
 
 //Latest versions
-const val BOM_VERSION = "1.9.2"
+const val BOM_VERSION = "1.9.3"
 const val FOUNDATION_VERSION = "1.8.0"
-const val CORE_VERSION = "1.14.2"
-const val SIGN_VERSION = "2.12.2"
-const val SYNC_VERSION = "1.0.0-alpha01"
-const val AUTH_VERSION = "1.12.2"
-const val CHAT_VERSION = "1.0.0-beta08"
-const val PUSH_VERSION = "1.0.0-alpha03"
-const val WEB_3_WALLET = "1.7.2"
-const val WEB_3_INBOX = "1.0.0-alpha08"
+const val CORE_VERSION = "1.14.3"
+const val SIGN_VERSION = "2.12.3"
+const val AUTH_VERSION = "1.12.3"
+const val CHAT_VERSION = "1.0.0-beta09"
+const val PUSH_VERSION = "1.0.0-alpha04"
+const val WEB_3_WALLET = "1.7.3"
+const val WEB_3_INBOX = "1.0.0-alpha09"
 
 val jvmVersion = JavaVersion.VERSION_11
 const val MIN_SDK: Int = 23