diff --git a/.gitmodules b/.gitmodules index 68dd10e96..d5c3847fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "submodules/RSWeb"] - path = submodules/RSWeb - url = https://github.com/brentsimmons/RSWeb [submodule "submodules/RSParser"] path = submodules/RSParser url = https://github.com/brentsimmons/RSParser diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index b80bf6d87..be282fcd3 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -147,7 +147,6 @@ 513146B3235A81A400387FDC /* AddWebFeedIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */; }; 513146B6235A8FD000387FDC /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */; }; 513146B8235A8FD000387FDC /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; }; - 513146BC235A8FD000387FDC /* RSWeb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FA320DD8D0500CA8CF5 /* RSWeb.framework */; }; 513146BF235A8FDB00387FDC /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; }; 513146C1235A8FDB00387FDC /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; }; 513146C3235A8FDB00387FDC /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; }; @@ -160,6 +159,14 @@ 51333D1724685D2E00EB5C91 /* AddRedditFeedWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51333D1524685D2E00EB5C91 /* AddRedditFeedWindowController.swift */; }; 51333D3B2468615D00EB5C91 /* AddRedditFeedSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 51333D392468615D00EB5C91 /* AddRedditFeedSheet.xib */; }; 51333D3C2468615D00EB5C91 /* AddRedditFeedSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 51333D392468615D00EB5C91 /* AddRedditFeedSheet.xib */; }; + 51383A3224D1F90E0027E272 /* RSWeb in Frameworks */ = {isa = PBXBuildFile; productRef = 51383A3124D1F90E0027E272 /* RSWeb */; }; + 51383A3324D1F90E0027E272 /* RSWeb in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51383A3124D1F90E0027E272 /* RSWeb */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 51383A3524D1F91F0027E272 /* RSWeb in Frameworks */ = {isa = PBXBuildFile; productRef = 51383A3424D1F91F0027E272 /* RSWeb */; }; + 51383A3624D1F91F0027E272 /* RSWeb in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51383A3424D1F91F0027E272 /* RSWeb */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 51383A3824D1F9470027E272 /* RSWeb in Frameworks */ = {isa = PBXBuildFile; productRef = 51383A3724D1F9470027E272 /* RSWeb */; }; + 51383A3924D1F9470027E272 /* RSWeb in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51383A3724D1F9470027E272 /* RSWeb */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 51383A3B24D1F9510027E272 /* RSWeb in Frameworks */ = {isa = PBXBuildFile; productRef = 51383A3A24D1F9510027E272 /* RSWeb */; }; + 51383A3C24D1F9510027E272 /* RSWeb in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51383A3A24D1F9510027E272 /* RSWeb */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 51392D1B24AC19A000BE0D35 /* SidebarExpandedContainers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51392D1A24AC19A000BE0D35 /* SidebarExpandedContainers.swift */; }; 51392D1C24AC19A000BE0D35 /* SidebarExpandedContainers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51392D1A24AC19A000BE0D35 /* SidebarExpandedContainers.swift */; }; 513C5CE9232571C2003D4054 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513C5CE8232571C2003D4054 /* ShareViewController.swift */; }; @@ -170,7 +177,6 @@ 513C5D02232574B4003D4054 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; }; 513C5D06232574C0003D4054 /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */; }; 513C5D08232574C6003D4054 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; }; - 513C5D0A232574D2003D4054 /* RSWeb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FA320DD8D0500CA8CF5 /* RSWeb.framework */; }; 513C5D0E232574E4003D4054 /* SyncDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C01228B6EB50055115A /* SyncDatabase.framework */; }; 513CCF2524880C1500C55709 /* MasterFeedTableViewIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513CCF08248808BA00C55709 /* MasterFeedTableViewIdentifier.swift */; }; 51408B7E24A9EC6F0073CF4E /* SidebarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51408B7D24A9EC6F0073CF4E /* SidebarItem.swift */; }; @@ -426,8 +432,6 @@ 51C451BA226377C900C03939 /* Articles.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51C451BD226377D000C03939 /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; }; 51C451BE226377D000C03939 /* Account.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 51C451D22264C7F200C03939 /* RSWeb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FA320DD8D0500CA8CF5 /* RSWeb.framework */; }; - 51C451D32264C7F200C03939 /* RSWeb.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FA320DD8D0500CA8CF5 /* RSWeb.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51C451E42264C80600C03939 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; }; 51C451E52264C80600C03939 /* RSParser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51C451E82264C81000C03939 /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */; }; @@ -514,8 +518,6 @@ 51E4988A24A8061400B667CB /* RSDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC420DD8E0C00CA8CF5 /* RSDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51E4988B24A8061400B667CB /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; }; 51E4988C24A8061400B667CB /* RSParser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 51E4988F24A8061400B667CB /* RSWeb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FA320DD8D0500CA8CF5 /* RSWeb.framework */; }; - 51E4989024A8061400B667CB /* RSWeb.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FA320DD8D0500CA8CF5 /* RSWeb.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51E4989124A8061400B667CB /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; }; 51E4989224A8061400B667CB /* Secrets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51E4989324A8061400B667CB /* SyncDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C01228B6EB50055115A /* SyncDatabase.framework */; }; @@ -532,8 +534,6 @@ 51E498A524A8069300B667CB /* RSDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51E498A624A8069300B667CB /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; }; 51E498A724A8069300B667CB /* RSParser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 51E498AA24A8069300B667CB /* RSWeb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F9F20DD8D0500CA8CF5 /* RSWeb.framework */; }; - 51E498AB24A8069300B667CB /* RSWeb.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F9F20DD8D0500CA8CF5 /* RSWeb.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51E498AC24A8069300B667CB /* Secrets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; }; 51E498AD24A8069300B667CB /* Secrets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5102FD7B244008A700534F17 /* Secrets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 51E498AE24A8069300B667CB /* SyncDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C01228B6EB50055115A /* SyncDatabase.framework */; }; @@ -873,7 +873,6 @@ 65ED403E235DEF6C0081F399 /* TimelineCellAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97701ED9EC04007D329B /* TimelineCellAppearance.swift */; }; 65ED403F235DEF6C0081F399 /* ArticleRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A977D1ED9EC42007D329B /* ArticleRenderer.swift */; }; 65ED4040235DEF6C0081F399 /* GeneralPrefencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C9FC6D22629E1200D921D6 /* GeneralPrefencesViewController.swift */; }; - 65ED4043235DEF6C0081F399 /* RSWeb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F9F20DD8D0500CA8CF5 /* RSWeb.framework */; }; 65ED4044235DEF6C0081F399 /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */; }; 65ED4046235DEF6C0081F399 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; }; 65ED4047235DEF6C0081F399 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; }; @@ -911,7 +910,6 @@ 65ED406C235DEF6C0081F399 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 84C9FC8922629E8F00D921D6 /* Credits.rtf */; }; 65ED406D235DEF6C0081F399 /* Inspector.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 84BBB12B20142A4700F054F5 /* Inspector.storyboard */; }; 65ED406E235DEF6C0081F399 /* AddWebFeedSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 848363002262A3BC00DA1D35 /* AddWebFeedSheet.xib */; }; - 65ED4071235DEF6C0081F399 /* RSWeb.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F9F20DD8D0500CA8CF5 /* RSWeb.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 65ED4072235DEF6C0081F399 /* RSDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 65ED4074235DEF6C0081F399 /* ArticlesDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 65ED4076235DEF6C0081F399 /* Account.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -1029,8 +1027,6 @@ 84BAE64921CEDAF20046DB56 /* CrashReporterWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84BAE64821CEDAF20046DB56 /* CrashReporterWindow.xib */; }; 84BBB12D20142A4700F054F5 /* Inspector.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 84BBB12B20142A4700F054F5 /* Inspector.storyboard */; }; 84BBB12E20142A4700F054F5 /* InspectorWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84BBB12C20142A4700F054F5 /* InspectorWindowController.swift */; }; - 84C37FA920DD8D9000CA8CF5 /* RSWeb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F9F20DD8D0500CA8CF5 /* RSWeb.framework */; }; - 84C37FAA20DD8D9000CA8CF5 /* RSWeb.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F9F20DD8D0500CA8CF5 /* RSWeb.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 84C37FB520DD8DBB00CA8CF5 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; }; 84C37FB620DD8DBB00CA8CF5 /* RSParser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 84C37FC520DD8E1D00CA8CF5 /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */; }; @@ -1183,13 +1179,6 @@ remoteGlobalIDString = 848934F51F62484F00CEBD24; remoteInfo = Account; }; - 65ED3FA6235DEF6C0081F399 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 849C08B51E0CAC85006B03FA; - remoteInfo = RSWeb; - }; 65ED3FAA235DEF6C0081F399 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */; @@ -1456,34 +1445,6 @@ remoteGlobalIDString = 84FF5F8D1EFA285800C15A01; remoteInfo = RSParserTests; }; - 84C37F9E20DD8D0500CA8CF5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 849C08B61E0CAC85006B03FA; - remoteInfo = RSWeb; - }; - 84C37FA020DD8D0500CA8CF5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 849C08BF1E0CAC86006B03FA; - remoteInfo = RSWebTests; - }; - 84C37FA220DD8D0500CA8CF5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 849C08D51E0CACA3006B03FA; - remoteInfo = RSWebiOS; - }; - 84C37FAB20DD8D9000CA8CF5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 849C08B51E0CAC85006B03FA; - remoteInfo = RSWeb; - }; 84C37FB720DD8DBB00CA8CF5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */; @@ -1563,9 +1524,9 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 51C451D32264C7F200C03939 /* RSWeb.framework in Embed Frameworks */, 51C451F92264C83E00C03939 /* Account.framework in Embed Frameworks */, 510ECA4624D1E010001C31A6 /* RSTree in Embed Frameworks */, + 51383A3624D1F91F0027E272 /* RSWeb in Embed Frameworks */, 51C451F12264C83100C03939 /* ArticlesDatabase.framework in Embed Frameworks */, 51C451F52264C83900C03939 /* Articles.framework in Embed Frameworks */, 51C451E92264C81000C03939 /* RSDatabase.framework in Embed Frameworks */, @@ -1583,10 +1544,10 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 51E4989024A8061400B667CB /* RSWeb.framework in Embed Frameworks */, 51E4988A24A8061400B667CB /* RSDatabase.framework in Embed Frameworks */, 51E4988024A8061400B667CB /* Account.framework in Embed Frameworks */, 51E4988224A8061400B667CB /* Articles.framework in Embed Frameworks */, + 51383A3924D1F9470027E272 /* RSWeb in Embed Frameworks */, 51E4989424A8061400B667CB /* SyncDatabase.framework in Embed Frameworks */, 51E4988C24A8061400B667CB /* RSParser.framework in Embed Frameworks */, 5102AE7A24D17FF20050839C /* RSCore in Embed Frameworks */, @@ -1602,9 +1563,9 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 51E498AB24A8069300B667CB /* RSWeb.framework in Embed Frameworks */, 51E498A524A8069300B667CB /* RSDatabase.framework in Embed Frameworks */, 51E4989B24A8069300B667CB /* Account.framework in Embed Frameworks */, + 51383A3C24D1F9510027E272 /* RSWeb in Embed Frameworks */, 5102AE7D24D17FFB0050839C /* RSCore in Embed Frameworks */, 51E4989D24A8069300B667CB /* Articles.framework in Embed Frameworks */, 51E498AF24A8069300B667CB /* SyncDatabase.framework in Embed Frameworks */, @@ -1647,7 +1608,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 65ED4071235DEF6C0081F399 /* RSWeb.framework in Embed Frameworks */, 65ED4072235DEF6C0081F399 /* RSDatabase.framework in Embed Frameworks */, 65ED4074235DEF6C0081F399 /* ArticlesDatabase.framework in Embed Frameworks */, 65ED4076235DEF6C0081F399 /* Account.framework in Embed Frameworks */, @@ -1691,7 +1651,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 84C37FAA20DD8D9000CA8CF5 /* RSWeb.framework in Embed Frameworks */, + 51383A3324D1F90E0027E272 /* RSWeb in Embed Frameworks */, 5102FD84244009F000534F17 /* Secrets.framework in Embed Frameworks */, 84C37FC620DD8E1D00CA8CF5 /* RSDatabase.framework in Embed Frameworks */, 5102AE6524D17F640050839C /* RSCore in Embed Frameworks */, @@ -2198,7 +2158,6 @@ 84BBB12B20142A4700F054F5 /* Inspector.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Inspector.storyboard; sourceTree = ""; }; 84BBB12C20142A4700F054F5 /* InspectorWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InspectorWindowController.swift; sourceTree = ""; }; 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSParser.xcodeproj; path = submodules/RSParser/RSParser.xcodeproj; sourceTree = ""; }; - 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSWeb.xcodeproj; path = submodules/RSWeb/RSWeb.xcodeproj; sourceTree = ""; }; 84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSDatabase.xcodeproj; path = submodules/RSDatabase/RSDatabase.xcodeproj; sourceTree = ""; }; 84C9FC6622629B3900D921D6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 84C9FC6B22629E1200D921D6 /* AdvancedPreferencesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvancedPreferencesViewController.swift; sourceTree = ""; }; @@ -2299,7 +2258,6 @@ files = ( 5102AE7524D17FB50050839C /* RSCore in Frameworks */, 513146B6235A8FD000387FDC /* RSDatabase.framework in Frameworks */, - 513146BC235A8FD000387FDC /* RSWeb.framework in Frameworks */, 513146C3235A8FDB00387FDC /* ArticlesDatabase.framework in Frameworks */, 513146BF235A8FDB00387FDC /* Account.framework in Frameworks */, 513146C1235A8FDB00387FDC /* Articles.framework in Frameworks */, @@ -2314,7 +2272,6 @@ buildActionMask = 2147483647; files = ( 5102AE7124D17FAA0050839C /* RSCore in Frameworks */, - 513C5D0A232574D2003D4054 /* RSWeb.framework in Frameworks */, 513C5CFD2325749A003D4054 /* Account.framework in Frameworks */, 513C5D00232574AF003D4054 /* Articles.framework in Frameworks */, 513C5D08232574C6003D4054 /* RSParser.framework in Frameworks */, @@ -2337,8 +2294,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 51383A3824D1F9470027E272 /* RSWeb in Frameworks */, 5102AE7924D17FF20050839C /* RSCore in Frameworks */, - 51E4988F24A8061400B667CB /* RSWeb.framework in Frameworks */, 51E4988924A8061400B667CB /* RSDatabase.framework in Frameworks */, 51E4987F24A8061400B667CB /* Account.framework in Frameworks */, 51E4988124A8061400B667CB /* Articles.framework in Frameworks */, @@ -2355,13 +2312,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 51E498AA24A8069300B667CB /* RSWeb.framework in Frameworks */, 5102AE7F24D17FFB0050839C /* RSCoreResources in Frameworks */, 51E498A424A8069300B667CB /* RSDatabase.framework in Frameworks */, 51E4997624A87FFC00B667CB /* Sparkle.framework in Frameworks */, 51E4989A24A8069300B667CB /* Account.framework in Frameworks */, 51E4989C24A8069300B667CB /* Articles.framework in Frameworks */, 51E498AE24A8069300B667CB /* SyncDatabase.framework in Frameworks */, + 51383A3B24D1F9510027E272 /* RSWeb in Frameworks */, 51E498A624A8069300B667CB /* RSParser.framework in Frameworks */, 51E498B124A806A400B667CB /* CloudKit.framework in Frameworks */, 5102AE7C24D17FFB0050839C /* RSCore in Frameworks */, @@ -2382,7 +2339,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 65ED4043235DEF6C0081F399 /* RSWeb.framework in Frameworks */, 65ED4044235DEF6C0081F399 /* RSDatabase.framework in Frameworks */, 5102AE6C24D17F7C0050839C /* RSCoreResources in Frameworks */, 65ED4046235DEF6C0081F399 /* ArticlesDatabase.framework in Frameworks */, @@ -2406,10 +2362,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 51383A3524D1F91F0027E272 /* RSWeb in Frameworks */, 510ECA4524D1E010001C31A6 /* RSTree in Frameworks */, 5102AE6E24D17F9C0050839C /* RSCore in Frameworks */, 51C452B42265141B00C03939 /* WebKit.framework in Frameworks */, - 51C451D22264C7F200C03939 /* RSWeb.framework in Frameworks */, 5102FD9D24400A0500534F17 /* Secrets.framework in Frameworks */, 51C451F82264C83E00C03939 /* Account.framework in Frameworks */, 51C451F02264C83100C03939 /* ArticlesDatabase.framework in Frameworks */, @@ -2428,7 +2384,6 @@ 65ED42DE235E74230081F399 /* Sparkle.framework in Frameworks */, 5102AE6724D17F640050839C /* RSCoreResources in Frameworks */, 65ED42D9235E740D0081F399 /* Sparkle.framework in Frameworks */, - 84C37FA920DD8D9000CA8CF5 /* RSWeb.framework in Frameworks */, 84C37FC520DD8E1D00CA8CF5 /* RSDatabase.framework in Frameworks */, 510ECA4224D1DCD0001C31A6 /* RSTree in Frameworks */, 51C451A9226377C200C03939 /* ArticlesDatabase.framework in Frameworks */, @@ -2436,6 +2391,7 @@ 51C451BD226377D000C03939 /* Account.framework in Frameworks */, 51C451B9226377C900C03939 /* Articles.framework in Frameworks */, 51E4DAED2425F6940091EB5B /* CloudKit.framework in Frameworks */, + 51383A3224D1F90E0027E272 /* RSWeb in Frameworks */, 5102AE6424D17F640050839C /* RSCore in Frameworks */, 5102FD83244009F000534F17 /* Secrets.framework in Frameworks */, 51554C24228B71910055115A /* SyncDatabase.framework in Frameworks */, @@ -3552,7 +3508,6 @@ 51C452B22265141B00C03939 /* Frameworks */, 84C37FB920DD8E0C00CA8CF5 /* RSDatabase.xcodeproj */, 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */, - 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */, ); sourceTree = ""; usesTabs = 1; @@ -3606,16 +3561,6 @@ name = Products; sourceTree = ""; }; - 84C37F9920DD8D0400CA8CF5 /* Products */ = { - isa = PBXGroup; - children = ( - 84C37F9F20DD8D0500CA8CF5 /* RSWeb.framework */, - 84C37FA120DD8D0500CA8CF5 /* RSWebTests.xctest */, - 84C37FA320DD8D0500CA8CF5 /* RSWeb.framework */, - ); - name = Products; - sourceTree = ""; - }; 84C37FBA20DD8E0C00CA8CF5 /* Products */ = { isa = PBXGroup; children = ( @@ -4023,6 +3968,7 @@ name = "Multiplatform iOS"; packageProductDependencies = ( 5102AE7824D17FF20050839C /* RSCore */, + 51383A3724D1F9470027E272 /* RSWeb */, ); productName = iOS; productReference = 51C0513D24A77DF800194D5E /* NetNewsWire.app */; @@ -4046,6 +3992,7 @@ packageProductDependencies = ( 5102AE7B24D17FFB0050839C /* RSCore */, 5102AE7E24D17FFB0050839C /* RSCoreResources */, + 51383A3A24D1F9510027E272 /* RSWeb */, ); productName = macOS; productReference = 51C0514424A77DF800194D5E /* NetNewsWire.app */; @@ -4084,7 +4031,6 @@ ); dependencies = ( 65ED41C7235E615E0081F399 /* PBXTargetDependency */, - 65ED3FA5235DEF6C0081F399 /* PBXTargetDependency */, 65ED3FA9235DEF6C0081F399 /* PBXTargetDependency */, 65ED3FAB235DEF6C0081F399 /* PBXTargetDependency */, 65ED3FAD235DEF6C0081F399 /* PBXTargetDependency */, @@ -4138,6 +4084,7 @@ packageProductDependencies = ( 5102AE6D24D17F9C0050839C /* RSCore */, 510ECA4424D1E010001C31A6 /* RSTree */, + 51383A3424D1F91F0027E272 /* RSWeb */, ); productName = "NetNewsWire-iOS"; productReference = 840D617C2029031C009BC708 /* NetNewsWire.app */; @@ -4161,7 +4108,6 @@ ); dependencies = ( 65ED41C5235E61550081F399 /* PBXTargetDependency */, - 84C37FAC20DD8D9000CA8CF5 /* PBXTargetDependency */, 84C37FB820DD8DBB00CA8CF5 /* PBXTargetDependency */, 84C37FC820DD8E1D00CA8CF5 /* PBXTargetDependency */, 51C451AC226377C300C03939 /* PBXTargetDependency */, @@ -4179,6 +4125,7 @@ 5102AE6324D17F640050839C /* RSCore */, 5102AE6624D17F640050839C /* RSCoreResources */, 510ECA4124D1DCD0001C31A6 /* RSTree */, + 51383A3124D1F90E0027E272 /* RSWeb */, ); productName = NetNewsWire; productReference = 849C64601ED37A5D003D8FC0 /* NetNewsWire.app */; @@ -4293,6 +4240,7 @@ packageReferences = ( 5102AE4324D17E820050839C /* XCRemoteSwiftPackageReference "RSCore" */, 510ECA4024D1DCD0001C31A6 /* XCRemoteSwiftPackageReference "RSTree" */, + 51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */, ); productRefGroup = 849C64611ED37A5D003D8FC0 /* Products */; projectDirPath = ""; @@ -4317,10 +4265,6 @@ ProductGroup = 84C37F8720DD8CF800CA8CF5 /* Products */; ProjectRef = 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */; }, - { - ProductGroup = 84C37F9920DD8D0400CA8CF5 /* Products */; - ProjectRef = 84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */; - }, { ProductGroup = 5102FD73244008A700534F17 /* Products */; ProjectRef = 5102FD72244008A700534F17 /* Secrets.xcodeproj */; @@ -4534,27 +4478,6 @@ remoteRef = 84C37F8D20DD8CF800CA8CF5 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 84C37F9F20DD8D0500CA8CF5 /* RSWeb.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = RSWeb.framework; - remoteRef = 84C37F9E20DD8D0500CA8CF5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84C37FA120DD8D0500CA8CF5 /* RSWebTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = RSWebTests.xctest; - remoteRef = 84C37FA020DD8D0500CA8CF5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84C37FA320DD8D0500CA8CF5 /* RSWeb.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = RSWeb.framework; - remoteRef = 84C37FA220DD8D0500CA8CF5 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 84C37FC020DD8E0C00CA8CF5 /* RSDatabase.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -5847,11 +5770,6 @@ name = Account; targetProxy = 51C451BF226377D000C03939 /* PBXContainerItemProxy */; }; - 65ED3FA5235DEF6C0081F399 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = RSWeb; - targetProxy = 65ED3FA6235DEF6C0081F399 /* PBXContainerItemProxy */; - }; 65ED3FA9235DEF6C0081F399 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RSParser; @@ -5922,11 +5840,6 @@ target = 849C645F1ED37A5D003D8FC0 /* NetNewsWire */; targetProxy = 849C64721ED37A5D003D8FC0 /* PBXContainerItemProxy */; }; - 84C37FAC20DD8D9000CA8CF5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = RSWeb; - targetProxy = 84C37FAB20DD8D9000CA8CF5 /* PBXContainerItemProxy */; - }; 84C37FB820DD8DBB00CA8CF5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RSParser; @@ -6360,6 +6273,14 @@ minimumVersion = "1.0.0-beta1"; }; }; + 51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Ranchero-Software/RSWeb.git"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = "1.0.0-beta1"; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -6428,6 +6349,26 @@ package = 510ECA4024D1DCD0001C31A6 /* XCRemoteSwiftPackageReference "RSTree" */; productName = RSTree; }; + 51383A3124D1F90E0027E272 /* RSWeb */ = { + isa = XCSwiftPackageProductDependency; + package = 51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */; + productName = RSWeb; + }; + 51383A3424D1F91F0027E272 /* RSWeb */ = { + isa = XCSwiftPackageProductDependency; + package = 51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */; + productName = RSWeb; + }; + 51383A3724D1F9470027E272 /* RSWeb */ = { + isa = XCSwiftPackageProductDependency; + package = 51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */; + productName = RSWeb; + }; + 51383A3A24D1F9510027E272 /* RSWeb */ = { + isa = XCSwiftPackageProductDependency; + package = 51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */; + productName = RSWeb; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 849C64581ED37A5D003D8FC0 /* Project object */; diff --git a/NetNewsWire.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcworkspace/xcshareddata/swiftpm/Package.resolved index a57d2cbb9..b59423662 100644 --- a/NetNewsWire.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/NetNewsWire.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -64,6 +64,15 @@ "version": "1.0.0-beta1" } }, + { + "package": "RSWeb", + "repositoryURL": "https://github.com/Ranchero-Software/RSWeb.git", + "state": { + "branch": null, + "revision": "cb76e7c3b6f1dd31f20e2d9c5a5d1092f4d000e4", + "version": "1.0.0-beta2" + } + }, { "package": "Swifter", "repositoryURL": "https://github.com/httpswift/swifter.git", diff --git a/submodules/RSWeb b/submodules/RSWeb deleted file mode 160000 index 72754ca5b..000000000 --- a/submodules/RSWeb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 72754ca5b699af22c80d4326ca7ad74ec4a22c89