diff --git a/Cartfile b/Cartfile index dd23c5e0..062ccf06 100644 --- a/Cartfile +++ b/Cartfile @@ -7,7 +7,6 @@ binary "https://icepa.github.io/Tor.framework/Tor.json" == 400.6.3 github "danielgindi/Charts" ~> 3.3.0 github "JohnEstropia/CoreStore" "develop" github "xmartlabs/Eureka" ~> 5.2 -github "krzyzanowskim/CryptoSwift" binary "https://vergecurrency.github.io/BitcoinKit/BitcoinKit.json" ~> 1.2.2 github "Swinject/Swinject" ~> 2.6.0 github "Swinject/SwinjectStoryboard" "master" diff --git a/Cartfile.resolved b/Cartfile.resolved index 3a777718..b61555ea 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -10,5 +10,4 @@ github "evgenyneu/keychain-swift" "19.0.0" github "gmotzespina/QRCode" "c07e17120ffb34fdfa7ec1f3a85bc1afd39cfdc2" github "google/promises" "1.2.8" github "hackiftekhar/IQKeyboardManager" "v6.5.5" -github "krzyzanowskim/CryptoSwift" "1.3.0" github "xmartlabs/Eureka" "5.2.1" diff --git a/VergeiOS.xcodeproj/project.pbxproj b/VergeiOS.xcodeproj/project.pbxproj index a67cc22c..eb31f9ca 100644 --- a/VergeiOS.xcodeproj/project.pbxproj +++ b/VergeiOS.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -99,7 +99,6 @@ A339393421B352B50010CC4A /* PaperkeyShowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A339393321B352B50010CC4A /* PaperkeyShowViewController.swift */; }; A339393621B877750010CC4A /* PassphraseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A339393521B877750010CC4A /* PassphraseViewController.swift */; }; A339393A21B877AE0010CC4A /* TorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A339393921B877AE0010CC4A /* TorViewController.swift */; }; - A33B759421A22F5A00030CCF /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A33B759321A22F5A00030CCF /* CryptoSwift.framework */; }; A33B759E21A5CDD400030CCF /* BitcoinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A33B759D21A5CDD400030CCF /* BitcoinKit.framework */; }; A33B75C021A61A3500030CCF /* CurrencyInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = A33B75BF21A61A3500030CCF /* CurrencyInput.swift */; }; A33B75C421A8917700030CCF /* Settings.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A33B75C321A8917700030CCF /* Settings.storyboard */; }; @@ -113,6 +112,7 @@ A3408E56217687F9009F0C9D /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A3408E55217687F9009F0C9D /* Charts.framework */; }; A3408E5821768AF4009F0C9D /* Date+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3408E5721768AF4009F0C9D /* Date+Extensions.swift */; }; A341F792243FBF6B00F45BA9 /* UIStoryboard+Statics.swift in Sources */ = {isa = PBXBuildFile; fileRef = A341F791243FBF6B00F45BA9 /* UIStoryboard+Statics.swift */; }; + A341F795243FC72500F45BA9 /* CryptoSwift in Frameworks */ = {isa = PBXBuildFile; productRef = A341F794243FC72500F45BA9 /* CryptoSwift */; }; A3478B4923647FF20018149C /* WalletManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3478B4823647FF20018149C /* WalletManager.swift */; }; A3478B4B236480230018149C /* WalletManagerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3478B4A236480230018149C /* WalletManagerProtocol.swift */; }; A3549DD521B9DB5A0091EAC3 /* PassphraseConfirmationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3549DD421B9DB5A0091EAC3 /* PassphraseConfirmationViewController.swift */; }; @@ -527,7 +527,6 @@ A339393321B352B50010CC4A /* PaperkeyShowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaperkeyShowViewController.swift; sourceTree = ""; }; A339393521B877750010CC4A /* PassphraseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PassphraseViewController.swift; sourceTree = ""; }; A339393921B877AE0010CC4A /* TorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TorViewController.swift; sourceTree = ""; }; - A33B759321A22F5A00030CCF /* CryptoSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CryptoSwift.framework; path = Carthage/Build/iOS/CryptoSwift.framework; sourceTree = ""; }; A33B759D21A5CDD400030CCF /* BitcoinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BitcoinKit.framework; path = Carthage/Build/iOS/BitcoinKit.framework; sourceTree = ""; }; A33B75BF21A61A3500030CCF /* CurrencyInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyInput.swift; sourceTree = ""; }; A33B75C321A8917700030CCF /* Settings.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Settings.storyboard; sourceTree = ""; }; @@ -781,11 +780,11 @@ A3E32B19225D52D9001A8B0E /* Swinject.framework in Frameworks */, A302D30A21203B6700EA8091 /* CoreGraphics.framework in Frameworks */, A3647288217E604B001B1B18 /* CoreStore.framework in Frameworks */, - A33B759421A22F5A00030CCF /* CryptoSwift.framework in Frameworks */, A33B759E21A5CDD400030CCF /* BitcoinKit.framework in Frameworks */, A385829C2305F2430048C1B5 /* FBLPromises.framework in Frameworks */, A338E6A0210DC037000D44EE /* IQKeyboardManagerSwift.framework in Frameworks */, A3B2E25B214836B600C31719 /* HGPlaceholders.framework in Frameworks */, + A341F795243FC72500F45BA9 /* CryptoSwift in Frameworks */, A338E6CE21110A0A000D44EE /* QRCode.framework in Frameworks */, A325665F211A2219006FB08A /* SwiftyJSON.framework in Frameworks */, A3647286217CF9A9001B1B18 /* Eureka.framework in Frameworks */, @@ -1322,7 +1321,6 @@ A3E32B17225D52D9001A8B0E /* Swinject.framework */, A3E32B16225D52D9001A8B0E /* SwinjectStoryboard.framework */, A33B759D21A5CDD400030CCF /* BitcoinKit.framework */, - A33B759321A22F5A00030CCF /* CryptoSwift.framework */, A3647287217E604B001B1B18 /* CoreStore.framework */, A3647285217CF9A9001B1B18 /* Eureka.framework */, A3408E55217687F9009F0C9D /* Charts.framework */, @@ -1740,6 +1738,9 @@ CA522EB0220318B000331B0F /* PBXTargetDependency */, ); name = VergeiOS; + packageProductDependencies = ( + A341F794243FC72500F45BA9 /* CryptoSwift */, + ); productName = VergeCurrencyWallet; productReference = A33F6A6C20EEE485001492C2 /* VergeiOS.app */; productType = "com.apple.product-type.application"; @@ -1910,6 +1911,9 @@ "zh-Hans", ); mainGroup = A33F6A6320EEE485001492C2; + packageReferences = ( + A341F793243FC72500F45BA9 /* XCRemoteSwiftPackageReference "CryptoSwift" */, + ); productRefGroup = A33F6A6D20EEE485001492C2 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -2048,7 +2052,6 @@ "$(SRCROOT)/Carthage/Build/iOS/CoreStore.framework", "$(SRCROOT)/Carthage/Build/iOS/Eureka.framework", "$(SRCROOT)/Carthage/Build/iOS/BitcoinKit.framework", - "$(SRCROOT)/Carthage/Build/iOS/CryptoSwift.framework", "$(SRCROOT)/Carthage/Build/iOS/Swinject.framework", "$(SRCROOT)/Carthage/Build/iOS/SwinjectStoryboard.framework", "$(SRCROOT)/Carthage/Build/iOS/Promises.framework", @@ -2066,7 +2069,6 @@ "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CoreStore.framework", "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Eureka.framework", "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/BitcoinKit.framework", - "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CryptoSwift.framework", "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Swinject.framework", "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/SwinjectStoryboard.framework", "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Promises.framework", @@ -2983,6 +2985,25 @@ }; /* End XCConfigurationList section */ +/* Begin XCRemoteSwiftPackageReference section */ + A341F793243FC72500F45BA9 /* XCRemoteSwiftPackageReference "CryptoSwift" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/krzyzanowskim/CryptoSwift.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 1.3.1; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + A341F794243FC72500F45BA9 /* CryptoSwift */ = { + isa = XCSwiftPackageProductDependency; + package = A341F793243FC72500F45BA9 /* XCRemoteSwiftPackageReference "CryptoSwift" */; + productName = CryptoSwift; + }; +/* End XCSwiftPackageProductDependency section */ + /* Begin XCVersionGroup section */ A33F6A7620EEE485001492C2 /* CoreData.xcdatamodeld */ = { isa = XCVersionGroup; diff --git a/VergeiOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/VergeiOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000..0fb47082 --- /dev/null +++ b/VergeiOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "CryptoSwift", + "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git", + "state": { + "branch": null, + "revision": "39f08ac5269361a50c08ce1e2f41989bfc4b1ec8", + "version": "1.3.1" + } + } + ] + }, + "version": 1 +}