Merge pull request WalletConnect#842 from WalletConnect/verify-depend…

…ency Add verify cocoapods support
unstoppablefi · May 16, 2023 · 2eb9643 · 2eb9643
2 parents d1b4275 + b3f5468
commit 2eb9643
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 16 deletions.
diff --git a/Sources/Auth/Auth.swift b/Sources/Auth/Auth.swift
@@ -1,8 +1,6 @@
 import Foundation
 import Combine
 
-import WalletConnectVerify
-
 public typealias VerifyContext = WalletConnectVerify.VerifyContext
 /// Auth instatnce wrapper
 ///

diff --git a/Sources/Auth/AuthClientFactory.swift b/Sources/Auth/AuthClientFactory.swift
@@ -1,7 +1,5 @@
 import Foundation
 
-import WalletConnectVerify
-
 public struct AuthClientFactory {
 
     public static func create(

diff --git a/Sources/Auth/AuthImports.swift b/Sources/Auth/AuthImports.swift
@@ -1,4 +1,5 @@
 #if !CocoaPods
 @_exported import WalletConnectPairing
 @_exported import WalletConnectSigner
+@_exported import WalletConnectVerify
 #endif
diff --git a/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift b/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift
@@ -1,8 +1,6 @@
 import Foundation
 import Combine
 
-import WalletConnectVerify
-
 class WalletRequestSubscriber {
     private let networkingInteractor: NetworkInteracting
     private let logger: ConsoleLogging

diff --git a/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift b/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift
@@ -1,8 +1,6 @@
 import Foundation
 import Combine
 
-import WalletConnectVerify
-
 final class ApproveEngine {
     enum Errors: Error {
         case wrongRequestParams

diff --git a/Sources/WalletConnectSign/Engine/Common/SessionEngine.swift b/Sources/WalletConnectSign/Engine/Common/SessionEngine.swift
@@ -1,8 +1,6 @@
 import Foundation
 import Combine
 
-import WalletConnectVerify
-
 final class SessionEngine {
     enum Errors: Error {
         case sessionNotFound(topic: String)

diff --git a/Sources/WalletConnectSign/Sign/Sign.swift b/Sources/WalletConnectSign/Sign/Sign.swift
@@ -1,8 +1,6 @@
 import Foundation
 import Combine
 
-import WalletConnectVerify
-
 public typealias VerifyContext = WalletConnectVerify.VerifyContext
 
 /// Sign instatnce wrapper

diff --git a/Sources/WalletConnectSign/Sign/SignClientFactory.swift b/Sources/WalletConnectSign/Sign/SignClientFactory.swift
@@ -1,7 +1,5 @@
 import Foundation
 
-import WalletConnectVerify
-
 public struct SignClientFactory {
 
     /// Initializes and returns newly created WalletConnect Client Instance

diff --git a/Sources/WalletConnectSign/Sign/SignImports.swift b/Sources/WalletConnectSign/Sign/SignImports.swift
@@ -1,3 +1,4 @@
 #if !CocoaPods
 @_exported import WalletConnectPairing
+@_exported import WalletConnectVerify
 #endif
diff --git a/Sources/Web3Wallet/Web3Wallet.swift b/Sources/Web3Wallet/Web3Wallet.swift
@@ -1,8 +1,6 @@
 import Foundation
 import Combine
 
-import WalletConnectVerify
-
 public typealias VerifyContext = WalletConnectVerify.VerifyContext
 /// Web3Wallet instance wrapper
 ///

diff --git a/Sources/Web3Wallet/Web3WalletImports.swift b/Sources/Web3Wallet/Web3WalletImports.swift
@@ -2,4 +2,5 @@
 @_exported import Auth
 @_exported import WalletConnectSign
 @_exported import WalletConnectEcho
+@_exported import WalletConnectVerify
 #endif
diff --git a/WalletConnectSwiftV2.podspec b/WalletConnectSwiftV2.podspec
@@ -77,19 +77,28 @@ Pod::Spec.new do |spec|
   spec.subspec 'WalletConnect' do |ss|
     ss.source_files = 'Sources/WalletConnectSign/**/*.{h,m,swift}'
     ss.dependency 'WalletConnectSwiftV2/WalletConnectPairing'
+    ss.dependency 'WalletConnectSwiftV2/WalletConnectVerify'
   end
 
   spec.subspec 'WalletConnectAuth' do |ss|
     ss.source_files = 'Sources/Auth/**/*.{h,m,swift}'
     ss.dependency 'WalletConnectSwiftV2/WalletConnectPairing'
     ss.dependency 'WalletConnectSwiftV2/WalletConnectSigner'
+    ss.dependency 'WalletConnectSwiftV2/WalletConnectVerify'
   end
 
   spec.subspec 'Web3Wallet' do |ss|
     ss.source_files = 'Sources/Web3Wallet/**/*.{h,m,swift}'
     ss.dependency 'WalletConnectSwiftV2/WalletConnect'
     ss.dependency 'WalletConnectSwiftV2/WalletConnectAuth'
     ss.dependency 'WalletConnectSwiftV2/WalletConnectEcho'
+    ss.dependency 'WalletConnectSwiftV2/WalletConnectVerify'
+  end
+
+  spec.subspec 'WalletConnectVerify' do |ss|
+    ss.source_files = 'Sources/WalletConnectVerify/**/*.{h,m,swift}'
+    ss.dependency 'WalletConnectSwiftV2/WalletConnectUtils'
+    ss.dependency 'WalletConnectSwiftV2/WalletConnectNetworking'
   end
 
   spec.subspec 'WalletConnectChat' do |ss|