From a69f9d06ffe3c0f27d418fcaf9f9d8e2d43bc02e Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Sun, 23 Oct 2022 03:50:15 -0400 Subject: [PATCH] patreon: fix some build issues Signed-off-by: Joseph Mattello --- PVSupport/PVSupport.xcodeproj/project.pbxproj | 108 ++++++++++++++++++ .../Features/SaveStateSupport.swift | 10 +- .../xcshareddata/swiftpm/Package.resolved | 9 ++ 3 files changed, 122 insertions(+), 5 deletions(-) diff --git a/PVSupport/PVSupport.xcodeproj/project.pbxproj b/PVSupport/PVSupport.xcodeproj/project.pbxproj index 3f761c8593..5d70559eae 100644 --- a/PVSupport/PVSupport.xcodeproj/project.pbxproj +++ b/PVSupport/PVSupport.xcodeproj/project.pbxproj @@ -181,6 +181,30 @@ B3532B3F21A7B753006CDA0F /* PVSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3532B3E21A7B753006CDA0F /* PVSettingsTests.swift */; }; B3532C3621A925C2006CDA0F /* SortOption.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3532C3521A925C1006CDA0F /* SortOption.swift */; }; B3532C3721A925C2006CDA0F /* SortOption.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3532C3521A925C1006CDA0F /* SortOption.swift */; }; + B35497402905278A005B82C0 /* Benefit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35497382905278A005B82C0 /* Benefit.swift */; }; + B35497412905278A005B82C0 /* Benefit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35497382905278A005B82C0 /* Benefit.swift */; }; + B35497422905278A005B82C0 /* Benefit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35497382905278A005B82C0 /* Benefit.swift */; }; + B35497432905278A005B82C0 /* PatreonAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35497392905278A005B82C0 /* PatreonAPI.swift */; }; + B35497442905278A005B82C0 /* PatreonAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35497392905278A005B82C0 /* PatreonAPI.swift */; }; + B35497452905278A005B82C0 /* PatreonAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35497392905278A005B82C0 /* PatreonAPI.swift */; }; + B35497462905278A005B82C0 /* Campaign.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973A2905278A005B82C0 /* Campaign.swift */; }; + B35497472905278A005B82C0 /* Campaign.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973A2905278A005B82C0 /* Campaign.swift */; }; + B35497482905278A005B82C0 /* Campaign.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973A2905278A005B82C0 /* Campaign.swift */; }; + B35497492905278A005B82C0 /* Patron.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973B2905278A005B82C0 /* Patron.swift */; }; + B354974A2905278A005B82C0 /* Patron.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973B2905278A005B82C0 /* Patron.swift */; }; + B354974B2905278A005B82C0 /* Patron.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973B2905278A005B82C0 /* Patron.swift */; }; + B354974C2905278A005B82C0 /* Tier.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973C2905278A005B82C0 /* Tier.swift */; }; + B354974D2905278A005B82C0 /* Tier.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973C2905278A005B82C0 /* Tier.swift */; }; + B354974E2905278A005B82C0 /* Tier.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973C2905278A005B82C0 /* Tier.swift */; }; + B354974F2905278A005B82C0 /* PatreonAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973D2905278A005B82C0 /* PatreonAccount.swift */; }; + B35497502905278A005B82C0 /* PatreonAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973D2905278A005B82C0 /* PatreonAccount.swift */; }; + B35497512905278A005B82C0 /* PatreonAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973D2905278A005B82C0 /* PatreonAccount.swift */; }; + B35497522905278A005B82C0 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973F2905278A005B82C0 /* Keychain.swift */; }; + B35497532905278A005B82C0 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973F2905278A005B82C0 /* Keychain.swift */; }; + B35497542905278A005B82C0 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B354973F2905278A005B82C0 /* Keychain.swift */; }; + B3549757290527E8005B82C0 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = B3549756290527E8005B82C0 /* KeychainAccess */; }; + B3549759290527F0005B82C0 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = B3549758290527F0005B82C0 /* KeychainAccess */; }; + B354975B290527F5005B82C0 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = B354975A290527F5005B82C0 /* KeychainAccess */; }; B35E6C38207EE15D0040709A /* CoreOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35E6C36207EE15D0040709A /* CoreOptions.swift */; }; B364D4B42870E5F600B93A4B /* libretro.h in Headers */ = {isa = PBXBuildFile; fileRef = B34DC6D92867202D00B60497 /* libretro.h */; settings = {ATTRIBUTES = (Public, ); }; }; B364D4B52870E5F600B93A4B /* libretro.h in Headers */ = {isa = PBXBuildFile; fileRef = B34DC6D92867202D00B60497 /* libretro.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1210,6 +1234,13 @@ B3532B3621A7B736006CDA0F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; B3532B3E21A7B753006CDA0F /* PVSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PVSettingsTests.swift; sourceTree = ""; }; B3532C3521A925C1006CDA0F /* SortOption.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortOption.swift; sourceTree = ""; }; + B35497382905278A005B82C0 /* Benefit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Benefit.swift; sourceTree = ""; }; + B35497392905278A005B82C0 /* PatreonAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PatreonAPI.swift; sourceTree = ""; }; + B354973A2905278A005B82C0 /* Campaign.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Campaign.swift; sourceTree = ""; }; + B354973B2905278A005B82C0 /* Patron.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Patron.swift; sourceTree = ""; }; + B354973C2905278A005B82C0 /* Tier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tier.swift; sourceTree = ""; }; + B354973D2905278A005B82C0 /* PatreonAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PatreonAccount.swift; sourceTree = ""; }; + B354973F2905278A005B82C0 /* Keychain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Keychain.swift; sourceTree = ""; }; B35E6C36207EE15D0040709A /* CoreOptions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreOptions.swift; sourceTree = ""; }; B36C41012898776C00EAEF59 /* libretro-netplay.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libretro-netplay.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B36C41032898776C00EAEF59 /* retro_netplay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = retro_netplay.h; sourceTree = ""; }; @@ -1279,6 +1310,7 @@ B305EF87276B4E41003AE510 /* Foundation.framework in Frameworks */, B305EF89276B4E41003AE510 /* CocoaLumberjackSwiftLogBackend in Frameworks */, B305EF9C276B4FDD003AE510 /* CoreGraphics.framework in Frameworks */, + B354975B290527F5005B82C0 /* KeychainAccess in Frameworks */, B305EF9A276B4F0A003AE510 /* GameKit.framework in Frameworks */, B305EF8A276B4E41003AE510 /* AVFoundation.framework in Frameworks */, B305EF8B276B4E41003AE510 /* CocoaLumberjackSwift in Frameworks */, @@ -1340,6 +1372,7 @@ B324C3162191963B009F4EDC /* AVFoundation.framework in Frameworks */, B3CA5B5126E9E4D500687B27 /* CocoaLumberjack in Frameworks */, B3296E8926C67F6B0088AC32 /* CocoaLumberjackSwiftLogBackend in Frameworks */, + B3549759290527F0005B82C0 /* KeychainAccess in Frameworks */, B3CEC5C3279521EC004A7CC1 /* NSLogger in Frameworks */, B3AF6FDF219161C0000FA7F9 /* GameController.framework in Frameworks */, B3AF6FDD219161BC000FA7F9 /* Foundation.framework in Frameworks */, @@ -1356,6 +1389,7 @@ B3CA5B5326E9E4DC00687B27 /* CocoaLumberjack in Frameworks */, B336B8F426B398A900960A81 /* Reachability in Frameworks */, B3AF6FDA2191616C000FA7F9 /* Foundation.framework in Frameworks */, + B3549757290527E8005B82C0 /* KeychainAccess in Frameworks */, B3CEC5C127952165004A7CC1 /* NSLogger in Frameworks */, B3AF6FD821916168000FA7F9 /* GameController.framework in Frameworks */, B3296E8726C67F660088AC32 /* CocoaLumberjackSwiftLogBackend in Frameworks */, @@ -1466,6 +1500,8 @@ B30E94892793C77700871E57 /* PVSupport */ = { isa = PBXGroup; children = ( + B354973E2905278A005B82C0 /* Keychain */, + B35497372905278A005B82C0 /* Patreon */, B30F80112905169A00F21217 /* System */, 1ACEA69017F748F80031B1C9 /* Audio */, B3AB36DC2187F4C4009D9244 /* Controller */, @@ -3383,6 +3419,27 @@ path = Tests; sourceTree = ""; }; + B35497372905278A005B82C0 /* Patreon */ = { + isa = PBXGroup; + children = ( + B35497382905278A005B82C0 /* Benefit.swift */, + B35497392905278A005B82C0 /* PatreonAPI.swift */, + B354973A2905278A005B82C0 /* Campaign.swift */, + B354973B2905278A005B82C0 /* Patron.swift */, + B354973C2905278A005B82C0 /* Tier.swift */, + B354973D2905278A005B82C0 /* PatreonAccount.swift */, + ); + path = Patreon; + sourceTree = SOURCE_ROOT; + }; + B354973E2905278A005B82C0 /* Keychain */ = { + isa = PBXGroup; + children = ( + B354973F2905278A005B82C0 /* Keychain.swift */, + ); + path = Keychain; + sourceTree = SOURCE_ROOT; + }; B36C41022898776C00EAEF59 /* retro-netplay */ = { isa = PBXGroup; children = ( @@ -3677,6 +3734,7 @@ B305EF42276B4E41003AE510 /* CocoaLumberjackSwift */, B305EF46276B4E41003AE510 /* CocoaLumberjackSwiftLogBackend */, B305EF47276B4E41003AE510 /* CocoaLumberjack */, + B354975A290527F5005B82C0 /* KeychainAccess */, ); productName = "PVSupportTV Framework"; productReference = B305EF91276B4E41003AE510 /* PVSupport.framework */; @@ -3815,6 +3873,7 @@ B3296E8826C67F6B0088AC32 /* CocoaLumberjackSwiftLogBackend */, B3CA5B5026E9E4D500687B27 /* CocoaLumberjack */, B3CEC5C2279521EC004A7CC1 /* NSLogger */, + B3549758290527F0005B82C0 /* KeychainAccess */, ); productName = "PVSupportTV Framework"; productReference = B3C96E9E1D62C3A3003F1E93 /* PVSupport.framework */; @@ -3844,6 +3903,7 @@ B3296E8626C67F660088AC32 /* CocoaLumberjackSwiftLogBackend */, B3CA5B5226E9E4DC00687B27 /* CocoaLumberjack */, B3CEC5C027952165004A7CC1 /* NSLogger */, + B3549756290527E8005B82C0 /* KeychainAccess */, ); productName = "PVSupportTV Framework"; productReference = B3C96ED81D62C5E7003F1E93 /* PVSupport.framework */; @@ -3897,6 +3957,7 @@ B336B8EF26B3985B00960A81 /* XCRemoteSwiftPackageReference "CocoaLumberjack" */, B336B8F226B398A900960A81 /* XCRemoteSwiftPackageReference "Reachability.swift" */, B3CEC5BF27952163004A7CC1 /* XCRemoteSwiftPackageReference "NSLogger" */, + B3549755290527E8005B82C0 /* XCRemoteSwiftPackageReference "KeychainAccess" */, ); productRefGroup = 1ACEA64517F7467D0031B1C9 /* Products */; projectDirPath = ""; @@ -3976,15 +4037,18 @@ B305EF60276B4E41003AE510 /* PViCade8BitdoController.swift in Sources */, B305EF61276B4E41003AE510 /* PViCadeInputAxis.swift in Sources */, B305EF62276B4E41003AE510 /* DDLogLevel+CustomStringConvertable.swift in Sources */, + B35497482905278A005B82C0 /* Campaign.swift in Sources */, B33FB306279BE21C0013AAD8 /* CoreOptionRange.swift in Sources */, B305EF63276B4E41003AE510 /* iCadeState.swift in Sources */, B305EF64276B4E41003AE510 /* CoreOptions.swift in Sources */, B33FB2F5279BE1330013AAD8 /* CoreOptions+Protocols.swift in Sources */, B305EF65276B4E41003AE510 /* UIDeviceExtension.swift in Sources */, B30F8015290516B900F21217 /* ScreenType.swift in Sources */, + B35497422905278A005B82C0 /* Benefit.swift in Sources */, B305EF66276B4E41003AE510 /* SaveStateSupport.swift in Sources */, B305EF67276B4E41003AE510 /* iCadeControllerSetting.swift in Sources */, B305EF68276B4E41003AE510 /* PViCadeController.swift in Sources */, + B35497512905278A005B82C0 /* PatreonAccount.swift in Sources */, B305EF69276B4E41003AE510 /* CocoaLumberjack+swift-log.swift in Sources */, B305EF6A276B4E41003AE510 /* CARingBuffer.cpp in Sources */, B305EF6B276B4E41003AE510 /* CocoaLumberjack+NSLogger.swift in Sources */, @@ -3993,6 +4057,7 @@ B33FB30A279BE2460013AAD8 /* CoreOptionValue.swift in Sources */, B33FB2F1279BE0F50013AAD8 /* CoreOptionValueDisplay.swift in Sources */, B33FB2FA279BE1730013AAD8 /* CoreOptionMultiValue.swift in Sources */, + B354974B2905278A005B82C0 /* Patron.swift in Sources */, B305EF6E276B4E41003AE510 /* NSFileManager+OEHashingAdditions.m in Sources */, B305EF6F276B4E41003AE510 /* PViCadeGamepadButtonInput.swift in Sources */, B305EF70276B4E41003AE510 /* SortOption.swift in Sources */, @@ -4004,6 +4069,7 @@ B305EF74276B4E41003AE510 /* PVProvenanceLogging.m in Sources */, B305EF75276B4E41003AE510 /* PViCadeReader.swift in Sources */, B305EF76276B4E41003AE510 /* RealTimeThread.m in Sources */, + B354974E2905278A005B82C0 /* Tier.swift in Sources */, B305EF77276B4E41003AE510 /* DiscSwappable.swift in Sources */, B305EF78276B4E41003AE510 /* NSObject+PVAbstractAdditions.m in Sources */, B3D0EE26277FE880002DC0A5 /* HapticsManager.swift in Sources */, @@ -4014,7 +4080,9 @@ B33FB2FE279BE18F0013AAD8 /* CoreOptionEnumValue.swift in Sources */, B39C29C927A0FAE00078D028 /* OERingBuffer.m in Sources */, B33FB302279BE1E40013AAD8 /* OptionDependency.swift in Sources */, + B35497542905278A005B82C0 /* Keychain.swift in Sources */, B305EF7E276B4E41003AE510 /* PViCadeMocuteController.swift in Sources */, + B35497452905278A005B82C0 /* PatreonAPI.swift in Sources */, B305EF7F276B4E41003AE510 /* CocoaLumberExtensions.swift in Sources */, B305EF80276B4E41003AE510 /* iCadeReaderView.swift in Sources */, B305EF81276B4E41003AE510 /* PViCadeGamepad.swift in Sources */, @@ -4115,15 +4183,18 @@ B35E6C38207EE15D0040709A /* CoreOptions.swift in Sources */, B3AB37EC21881B7B009D9244 /* PViCade8BitdoController.swift in Sources */, B3AB37DD21881869009D9244 /* PViCadeInputAxis.swift in Sources */, + B35497472905278A005B82C0 /* Campaign.swift in Sources */, B3296EA026C685450088AC32 /* DDLogLevel+CustomStringConvertable.swift in Sources */, B33FB305279BE21C0013AAD8 /* CoreOptionRange.swift in Sources */, B3AB37B421880FA6009D9244 /* iCadeState.swift in Sources */, B3A74C8B20522B04001D3D2E /* PVEmulatorCore.swift in Sources */, B33FB2F4279BE1330013AAD8 /* CoreOptions+Protocols.swift in Sources */, B30F8014290516B900F21217 /* ScreenType.swift in Sources */, + B35497412905278A005B82C0 /* Benefit.swift in Sources */, B3CDEEC921D4C4E5000C55F7 /* SaveStateSupport.swift in Sources */, B3AB37E821881B6E009D9244 /* iCadeControllerSetting.swift in Sources */, B3AB37E121881956009D9244 /* PViCadeController.swift in Sources */, + B35497502905278A005B82C0 /* PatreonAccount.swift in Sources */, B372638426EA015700E95488 /* CocoaLumberjack+swift-log.swift in Sources */, B3AB37DF21881874009D9244 /* PViCadeGamepadDirectionPad.swift in Sources */, B3296E8226C67EFA0088AC32 /* CocoaLumberjack+NSLogger.swift in Sources */, @@ -4132,6 +4203,7 @@ B3AB37DB21881671009D9244 /* PViCadeGamepadButtonInput.swift in Sources */, B33FB309279BE2460013AAD8 /* CoreOptionValue.swift in Sources */, B33FB2F0279BE0F50013AAD8 /* CoreOptionValueDisplay.swift in Sources */, + B354974A2905278A005B82C0 /* Patron.swift in Sources */, B33FB2F9279BE1730013AAD8 /* CoreOptionMultiValue.swift in Sources */, B3C96EAF1D62C3C7003F1E93 /* NSObject+PVAbstractAdditions.m in Sources */, B3532C3721A925C2006CDA0F /* SortOption.swift in Sources */, @@ -4143,6 +4215,7 @@ B3FA5D661D6B90BD00060D71 /* PVEmulatorCore.m in Sources */, B3447E8B218B7E4B00557ACE /* CARingBuffer.cpp in Sources */, B3D73D401EA15BB20023925B /* NSFileManager+OEHashingAdditions.m in Sources */, + B354974D2905278A005B82C0 /* Tier.swift in Sources */, B3CDEEC021D4C41D000C55F7 /* DiscSwappable.swift in Sources */, B3F0846D2188CA7A00FF39EE /* CocoaLumberExtensions.swift in Sources */, B3D0EE21277FE85F002DC0A5 /* HapticsManager.swift in Sources */, @@ -4153,7 +4226,9 @@ B33FB2FD279BE18F0013AAD8 /* CoreOptionEnumValue.swift in Sources */, B39C29C827A0FADF0078D028 /* OERingBuffer.m in Sources */, B33FB301279BE1E40013AAD8 /* OptionDependency.swift in Sources */, + B35497532905278A005B82C0 /* Keychain.swift in Sources */, B302F8A320B73D6500C5E502 /* PVLogEntry.m in Sources */, + B35497442905278A005B82C0 /* PatreonAPI.swift in Sources */, B3AB37ED21881B7B009D9244 /* PViCadeMocuteController.swift in Sources */, B3AB37BE218812BC009D9244 /* iCadeReaderView.swift in Sources */, B3E6DADF20B7BF8600454DD4 /* UIDeviceExtension.swift in Sources */, @@ -4174,15 +4249,18 @@ B3AB37E921881B7A009D9244 /* PViCade8BitdoController.swift in Sources */, B3AB37DC21881869009D9244 /* PViCadeInputAxis.swift in Sources */, B3296E9F26C685450088AC32 /* DDLogLevel+CustomStringConvertable.swift in Sources */, + B35497462905278A005B82C0 /* Campaign.swift in Sources */, B33FB304279BE21C0013AAD8 /* CoreOptionRange.swift in Sources */, B3AB37B321880FA5009D9244 /* iCadeState.swift in Sources */, B34AB57A2106DC6100C45F09 /* CoreOptions.swift in Sources */, B33FB2F3279BE1320013AAD8 /* CoreOptions+Protocols.swift in Sources */, B34AB5762106DC4C00C45F09 /* UIDeviceExtension.swift in Sources */, B30F8013290516B900F21217 /* ScreenType.swift in Sources */, + B35497402905278A005B82C0 /* Benefit.swift in Sources */, B3CDEEC821D4C4E5000C55F7 /* SaveStateSupport.swift in Sources */, B3AB37E721881B6D009D9244 /* iCadeControllerSetting.swift in Sources */, B3AB37E021881955009D9244 /* PViCadeController.swift in Sources */, + B354974F2905278A005B82C0 /* PatreonAccount.swift in Sources */, B372638526EA015800E95488 /* CocoaLumberjack+swift-log.swift in Sources */, B3447E8A218B7E4B00557ACE /* CARingBuffer.cpp in Sources */, B3296E8126C67EFA0088AC32 /* CocoaLumberjack+NSLogger.swift in Sources */, @@ -4191,6 +4269,7 @@ B33FB308279BE2460013AAD8 /* CoreOptionValue.swift in Sources */, B33FB2EF279BE0F50013AAD8 /* CoreOptionValueDisplay.swift in Sources */, B33FB2F8279BE1730013AAD8 /* CoreOptionMultiValue.swift in Sources */, + B35497492905278A005B82C0 /* Patron.swift in Sources */, B34AB57C2106DC6100C45F09 /* NSFileManager+OEHashingAdditions.m in Sources */, B3AB37DA21881670009D9244 /* PViCadeGamepadButtonInput.swift in Sources */, B3532C3621A925C2006CDA0F /* SortOption.swift in Sources */, @@ -4202,6 +4281,7 @@ B34AB5732106DC3700C45F09 /* PVProvenanceLogging.m in Sources */, B3AB37BF218814A7009D9244 /* PViCadeReader.swift in Sources */, B34AB57D2106DC6100C45F09 /* RealTimeThread.m in Sources */, + B354974C2905278A005B82C0 /* Tier.swift in Sources */, B3CDEEBF21D4C41D000C55F7 /* DiscSwappable.swift in Sources */, B34AB57B2106DC6100C45F09 /* NSObject+PVAbstractAdditions.m in Sources */, B3D0EE20277FE85F002DC0A5 /* HapticsManager.swift in Sources */, @@ -4212,7 +4292,9 @@ B33FB2FC279BE18F0013AAD8 /* CoreOptionEnumValue.swift in Sources */, B39C29C727A0FADF0078D028 /* OERingBuffer.m in Sources */, B33FB300279BE1E40013AAD8 /* OptionDependency.swift in Sources */, + B35497522905278A005B82C0 /* Keychain.swift in Sources */, B3AB37EA21881B7A009D9244 /* PViCadeMocuteController.swift in Sources */, + B35497432905278A005B82C0 /* PatreonAPI.swift in Sources */, B3F0846C2188CA7A00FF39EE /* CocoaLumberExtensions.swift in Sources */, B3AB37BD218812BB009D9244 /* iCadeReaderView.swift in Sources */, B3AB37E321881A82009D9244 /* PViCadeGamepad.swift in Sources */, @@ -4349,6 +4431,7 @@ SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 13.0; VALIDATE_WORKSPACE = YES; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -4404,6 +4487,7 @@ TVOS_DEPLOYMENT_TARGET = 13.0; VALIDATE_PRODUCT = YES; VALIDATE_WORKSPACE = YES; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; }; @@ -4701,6 +4785,7 @@ TVOS_DEPLOYMENT_TARGET = 13.0; VALIDATE_PRODUCT = YES; VALIDATE_WORKSPACE = YES; + WATCHOS_DEPLOYMENT_TARGET = 9.0; }; name = Archive; }; @@ -5728,6 +5813,14 @@ minimumVersion = 5.1.0; }; }; + B3549755290527E8005B82C0 /* XCRemoteSwiftPackageReference "KeychainAccess" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 4.0.0; + }; + }; B3CEC5BF27952163004A7CC1 /* XCRemoteSwiftPackageReference "NSLogger" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/fpillet/NSLogger"; @@ -5779,6 +5872,21 @@ package = B336B8EF26B3985B00960A81 /* XCRemoteSwiftPackageReference "CocoaLumberjack" */; productName = CocoaLumberjackSwift; }; + B3549756290527E8005B82C0 /* KeychainAccess */ = { + isa = XCSwiftPackageProductDependency; + package = B3549755290527E8005B82C0 /* XCRemoteSwiftPackageReference "KeychainAccess" */; + productName = KeychainAccess; + }; + B3549758290527F0005B82C0 /* KeychainAccess */ = { + isa = XCSwiftPackageProductDependency; + package = B3549755290527E8005B82C0 /* XCRemoteSwiftPackageReference "KeychainAccess" */; + productName = KeychainAccess; + }; + B354975A290527F5005B82C0 /* KeychainAccess */ = { + isa = XCSwiftPackageProductDependency; + package = B3549755290527E8005B82C0 /* XCRemoteSwiftPackageReference "KeychainAccess" */; + productName = KeychainAccess; + }; B372637426EA013100E95488 /* CocoaLumberjack */ = { isa = XCSwiftPackageProductDependency; package = B336B8EF26B3985B00960A81 /* XCRemoteSwiftPackageReference "CocoaLumberjack" */; diff --git a/PVSupport/Sources/PVSupport/EmulatorCore/Features/SaveStateSupport.swift b/PVSupport/Sources/PVSupport/EmulatorCore/Features/SaveStateSupport.swift index c9de6bb3a7..d6dcb71a84 100644 --- a/PVSupport/Sources/PVSupport/EmulatorCore/Features/SaveStateSupport.swift +++ b/PVSupport/Sources/PVSupport/EmulatorCore/Features/SaveStateSupport.swift @@ -8,17 +8,17 @@ import Foundation -public enum Result { +public enum SaveResult { case success case error(Error) } public protocol SaveStateSupport { - func loadState(atPath: URL) -> Result - func saveState(toPath: URL) -> Result + func loadState(atPath: URL) -> SaveResult + func saveState(toPath: URL) -> SaveResult } public protocol AsyncSaveStateSupport { - func loadState(atPath: URL, completion: @escaping (Result) -> Void) throws - func saveState(toPath: URL, completion: @escaping (Result) -> Void) throws + func loadState(atPath: URL, completion: @escaping (SaveResult) -> Void) throws + func saveState(toPath: URL, completion: @escaping (SaveResult) -> Void) throws } diff --git a/Provenance.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Provenance.xcworkspace/xcshareddata/swiftpm/Package.resolved index 0622bb68fa..7face1f109 100644 --- a/Provenance.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Provenance.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -27,6 +27,15 @@ "version" : "3.7.4" } }, + { + "identity" : "keychainaccess", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kishikawakatsumi/KeychainAccess.git", + "state" : { + "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7", + "version" : "4.2.2" + } + }, { "identity" : "nslogger", "kind" : "remoteSourceControl",