From 88569ad34f73c246aef97ebdf8cacb9b569aafcd Mon Sep 17 00:00:00 2001 From: Krypto Pank Date: Wed, 21 Dec 2022 21:29:16 +0200 Subject: [PATCH] Replace walletConnect v1 and firebase crashlytics with pod version #5977 --- AlphaWallet.xcodeproj/project.pbxproj | 80 +++------- .../xcshareddata/swiftpm/Package.resolved | 149 ------------------ .../Services/FirebaseReportService.swift | 4 +- Podfile | 5 +- Podfile.lock | 70 +++++++- 5 files changed, 96 insertions(+), 212 deletions(-) delete mode 100644 AlphaWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/AlphaWallet.xcodeproj/project.pbxproj b/AlphaWallet.xcodeproj/project.pbxproj index a44e23a80..68bc1481c 100644 --- a/AlphaWallet.xcodeproj/project.pbxproj +++ b/AlphaWallet.xcodeproj/project.pbxproj @@ -490,7 +490,6 @@ 8722F86B25F79A2E00293D89 /* UIResponder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8722F86A25F79A2E00293D89 /* UIResponder.swift */; }; 8722F86D25F79A4700293D89 /* UITableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8722F86C25F79A4700293D89 /* UITableViewCell.swift */; }; 87242E4225F2749500F0E89D /* SendViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87242E4125F2749500F0E89D /* SendViewControllerTests.swift */; }; - 87243921290FE74200FF3058 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 87243920290FE74200FF3058 /* Starscream */; }; 8727149A282175EB00901B3E /* NFTAssetListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87271499282175EB00901B3E /* NFTAssetListViewModel.swift */; }; 8727149C2822489300901B3E /* ContainerCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8727149B2822489200901B3E /* ContainerCollectionViewCell.swift */; }; 87281AEE2885219A0066E31E /* TableViewDiffableDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87281AED2885219A0066E31E /* TableViewDiffableDataSource.swift */; }; @@ -630,7 +629,6 @@ 87713EB4264BAB5A00B1B9CB /* ActivityPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87713EB3264BAB5A00B1B9CB /* ActivityPageView.swift */; }; 87713EB6264BAB6E00B1B9CB /* PriceAlertsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87713EB5264BAB6E00B1B9CB /* PriceAlertsViewController.swift */; }; 877239CB28F7DCE00062DC14 /* GoogleService-InfoTests.plist in Resources */ = {isa = PBXBuildFile; fileRef = 877239CA28F7DCE00062DC14 /* GoogleService-InfoTests.plist */; }; - 877239CE28F806820062DC14 /* WalletConnectSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 877239CD28F806820062DC14 /* WalletConnectSwift */; }; 8772D77028D1EFB300615803 /* ServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8772D76F28D1EFB200615803 /* ServiceProvider.swift */; }; 8772D77228D1F03600615803 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8772D77128D1F03600615803 /* Constants.swift */; }; 87741F1827709073007F4604 /* TestnetTokenInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87741F1727709073007F4604 /* TestnetTokenInfoView.swift */; }; @@ -803,7 +801,6 @@ 87F53A012817FF8400BD8017 /* WalletConnectSessionsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87F53A002817FF8400BD8017 /* WalletConnectSessionsViewModel.swift */; }; 87F9972824E155280092D262 /* SeedPhraseBackupIntroductionViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87F9972724E155280092D262 /* SeedPhraseBackupIntroductionViewControllerTests.swift */; }; 87FBAE0124A1EE67005EF293 /* AddressOrEnsNameLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87FBAE0024A1EE67005EF293 /* AddressOrEnsNameLabel.swift */; }; - 87FBF2B128056AC200616B7D /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 87FBF2B028056AC200616B7D /* FirebaseCrashlytics */; }; 87FBF2B528056B6F00616B7D /* FirebaseReportService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87FBF2B428056B6F00616B7D /* FirebaseReportService.swift */; }; 87FBF2B728056B8E00616B7D /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 87FBF2B628056B8E00616B7D /* GoogleService-Info.plist */; }; AA26C61F20412A1E00318B9B /* NFTCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA26C61D20412A1D00318B9B /* NFTCollectionViewController.swift */; }; @@ -1731,10 +1728,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 87FBF2B128056AC200616B7D /* FirebaseCrashlytics in Frameworks */, 2A669F5585899E890EF26C57 /* Pods_AlphaWallet.framework in Frameworks */, - 877239CE28F806820062DC14 /* WalletConnectSwift in Frameworks */, - 87243921290FE74200FF3058 /* Starscream in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4391,9 +4385,6 @@ ); name = AlphaWallet; packageProductDependencies = ( - 87FBF2B028056AC200616B7D /* FirebaseCrashlytics */, - 877239CD28F806820062DC14 /* WalletConnectSwift */, - 87243920290FE74200FF3058 /* Starscream */, ); productName = etherwallet; productReference = 2912CCF51F6A830700C6CBE3 /* AlphaWallet.app */; @@ -4521,9 +4512,6 @@ ); mainGroup = 2912CCEC1F6A830700C6CBE3; packageReferences = ( - 87FBF2AF28056AC200616B7D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, - 877239CC28F806820062DC14 /* XCRemoteSwiftPackageReference "WalletConnectSwift.git" */, - 8724391F290FE74200FF3058 /* XCRemoteSwiftPackageReference "Starscream" */, ); productRefGroup = 2912CCF61F6A830700C6CBE3 /* Products */; projectDirPath = ""; @@ -4745,7 +4733,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${BUILD_DIR%/Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\n"; + shellScript = "\"${PODS_ROOT}/FirebaseCrashlytics/run\"\n"; }; 8A3C752ACC5CACBD729A8F25 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; @@ -4775,7 +4763,13 @@ "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework", "${BUILT_PRODUCTS_DIR}/EthereumABI/EthereumABI.framework", "${BUILT_PRODUCTS_DIR}/EthereumAddress/EthereumAddress.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics/FirebaseCrashlytics.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", "${BUILT_PRODUCTS_DIR}/FloatingPanel/FloatingPanel.framework", + "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework", "${BUILT_PRODUCTS_DIR}/JSONRPCKit/JSONRPCKit.framework", "${BUILT_PRODUCTS_DIR}/Kanna/Kanna.framework", @@ -4785,6 +4779,7 @@ "${BUILT_PRODUCTS_DIR}/Mixpanel-swift/Mixpanel.framework", "${BUILT_PRODUCTS_DIR}/PaperTrailLumberjack/PaperTrailLumberjack.framework", "${BUILT_PRODUCTS_DIR}/PromiseKit/PromiseKit.framework", + "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/QRCodeReaderViewController/QRCodeReaderViewController.framework", "${BUILT_PRODUCTS_DIR}/R.swift.Library/Rswift.framework", "${BUILT_PRODUCTS_DIR}/Realm/Realm.framework", @@ -4792,6 +4787,7 @@ "${BUILT_PRODUCTS_DIR}/Result/Result.framework", "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", "${BUILT_PRODUCTS_DIR}/SipHash/SipHash.framework", + "${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework", "${BUILT_PRODUCTS_DIR}/StatefulViewController/StatefulViewController.framework", "${BUILT_PRODUCTS_DIR}/SwiftAlgorithms/Algorithms.framework", "${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework", @@ -4799,7 +4795,9 @@ "${BUILT_PRODUCTS_DIR}/TrezorCrypto/TrezorCrypto.framework", "${BUILT_PRODUCTS_DIR}/TrustKeystore/TrustKeystore.framework", "${BUILT_PRODUCTS_DIR}/TrustWalletCore/WalletCore.framework", + "${BUILT_PRODUCTS_DIR}/WalletConnectSwift/WalletConnectSwift.framework", "${BUILT_PRODUCTS_DIR}/WalletConnectSwiftV2/WalletConnectSwiftV2.framework", + "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", "${BUILT_PRODUCTS_DIR}/secp256k1_ios/secp256k1_ios.framework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/MailchimpSDK/MailchimpSDK.framework/MailchimpSDK", ); @@ -4825,7 +4823,13 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EthereumABI.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EthereumAddress.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FloatingPanel.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JSONRPCKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kanna.framework", @@ -4835,6 +4839,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mixpanel.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PaperTrailLumberjack.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PromiseKit.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QRCodeReaderViewController.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Rswift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework", @@ -4842,6 +4847,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Result.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SipHash.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StatefulViewController.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Algorithms.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework", @@ -4849,7 +4855,9 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrezorCrypto.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TrustKeystore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WalletCore.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WalletConnectSwift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WalletConnectSwiftV2.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/secp256k1_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MailchimpSDK.framework", ); @@ -6288,52 +6296,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - 8724391F290FE74200FF3058 /* XCRemoteSwiftPackageReference "Starscream" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/daltoniam/Starscream"; - requirement = { - kind = versionRange; - maximumVersion = 4.0.0; - minimumVersion = 3.0.0; - }; - }; - 877239CC28F806820062DC14 /* XCRemoteSwiftPackageReference "WalletConnectSwift.git" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/AlphaWallet/WalletConnectSwift.git"; - requirement = { - branch = alphaWallet; - kind = branch; - }; - }; - 87FBF2AF28056AC200616B7D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 8.10.0; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 87243920290FE74200FF3058 /* Starscream */ = { - isa = XCSwiftPackageProductDependency; - package = 8724391F290FE74200FF3058 /* XCRemoteSwiftPackageReference "Starscream" */; - productName = Starscream; - }; - 877239CD28F806820062DC14 /* WalletConnectSwift */ = { - isa = XCSwiftPackageProductDependency; - package = 877239CC28F806820062DC14 /* XCRemoteSwiftPackageReference "WalletConnectSwift.git" */; - productName = WalletConnectSwift; - }; - 87FBF2B028056AC200616B7D /* FirebaseCrashlytics */ = { - isa = XCSwiftPackageProductDependency; - package = 87FBF2AF28056AC200616B7D /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseCrashlytics; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = 2912CCED1F6A830700C6CBE3 /* Project object */; } diff --git a/AlphaWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AlphaWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 6d7934d41..000000000 --- a/AlphaWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,149 +0,0 @@ -{ - "pins" : [ - { - "identity" : "abseil-cpp-swiftpm", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git", - "state" : { - "revision" : "fffc3c2729be5747390ad02d5100291a0d9ad26a", - "version" : "0.20200225.4" - } - }, - { - "identity" : "boringssl-swiftpm", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/boringssl-SwiftPM.git", - "state" : { - "revision" : "734a8247442fde37df4364c21f6a0085b6a36728", - "version" : "0.7.2" - } - }, - { - "identity" : "cryptoswift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/krzyzanowskim/CryptoSwift.git", - "state" : { - "revision" : "039f56c5d7960f277087a0be51f5eb04ed0ec073", - "version" : "1.5.1" - } - }, - { - "identity" : "firebase-ios-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/firebase-ios-sdk", - "state" : { - "revision" : "ccb2bccb82e62ad9e8a4e757a43ce6a04ceae1c9", - "version" : "8.14.0" - } - }, - { - "identity" : "googleappmeasurement", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleAppMeasurement.git", - "state" : { - "revision" : "9b74e6a3f875208c04c22b39b580a21d4de0f4f9", - "version" : "8.14.0" - } - }, - { - "identity" : "googledatatransport", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleDataTransport.git", - "state" : { - "revision" : "15ccdfd25ac55b9239b82809531ff26605e7556e", - "version" : "9.1.2" - } - }, - { - "identity" : "googleutilities", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleUtilities.git", - "state" : { - "revision" : "f4abe56ce62a779e64b525eb133c8fc2a84bbc1f", - "version" : "7.7.1" - } - }, - { - "identity" : "grpc-swiftpm", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/grpc-SwiftPM.git", - "state" : { - "revision" : "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5", - "version" : "1.28.4" - } - }, - { - "identity" : "gtm-session-fetcher", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/gtm-session-fetcher.git", - "state" : { - "revision" : "eca9404a18f53727e4698211aaf2615eb93b962a", - "version" : "1.7.1" - } - }, - { - "identity" : "leveldb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/leveldb.git", - "state" : { - "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", - "version" : "1.22.2" - } - }, - { - "identity" : "nanopb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/nanopb.git", - "state" : { - "revision" : "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77", - "version" : "2.30908.0" - } - }, - { - "identity" : "promises", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/promises.git", - "state" : { - "revision" : "46c1e6b5ac09d8f82c991061c659f67e573d425d", - "version" : "2.1.0" - } - }, - { - "identity" : "starscream", - "kind" : "remoteSourceControl", - "location" : "https://github.com/daltoniam/Starscream.git", - "state" : { - "revision" : "e6b65c6d9077ea48b4a7bdda8994a1d3c6969c8d", - "version" : "3.1.1" - } - }, - { - "identity" : "swift-nio-zlib-support", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio-zlib-support.git", - "state" : { - "revision" : "37760e9a52030bb9011972c5213c3350fa9d41fd", - "version" : "1.0.0" - } - }, - { - "identity" : "swift-protobuf", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-protobuf.git", - "state" : { - "revision" : "e1499bc69b9040b29184f7f2996f7bab467c1639", - "version" : "1.19.0" - } - }, - { - "identity" : "walletconnectswift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/AlphaWallet/WalletConnectSwift.git", - "state" : { - "branch" : "alphaWallet", - "revision" : "cb8dfc428ec70499a585c43e33a5e5c695b135a2" - } - } - ], - "version" : 2 -} diff --git a/AlphaWallet/Common/Services/FirebaseReportService.swift b/AlphaWallet/Common/Services/FirebaseReportService.swift index b211bf7ab..b678cc02a 100644 --- a/AlphaWallet/Common/Services/FirebaseReportService.swift +++ b/AlphaWallet/Common/Services/FirebaseReportService.swift @@ -4,8 +4,8 @@ // // Created by Vladyslav Shepitko on 03.02.2021. // - -import Firebase +import FirebaseCore +import FirebaseCrashlytics import AlphaWalletFoundation extension AlphaWallet { diff --git a/Podfile b/Podfile index 8497b412d..5b5393736 100644 --- a/Podfile +++ b/Podfile @@ -37,6 +37,9 @@ target 'AlphaWallet' do pod 'SwiftFormat/CLI', '~> 0.49', :configuration => 'Debug' pod 'WalletConnectSwiftV2', '~> 1.0.2' + pod 'FirebaseCrashlytics', '8.10.0' + pod 'WalletConnectSwift', :git => 'https://github.com/AlphaWallet/WalletConnectSwift.git', :branch => 'alphaWallet' + pod 'Starscream', '3.1.1' target 'AlphaWalletTests' do inherit! :search_paths @@ -77,7 +80,7 @@ post_install do |installer| end end - if ['Result', 'SwiftyXMLParser', 'JSONRPCKit'].include? target.name + if ['Result', 'SwiftyXMLParser', 'JSONRPCKit', 'Starscream'].include? target.name target.build_configurations.each do |config| config.build_settings['SWIFT_VERSION'] = '4.2' end diff --git a/Podfile.lock b/Podfile.lock index cdab65cc0..0c9f461b5 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -78,7 +78,38 @@ PODS: - EthereumAddress (~> 1.3) - EthereumAddress (1.3.0): - CryptoSwift (~> 1.0) + - FirebaseCore (8.15.0): + - FirebaseCoreDiagnostics (~> 8.0) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Logger (~> 7.7) + - FirebaseCoreDiagnostics (8.15.0): + - GoogleDataTransport (~> 9.1) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/Logger (~> 7.7) + - nanopb (~> 2.30908.0) + - FirebaseCrashlytics (8.10.0): + - FirebaseCore (~> 8.0) + - FirebaseInstallations (~> 8.0) + - GoogleDataTransport (~> 9.1) + - GoogleUtilities/Environment (~> 7.6) + - nanopb (~> 2.30908.0) + - PromisesObjC (< 3.0, >= 1.2) + - FirebaseInstallations (8.15.0): + - FirebaseCore (~> 8.0) + - GoogleUtilities/Environment (~> 7.7) + - GoogleUtilities/UserDefaults (~> 7.7) + - PromisesObjC (< 3.0, >= 1.2) - FloatingPanel (2.5.2) + - GoogleDataTransport (9.2.0): + - GoogleUtilities/Environment (~> 7.7) + - nanopb (< 2.30910.0, >= 2.30908.0) + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/Environment (7.10.0): + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/Logger (7.10.0): + - GoogleUtilities/Environment + - GoogleUtilities/UserDefaults (7.10.0): + - GoogleUtilities/Logger - iOSSnapshotTestCase (6.2.0): - iOSSnapshotTestCase/SwiftSupport (= 6.2.0) - iOSSnapshotTestCase/Core (6.2.0) @@ -95,6 +126,11 @@ PODS: - Mixpanel-swift (3.2.0): - Mixpanel-swift/Complete (= 3.2.0) - Mixpanel-swift/Complete (3.2.0) + - nanopb (2.30908.0): + - nanopb/decode (= 2.30908.0) + - nanopb/encode (= 2.30908.0) + - nanopb/decode (2.30908.0) + - nanopb/encode (2.30908.0) - PaperTrailLumberjack/Core (0.1.9): - CocoaAsyncSocket (~> 7.6) - CocoaLumberjack (~> 3.4) @@ -113,6 +149,7 @@ PODS: - PromiseKit/CorePromise - PromiseKit/UIKit (6.3.5): - PromiseKit/CorePromise + - PromisesObjC (2.1.1) - QRCodeReaderViewController (4.0.2) - R.swift (5.4.0): - R.swift.Library (~> 5.3.0) @@ -126,6 +163,7 @@ PODS: - SAMKeychain (1.5.3) - secp256k1_ios (0.1.3) - SipHash (1.2.2) + - Starscream (3.1.1) - StatefulViewController (3.0) - SwiftAlgorithms (1.0.0) - SwiftFormat/CLI (0.50.3) @@ -143,6 +181,8 @@ PODS: - TrustWalletCore/Types - TrustWalletCore/Types (2.6.34): - SwiftProtobuf + - WalletConnectSwift (1.7.0): + - CryptoSwift (~> 1.5) - WalletConnectSwiftV2 (1.0.5): - WalletConnectSwiftV2/WalletConnect (= 1.0.5) - WalletConnectSwiftV2/Commons (1.0.5) @@ -175,6 +215,7 @@ DEPENDENCIES: - BigInt (~> 3.1) - Charts - EthereumABI (from `https://github.com/AlphaWallet/EthereumABI.git`, commit `877b77e8e7cbc54ab0712d509b74fec21b79d1bb`) + - FirebaseCrashlytics (= 8.10.0) - FloatingPanel - iOSSnapshotTestCase (= 6.2.0) - IQKeyboardManager @@ -188,11 +229,13 @@ DEPENDENCIES: - QRCodeReaderViewController (from `https://github.com/AlphaWallet/QRCodeReaderViewController.git`, commit `30d1a2a7d167d0d207ae0ae3a4d81bcf473d7a65`) - R.swift - SAMKeychain + - Starscream (= 3.1.1) - StatefulViewController - SwiftFormat/CLI (~> 0.49) - SwiftLint (= 0.50.3) - TrezorCrypto (from `https://github.com/AlphaWallet/trezor-crypto-ios.git`, commit `50c16ba5527e269bbc838e80aee5bac0fe304cc7`) - TrustKeystore (from `https://github.com/AlphaWallet/latest-keystore-snapshot`, commit `c0bdc4f6ffc117b103e19d17b83109d4f5a0e764`) + - WalletConnectSwift (from `https://github.com/AlphaWallet/WalletConnectSwift.git`, branch `alphaWallet`) - WalletConnectSwiftV2 (~> 1.0.2) - xcbeautify @@ -209,7 +252,13 @@ SPEC REPOS: - CombineExt - CryptoSwift - EthereumAddress + - FirebaseCore + - FirebaseCoreDiagnostics + - FirebaseCrashlytics + - FirebaseInstallations - FloatingPanel + - GoogleDataTransport + - GoogleUtilities - iOSSnapshotTestCase - IQKeyboardManager - JSONRPCKit @@ -217,8 +266,10 @@ SPEC REPOS: - MailchimpSDK - MBProgressHUD - Mixpanel-swift + - nanopb - PaperTrailLumberjack - PromiseKit + - PromisesObjC - R.swift - R.swift.Library - Realm @@ -227,6 +278,7 @@ SPEC REPOS: - SAMKeychain - secp256k1_ios - SipHash + - Starscream - StatefulViewController - SwiftAlgorithms - SwiftFormat @@ -275,6 +327,9 @@ EXTERNAL SOURCES: TrustKeystore: :commit: c0bdc4f6ffc117b103e19d17b83109d4f5a0e764 :git: https://github.com/AlphaWallet/latest-keystore-snapshot + WalletConnectSwift: + :branch: alphaWallet + :git: https://github.com/AlphaWallet/WalletConnectSwift.git CHECKOUT OPTIONS: AlphaWalletWeb3Provider: @@ -298,6 +353,9 @@ CHECKOUT OPTIONS: TrustKeystore: :commit: c0bdc4f6ffc117b103e19d17b83109d4f5a0e764 :git: https://github.com/AlphaWallet/latest-keystore-snapshot + WalletConnectSwift: + :commit: cb8dfc428ec70499a585c43e33a5e5c695b135a2 + :git: https://github.com/AlphaWallet/WalletConnectSwift.git SPEC CHECKSUMS: Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18 @@ -321,7 +379,13 @@ SPEC CHECKSUMS: CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082 EthereumABI: c021720744d260b87def6aa45d94554d260cb5a9 EthereumAddress: 39fe8e11cf04e4e9902b55ae653dbc4e0aee5f30 + FirebaseCore: 5743c5785c074a794d35f2fff7ecc254a91e08b1 + FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb + FirebaseCrashlytics: 3b7f17cdf5bf1ae6ad5956696a6c26edeb39cca7 + FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd FloatingPanel: 935712d7a8076630135fbbd47f717700913efef9 + GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f + GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95 iOSSnapshotTestCase: 9ab44cb5aa62b84d31847f40680112e15ec579a6 IQKeyboardManager: 45a1fa55c1a5b02c61ac0fd7fd5b62bb4ad20d97 JSONRPCKit: b2991f2f242d72022083f9d869140dabd26d65c7 @@ -331,8 +395,10 @@ SPEC CHECKSUMS: MailchimpSDK: 794fd7cb1095e55c764d8a699eb11fb61849ed76 MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 Mixpanel-swift: 7c0b15c3ea96a997a989737612a3e62e72c1c561 + nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 PaperTrailLumberjack: 449587968d5aeb3eab2d4de041ffc61ee2d49f25 PromiseKit: 32c36425387e9cfc7f1206f27bfd906d0b53c0d6 + PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb QRCodeReaderViewController: e8f27d035b3e72b1d4b1c61ff66458287e3be0ff R.swift: c533450b0f7dc494e0993f5f1a1db925d84c3006 R.swift.Library: 0fc583cb55a99e28901299cc451614cad1161962 @@ -342,6 +408,7 @@ SPEC CHECKSUMS: SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c secp256k1_ios: ac9ef04e761f43c58012b28548afa91493761f17 SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4 + Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0 StatefulViewController: 4803bf900d44de26074344998e10e041113b5931 SwiftAlgorithms: 38dda4731d19027fdeee1125f973111bf3386b53 SwiftFormat: 61cda3819dc3a7d69795ce0430e1e1d53c4a4fb2 @@ -351,9 +418,10 @@ SPEC CHECKSUMS: TrezorCrypto: bfeea47a052dca2c77d4a39e1e183865e52de14d TrustKeystore: 3d8b4571c66648fb985015c96b3185440bb837fe TrustWalletCore: a92d85baa15932279cce925559e93695558cafdd + WalletConnectSwift: 6309bf3011b0b30e3e9d1e7449535302a9240f71 WalletConnectSwiftV2: e05838f7d04eb69197a23b37768365d8595bab32 xcbeautify: b2c6b50c9cab6414296898e94cd153e4ea879662 -PODFILE CHECKSUM: 2cbfb7871b3f51b6f4d02205bd5ad38b0b129e60 +PODFILE CHECKSUM: a630c6a4f2ab558045bf3ed60220f1050feb4cb1 COCOAPODS: 1.11.3