renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make RSParser a Swift Package

Browse Source
This commit is contained in:
Maurice Parker
2020-07-30 04:26:07 -05:00
parent d3deb4b7d7
commit b003ae5124
6 changed files with 86 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -1,6 +1,3 @@
[submodule "submodules/RSParser"]
path = submodules/RSParser
url = https://github.com/brentsimmons/RSParser
[submodule "submodules/Sparkle"]
path = submodules/Sparkle
url = https://github.com/brentsimmons/Sparkle

21
Frameworks/Account/Account.xcodeproj/project.pbxproj
View File

@@ -82,6 +82,8 @@
519E84AC2435019100D238B0 /* CloudKitArticlesZoneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 519E84AB2435019100D238B0 /* CloudKitArticlesZoneDelegate.swift */; };
51B0DF1B24D24F12000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1A24D24F12000AD99E /* RSDatabase */; };
51B0DF1C24D24F12000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1A24D24F12000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51B0DF2D24D2C8B1000AD99E /* RSParser in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2C24D2C8B1000AD99E /* RSParser */; };
51B0DF2E24D2C8B1000AD99E /* RSParser in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2C24D2C8B1000AD99E /* RSParser */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51B36305244B6135000DEF2A /* TwitterEntities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B36304244B6135000DEF2A /* TwitterEntities.swift */; };
51B36307244B6234000DEF2A /* TwitterHashtag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B36306244B6234000DEF2A /* TwitterHashtag.swift */; };
51B36309244B62A5000DEF2A /* TwitterURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B36308244B62A5000DEF2A /* TwitterURL.swift */; };
@@ -119,7 +121,6 @@
55203300229D5D5A009559E0 /* ReaderAPICaller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 552032F5229D5D5A009559E0 /* ReaderAPICaller.swift */; };
769F295938E5A30D03DFF88F /* NewsBlurAccountDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769F2A8DF190549E24B5D110 /* NewsBlurAccountDelegate.swift */; };
769F2BA02EF5F329CDE45F5A /* NewsBlurAPICaller.swift in Sources */ = {isa = PBXBuildFile; fileRef = 769F275FD5D942502C5B4716 /* NewsBlurAPICaller.swift */; };
841973FF1F6DD1C5006346C4 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841973FA1F6DD1AC006346C4 /* RSParser.framework */; };
841974011F6DD1EC006346C4 /* Folder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 841974001F6DD1EC006346C4 /* Folder.swift */; };
841974251F6DDCE4006346C4 /* AccountDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 841974241F6DDCE4006346C4 /* AccountDelegate.swift */; };
841D4D702106B40400DD04E6 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841D4D6F2106B40400DD04E6 /* ArticlesDatabase.framework */; };
@@ -281,6 +282,7 @@
files = (
51383A4724D1FF160027E272 /* RSWeb in Embed Frameworks */,
51383A4424D1FF030027E272 /* RSCore in Embed Frameworks */,
51B0DF2E24D2C8B1000AD99E /* RSParser in Embed Frameworks */,
51B0DF1C24D24F12000AD99E /* RSDatabase in Embed Frameworks */,
);
name = "Embed Frameworks";
@@ -534,13 +536,13 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
51B0DF2D24D2C8B1000AD99E /* RSParser in Frameworks */,
51383A4624D1FF160027E272 /* RSWeb in Frameworks */,
841D4D722106B40A00DD04E6 /* Articles.framework in Frameworks */,
841D4D702106B40400DD04E6 /* ArticlesDatabase.framework in Frameworks */,
51383A4324D1FF030027E272 /* RSCore in Frameworks */,
51B0DF1B24D24F12000AD99E /* RSDatabase in Frameworks */,
51E148EC234B8FFC0004F7A5 /* SyncDatabase.framework in Frameworks */,
841973FF1F6DD1C5006346C4 /* RSParser.framework in Frameworks */,
5102FD80244009E000534F17 /* Secrets.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1037,6 +1039,7 @@
51383A4224D1FF030027E272 /* RSCore */,
51383A4524D1FF160027E272 /* RSWeb */,
51B0DF1A24D24F12000AD99E /* RSDatabase */,
51B0DF2C24D2C8B1000AD99E /* RSParser */,
);
productName = Account;
productReference = 848934F61F62484F00CEBD24 /* Account.framework */;
@@ -1093,6 +1096,7 @@
5102AE8024D180A80050839C /* XCRemoteSwiftPackageReference "RSCore" */,
51383A3E24D1FE9A0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */,
51B0DF1924D24F12000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */,
51B0DF2B24D2C8B1000AD99E /* XCRemoteSwiftPackageReference "RSParser" */,
);
productRefGroup = 848934F71F62484F00CEBD24 /* Products */;
projectDirPath = "";
@@ -1521,6 +1525,14 @@
minimumVersion = "1.0.0-beta1";
};
};
51B0DF2B24D2C8B1000AD99E /* XCRemoteSwiftPackageReference "RSParser" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Ranchero-Software/RSParser.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = "2.0.0-beta1";
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
@@ -1539,6 +1551,11 @@
package = 51B0DF1924D24F12000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
productName = RSDatabase;
};
51B0DF2C24D2C8B1000AD99E /* RSParser */ = {
isa = XCSwiftPackageProductDependency;
package = 51B0DF2B24D2C8B1000AD99E /* XCRemoteSwiftPackageReference "RSParser" */;
productName = RSParser;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 848934ED1F62484F00CEBD24 /* Project object */;

21
Frameworks/ArticlesDatabase/ArticlesDatabase.xcodeproj/project.pbxproj
View File

@@ -11,7 +11,8 @@
5102AE8D24D181080050839C /* RSCore in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 5102AE8B24D181080050839C /* RSCore */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51B0DF1724D24EC4000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1624D24EC4000AD99E /* RSDatabase */; };
51B0DF1824D24EC4000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1624D24EC4000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51C451FF2264CF2100C03939 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51C451FE2264CF2100C03939 /* RSParser.framework */; };
51B0DF2924D2C837000AD99E /* RSParser in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2824D2C837000AD99E /* RSParser */; };
51B0DF2A24D2C837000AD99E /* RSParser in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2824D2C837000AD99E /* RSParser */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
84116B8923E01E86000B2E98 /* FetchFeedUnreadCountOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84116B8823E01E86000B2E98 /* FetchFeedUnreadCountOperation.swift */; };
841D4D742106B59F00DD04E6 /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 841D4D732106B59F00DD04E6 /* Articles.framework */; };
84288A001F6A3C4400395871 /* DatabaseObject+Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842889FF1F6A3C4400395871 /* DatabaseObject+Database.swift */; };
@@ -120,6 +121,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
51B0DF2A24D2C837000AD99E /* RSParser in Embed Frameworks */,
51B0DF1824D24EC4000AD99E /* RSDatabase in Embed Frameworks */,
5102AE8D24D181080050839C /* RSCore in Embed Frameworks */,
);
@@ -171,9 +173,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
51B0DF2924D2C837000AD99E /* RSParser in Frameworks */,
51B0DF1724D24EC4000AD99E /* RSDatabase in Frameworks */,
5102AE8C24D181080050839C /* RSCore in Frameworks */,
51C451FF2264CF2100C03939 /* RSParser.framework in Frameworks */,
841D4D742106B59F00DD04E6 /* Articles.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -349,6 +351,7 @@
packageProductDependencies = (
5102AE8B24D181080050839C /* RSCore */,
51B0DF1624D24EC4000AD99E /* RSDatabase */,
51B0DF2824D2C837000AD99E /* RSParser */,
);
productName = Database;
productReference = 844BEE371F0AB3AA004AB7CD /* ArticlesDatabase.framework */;
@@ -407,6 +410,7 @@
packageReferences = (
5102AE8A24D181080050839C /* XCRemoteSwiftPackageReference "RSCore" */,
51B0DF1524D24EC4000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */,
51B0DF2724D2C837000AD99E /* XCRemoteSwiftPackageReference "RSParser" */,
);
productRefGroup = 844BEE381F0AB3AA004AB7CD /* Products */;
projectDirPath = "";
@@ -681,6 +685,14 @@
minimumVersion = "1.0.0-beta1";
};
};
51B0DF2724D2C837000AD99E /* XCRemoteSwiftPackageReference "RSParser" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Ranchero-Software/RSParser.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = "2.0.0-beta1";
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
@@ -694,6 +706,11 @@
package = 51B0DF1524D24EC4000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
productName = RSDatabase;
};
51B0DF2824D2C837000AD99E /* RSParser */ = {
isa = XCSwiftPackageProductDependency;
package = 51B0DF2724D2C837000AD99E /* XCRemoteSwiftPackageReference "RSParser" */;
productName = RSParser;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 844BEE2E1F0AB3AA004AB7CD /* Project object */;

130
NetNewsWire.xcodeproj/project.pbxproj
View File

@@ -138,7 +138,6 @@
51314668235A7E4600387FDC /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51314666235A7E4600387FDC /* IntentHandler.swift */; };
513146B2235A81A400387FDC /* AddWebFeedIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */; };
513146B3235A81A400387FDC /* AddWebFeedIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */; };
513146B8235A8FD000387FDC /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.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 */; };
@@ -374,6 +373,12 @@
51B0DF1F24D24F53000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF1D24D24F53000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51B0DF2124D24F66000AD99E /* RSDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2024D24F66000AD99E /* RSDatabase */; };
51B0DF2224D24F66000AD99E /* RSDatabase in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2024D24F66000AD99E /* RSDatabase */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51B0DF2524D2C7FA000AD99E /* RSParser in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2424D2C7FA000AD99E /* RSParser */; };
51B0DF2624D2C7FA000AD99E /* RSParser in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2424D2C7FA000AD99E /* RSParser */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51B0DF3024D2C8F6000AD99E /* RSParser in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2F24D2C8F6000AD99E /* RSParser */; };
51B0DF3124D2C8F6000AD99E /* RSParser in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF2F24D2C8F6000AD99E /* RSParser */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51B0DF3324D2C903000AD99E /* RSParser in Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF3224D2C903000AD99E /* RSParser */; };
51B0DF3424D2C903000AD99E /* RSParser in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51B0DF3224D2C903000AD99E /* RSParser */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
51B54A4324B5499B0014348B /* WebViewProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5177471924B3863000EB0F74 /* WebViewProvider.swift */; };
51B54A6524B549B20014348B /* WrapperScriptMessageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 517B2EBB24B3E62A001AC46C /* WrapperScriptMessageHandler.swift */; };
51B54A6624B549CB0014348B /* PreloadedWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5177471324B37D4000EB0F74 /* PreloadedWebView.swift */; };
@@ -429,8 +434,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, ); }; };
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, ); }; };
51C451F02264C83100C03939 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; };
51C451F12264C83100C03939 /* ArticlesDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
51C451F42264C83900C03939 /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; };
@@ -509,8 +512,6 @@
51E4988224A8061400B667CB /* Articles.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
51E4988324A8061400B667CB /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; };
51E4988424A8061400B667CB /* ArticlesDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.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, ); }; };
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 */; };
@@ -523,8 +524,6 @@
51E4989D24A8069300B667CB /* Articles.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
51E4989E24A8069300B667CB /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; };
51E4989F24A8069300B667CB /* ArticlesDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.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, ); }; };
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 */; };
@@ -865,7 +864,6 @@
65ED403F235DEF6C0081F399 /* ArticleRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A977D1ED9EC42007D329B /* ArticleRenderer.swift */; };
65ED4040235DEF6C0081F399 /* GeneralPrefencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C9FC6D22629E1200D921D6 /* GeneralPrefencesViewController.swift */; };
65ED4046235DEF6C0081F399 /* ArticlesDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407167F2262A61100344432 /* ArticlesDatabase.framework */; };
65ED4047235DEF6C0081F399 /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; };
65ED4048235DEF6C0081F399 /* Account.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8407166A2262A60D00344432 /* Account.framework */; };
65ED4049235DEF6C0081F399 /* Articles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; };
65ED404B235DEF6C0081F399 /* SyncDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C01228B6EB50055115A /* SyncDatabase.framework */; };
@@ -903,7 +901,6 @@
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, ); }; };
65ED4077235DEF6C0081F399 /* Articles.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 840716732262A60F00344432 /* Articles.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
65ED4078235DEF6C0081F399 /* RSParser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
65ED4079235DEF6C0081F399 /* SyncDatabase.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 51554C01228B6EB50055115A /* SyncDatabase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
65ED407C235DEF6C0081F399 /* Subscribe to Feed.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 6581C73320CED60000F4AD34 /* Subscribe to Feed.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
65ED4092235DEF770081F399 /* SafariExtensionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6581C73920CED60100F4AD34 /* SafariExtensionViewController.swift */; };
@@ -1016,8 +1013,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 */; };
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, ); }; };
84C9FC6722629B9000D921D6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C9FC6622629B3900D921D6 /* AppDelegate.swift */; };
84C9FC7722629E1200D921D6 /* AdvancedPreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C9FC6B22629E1200D921D6 /* AdvancedPreferencesViewController.swift */; };
84C9FC7822629E1200D921D6 /* GeneralPrefencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C9FC6D22629E1200D921D6 /* GeneralPrefencesViewController.swift */; };
@@ -1166,13 +1161,6 @@
remoteGlobalIDString = 848934F51F62484F00CEBD24;
remoteInfo = Account;
};
65ED3FAA235DEF6C0081F399 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 84FF5F831EFA285800C15A01;
remoteInfo = RSParser;
};
65ED3FAE235DEF6C0081F399 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */;
@@ -1411,27 +1399,6 @@
remoteGlobalIDString = 849C645F1ED37A5D003D8FC0;
remoteInfo = NetNewsWire;
};
84C37F8B20DD8CF800CA8CF5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 84FF5F841EFA285800C15A01;
remoteInfo = RSParser;
};
84C37F8D20DD8CF800CA8CF5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 84FF5F8D1EFA285800C15A01;
remoteInfo = RSParserTests;
};
84C37FB720DD8DBB00CA8CF5 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 84FF5F831EFA285800C15A01;
remoteInfo = RSParser;
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -1484,7 +1451,6 @@
51554C31228B71A10055115A /* SyncDatabase.framework in Embed Frameworks */,
5102AE6F24D17F9C0050839C /* RSCore in Embed Frameworks */,
5102FD9E24400A0500534F17 /* Secrets.framework in Embed Frameworks */,
51C451E52264C80600C03939 /* RSParser.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -1495,11 +1461,11 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
51B0DF3424D2C903000AD99E /* RSParser 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 */,
51E4989224A8061400B667CB /* Secrets.framework in Embed Frameworks */,
51E4988424A8061400B667CB /* ArticlesDatabase.framework in Embed Frameworks */,
@@ -1514,6 +1480,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
51B0DF3124D2C8F6000AD99E /* RSParser in Embed Frameworks */,
51B0DF2224D24F66000AD99E /* RSDatabase in Embed Frameworks */,
51E4989B24A8069300B667CB /* Account.framework in Embed Frameworks */,
51383A3C24D1F9510027E272 /* RSWeb in Embed Frameworks */,
@@ -1521,7 +1488,6 @@
51E4989D24A8069300B667CB /* Articles.framework in Embed Frameworks */,
51E498AF24A8069300B667CB /* SyncDatabase.framework in Embed Frameworks */,
51E4997724A87FFC00B667CB /* Sparkle.framework in Embed Frameworks */,
51E498A724A8069300B667CB /* RSParser.framework in Embed Frameworks */,
51E498AD24A8069300B667CB /* Secrets.framework in Embed Frameworks */,
51E4989F24A8069300B667CB /* ArticlesDatabase.framework in Embed Frameworks */,
);
@@ -1562,7 +1528,6 @@
65ED4074235DEF6C0081F399 /* ArticlesDatabase.framework in Embed Frameworks */,
65ED4076235DEF6C0081F399 /* Account.framework in Embed Frameworks */,
65ED4077235DEF6C0081F399 /* Articles.framework in Embed Frameworks */,
65ED4078235DEF6C0081F399 /* RSParser.framework in Embed Frameworks */,
5102AE6A24D17F7C0050839C /* RSCore in Embed Frameworks */,
65ED4079235DEF6C0081F399 /* SyncDatabase.framework in Embed Frameworks */,
5102FD9C244009FA00534F17 /* Secrets.framework in Embed Frameworks */,
@@ -1602,13 +1567,13 @@
dstSubfolderSpec = 10;
files = (
51B0DF1024D24E3B000AD99E /* RSDatabase in Embed Frameworks */,
51B0DF2624D2C7FA000AD99E /* RSParser in Embed Frameworks */,
51383A3324D1F90E0027E272 /* RSWeb in Embed Frameworks */,
5102FD84244009F000534F17 /* Secrets.framework in Embed Frameworks */,
5102AE6524D17F640050839C /* RSCore in Embed Frameworks */,
51C451AA226377C200C03939 /* ArticlesDatabase.framework in Embed Frameworks */,
51C451BE226377D000C03939 /* Account.framework in Embed Frameworks */,
51C451BA226377C900C03939 /* Articles.framework in Embed Frameworks */,
84C37FB620DD8DBB00CA8CF5 /* RSParser.framework in Embed Frameworks */,
65ED42DF235E74230081F399 /* Sparkle.framework in Embed Frameworks */,
51554C25228B71910055115A /* SyncDatabase.framework in Embed Frameworks */,
510ECA4324D1DCD0001C31A6 /* RSTree in Embed Frameworks */,
@@ -2107,7 +2072,6 @@
84BB0F812333426400DED65E /* NetNewsWire.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NetNewsWire.entitlements; sourceTree = "<group>"; };
84BBB12B20142A4700F054F5 /* Inspector.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Inspector.storyboard; sourceTree = "<group>"; };
84BBB12C20142A4700F054F5 /* InspectorWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InspectorWindowController.swift; sourceTree = "<group>"; };
84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSParser.xcodeproj; path = submodules/RSParser/RSParser.xcodeproj; sourceTree = "<group>"; };
84C9FC6622629B3900D921D6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
84C9FC6B22629E1200D921D6 /* AdvancedPreferencesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdvancedPreferencesViewController.swift; sourceTree = "<group>"; };
84C9FC6D22629E1200D921D6 /* GeneralPrefencesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneralPrefencesViewController.swift; sourceTree = "<group>"; };
@@ -2210,7 +2174,6 @@
513146C1235A8FDB00387FDC /* Articles.framework in Frameworks */,
513146C5235A8FDB00387FDC /* SyncDatabase.framework in Frameworks */,
5102FDA224400A2000534F17 /* Secrets.framework in Frameworks */,
513146B8235A8FD000387FDC /* RSParser.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2236,12 +2199,12 @@
buildActionMask = 2147483647;
files = (
51B0DF1E24D24F53000AD99E /* RSDatabase in Frameworks */,
51B0DF3324D2C903000AD99E /* RSParser in Frameworks */,
51383A3824D1F9470027E272 /* RSWeb in Frameworks */,
5102AE7924D17FF20050839C /* RSCore in Frameworks */,
51E4987F24A8061400B667CB /* Account.framework in Frameworks */,
51E4988124A8061400B667CB /* Articles.framework in Frameworks */,
51E4989324A8061400B667CB /* SyncDatabase.framework in Frameworks */,
51E4988B24A8061400B667CB /* RSParser.framework in Frameworks */,
51E4989724A8065700B667CB /* CloudKit.framework in Frameworks */,
51E4989124A8061400B667CB /* Secrets.framework in Frameworks */,
51E4989924A8067000B667CB /* WebKit.framework in Frameworks */,
@@ -2255,11 +2218,11 @@
files = (
5102AE7F24D17FFB0050839C /* RSCoreResources in Frameworks */,
51E4997624A87FFC00B667CB /* Sparkle.framework in Frameworks */,
51B0DF3024D2C8F6000AD99E /* RSParser 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 */,
51B0DF2124D24F66000AD99E /* RSDatabase in Frameworks */,
@@ -2282,7 +2245,6 @@
files = (
5102AE6C24D17F7C0050839C /* RSCoreResources in Frameworks */,
65ED4046235DEF6C0081F399 /* ArticlesDatabase.framework in Frameworks */,
65ED4047235DEF6C0081F399 /* RSParser.framework in Frameworks */,
65ED4048235DEF6C0081F399 /* Account.framework in Frameworks */,
65ED4049235DEF6C0081F399 /* Articles.framework in Frameworks */,
5102AE6924D17F7C0050839C /* RSCore in Frameworks */,
@@ -2312,7 +2274,6 @@
51C451F42264C83900C03939 /* Articles.framework in Frameworks */,
51E4DB082425F9EB0091EB5B /* CloudKit.framework in Frameworks */,
51554C30228B71A10055115A /* SyncDatabase.framework in Frameworks */,
51C451E42264C80600C03939 /* RSParser.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2326,13 +2287,13 @@
510ECA4224D1DCD0001C31A6 /* RSTree in Frameworks */,
51B0DF0F24D24E3B000AD99E /* RSDatabase in Frameworks */,
51C451A9226377C200C03939 /* ArticlesDatabase.framework in Frameworks */,
84C37FB520DD8DBB00CA8CF5 /* RSParser.framework in Frameworks */,
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 */,
51B0DF2524D2C7FA000AD99E /* RSParser in Frameworks */,
51554C24228B71910055115A /* SyncDatabase.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -3445,7 +3406,6 @@
D5907CDA2002F084005947E5 /* xcconfig */,
849C64611ED37A5D003D8FC0 /* Products */,
51C452B22265141B00C03939 /* Frameworks */,
84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */,
);
sourceTree = "<group>";
usesTabs = 1;
@@ -3490,15 +3450,6 @@
path = Inspector;
sourceTree = "<group>";
};
84C37F8720DD8CF800CA8CF5 /* Products */ = {
isa = PBXGroup;
children = (
84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */,
84C37F8E20DD8CF800CA8CF5 /* RSParserTests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
84C9FC6522629B3900D921D6 /* Mac */ = {
isa = PBXGroup;
children = (
@@ -3896,6 +3847,7 @@
5102AE7824D17FF20050839C /* RSCore */,
51383A3724D1F9470027E272 /* RSWeb */,
51B0DF1D24D24F53000AD99E /* RSDatabase */,
51B0DF3224D2C903000AD99E /* RSParser */,
);
productName = iOS;
productReference = 51C0513D24A77DF800194D5E /* NetNewsWire.app */;
@@ -3921,6 +3873,7 @@
5102AE7E24D17FFB0050839C /* RSCoreResources */,
51383A3A24D1F9510027E272 /* RSWeb */,
51B0DF2024D24F66000AD99E /* RSDatabase */,
51B0DF2F24D2C8F6000AD99E /* RSParser */,
);
productName = macOS;
productReference = 51C0514424A77DF800194D5E /* NetNewsWire.app */;
@@ -3959,7 +3912,6 @@
);
dependencies = (
65ED41C7235E615E0081F399 /* PBXTargetDependency */,
65ED3FA9235DEF6C0081F399 /* PBXTargetDependency */,
65ED3FAD235DEF6C0081F399 /* PBXTargetDependency */,
65ED3FAF235DEF6C0081F399 /* PBXTargetDependency */,
65ED3FB1235DEF6C0081F399 /* PBXTargetDependency */,
@@ -4035,7 +3987,6 @@
);
dependencies = (
65ED41C5235E61550081F399 /* PBXTargetDependency */,
84C37FB820DD8DBB00CA8CF5 /* PBXTargetDependency */,
51C451AC226377C300C03939 /* PBXTargetDependency */,
51C451BC226377C900C03939 /* PBXTargetDependency */,
51C451C0226377D000C03939 /* PBXTargetDependency */,
@@ -4053,6 +4004,7 @@
510ECA4124D1DCD0001C31A6 /* RSTree */,
51383A3124D1F90E0027E272 /* RSWeb */,
51B0DF0E24D24E3B000AD99E /* RSDatabase */,
51B0DF2424D2C7FA000AD99E /* RSParser */,
);
productName = NetNewsWire;
productReference = 849C64601ED37A5D003D8FC0 /* NetNewsWire.app */;
@@ -4169,6 +4121,7 @@
510ECA4024D1DCD0001C31A6 /* XCRemoteSwiftPackageReference "RSTree" */,
51383A3024D1F90E0027E272 /* XCRemoteSwiftPackageReference "RSWeb" */,
51B0DF0D24D24E3B000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */,
51B0DF2324D2C7FA000AD99E /* XCRemoteSwiftPackageReference "RSParser" */,
);
productRefGroup = 849C64611ED37A5D003D8FC0 /* Products */;
projectDirPath = "";
@@ -4185,10 +4138,6 @@
ProductGroup = 8407167A2262A61100344432 /* Products */;
ProjectRef = 841D4D5E2106B3E100DD04E6 /* ArticlesDatabase.xcodeproj */;
},
{
ProductGroup = 84C37F8720DD8CF800CA8CF5 /* Products */;
ProjectRef = 84C37F8620DD8CF800CA8CF5 /* RSParser.xcodeproj */;
},
{
ProductGroup = 5102FD73244008A700534F17 /* Products */;
ProjectRef = 5102FD72244008A700534F17 /* Secrets.xcodeproj */;
@@ -4388,20 +4337,6 @@
remoteRef = 840716802262A61100344432 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
84C37F8C20DD8CF800CA8CF5 /* RSParser.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = RSParser.framework;
remoteRef = 84C37F8B20DD8CF800CA8CF5 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
84C37F8E20DD8CF800CA8CF5 /* RSParserTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = RSParserTests.xctest;
remoteRef = 84C37F8D20DD8CF800CA8CF5 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
@@ -5672,11 +5607,6 @@
name = Account;
targetProxy = 51C451BF226377D000C03939 /* PBXContainerItemProxy */;
};
65ED3FA9235DEF6C0081F399 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = RSParser;
targetProxy = 65ED3FAA235DEF6C0081F399 /* PBXContainerItemProxy */;
};
65ED3FAD235DEF6C0081F399 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = ArticlesDatabase;
@@ -5737,11 +5667,6 @@
target = 849C645F1ED37A5D003D8FC0 /* NetNewsWire */;
targetProxy = 849C64721ED37A5D003D8FC0 /* PBXContainerItemProxy */;
};
84C37FB820DD8DBB00CA8CF5 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = RSParser;
targetProxy = 84C37FB720DD8DBB00CA8CF5 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
@@ -6181,6 +6106,14 @@
minimumVersion = "1.0.0-beta1";
};
};
51B0DF2324D2C7FA000AD99E /* XCRemoteSwiftPackageReference "RSParser" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Ranchero-Software/RSParser.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = "2.0.0-beta1";
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
@@ -6274,6 +6207,21 @@
package = 51B0DF0D24D24E3B000AD99E /* XCRemoteSwiftPackageReference "RSDatabase" */;
productName = RSDatabase;
};
51B0DF2424D2C7FA000AD99E /* RSParser */ = {
isa = XCSwiftPackageProductDependency;
package = 51B0DF2324D2C7FA000AD99E /* XCRemoteSwiftPackageReference "RSParser" */;
productName = RSParser;
};
51B0DF2F24D2C8F6000AD99E /* RSParser */ = {
isa = XCSwiftPackageProductDependency;
package = 51B0DF2324D2C7FA000AD99E /* XCRemoteSwiftPackageReference "RSParser" */;
productName = RSParser;
};
51B0DF3224D2C903000AD99E /* RSParser */ = {
isa = XCSwiftPackageProductDependency;
package = 51B0DF2324D2C7FA000AD99E /* XCRemoteSwiftPackageReference "RSParser" */;
productName = RSParser;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 849C64581ED37A5D003D8FC0 /* Project object */;

9
NetNewsWire.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@@ -64,6 +64,15 @@
"version": "1.0.0-beta1"
}
},
{
"package": "RSParser",
"repositoryURL": "https://github.com/Ranchero-Software/RSParser.git",
"state": {
"branch": null,
"revision": "d7b10caba6396b049a74b4bd11d649ba870331b4",
"version": "2.0.0-beta1"
}
},
{
"package": "RSTree",
"repositoryURL": "https://github.com/Ranchero-Software/RSTree.git",

1
submodules/RSParser

Submodule submodules/RSParser deleted from 93ccfb0ea5