diff --git a/Evergreen.xcodeproj/project.pbxproj b/Evergreen.xcodeproj/project.pbxproj index 24e101eda..00846a574 100644 --- a/Evergreen.xcodeproj/project.pbxproj +++ b/Evergreen.xcodeproj/project.pbxproj @@ -58,12 +58,12 @@ 849A97AC1ED9F9BC007D329B /* AddFolderSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 849A97AA1ED9F9BC007D329B /* AddFolderSheet.xib */; }; 849A97AF1ED9FA08007D329B /* FeedList.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 849A97AD1ED9FA08007D329B /* FeedList.storyboard */; }; 849A97B21ED9FA69007D329B /* MainWindow.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 849A97B01ED9FA69007D329B /* MainWindow.storyboard */; }; + 849B897C1F0349D000578A8D /* RSParser.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 849B89751F0349C100578A8D /* RSParser.framework */; }; + 849B897D1F0349D000578A8D /* RSParser.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 849B89751F0349C100578A8D /* RSParser.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 849C64641ED37A5D003D8FC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849C64631ED37A5D003D8FC0 /* AppDelegate.swift */; }; 849C64681ED37A5D003D8FC0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 849C64671ED37A5D003D8FC0 /* Assets.xcassets */; }; 849C646B1ED37A5D003D8FC0 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 849C64691ED37A5D003D8FC0 /* Main.storyboard */; }; 849C64761ED37A5D003D8FC0 /* EvergreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849C64751ED37A5D003D8FC0 /* EvergreenTests.swift */; }; - 84B06F821ED37BDD00F0B54B /* RSXML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06F7D1ED37BCA00F0B54B /* RSXML.framework */; }; - 84B06F831ED37BDD00F0B54B /* RSXML.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06F7D1ED37BCA00F0B54B /* RSXML.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 84B06FAE1ED37DBD00F0B54B /* RSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06FA91ED37DAD00F0B54B /* RSCore.framework */; }; 84B06FAF1ED37DBD00F0B54B /* RSCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06FA91ED37DAD00F0B54B /* RSCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 84B06FB21ED37DBD00F0B54B /* RSDatabase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84B06F9D1ED37DA000F0B54B /* RSDatabase.framework */; }; @@ -118,6 +118,27 @@ remoteGlobalIDString = 84C7AEA61D68C79A009FB883; remoteInfo = LocalAccount; }; + 849B89741F0349C100578A8D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 849B89681F0349C100578A8D /* RSParser.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 84FF5F841EFA285800C15A01; + remoteInfo = RSParser; + }; + 849B89761F0349C100578A8D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 849B89681F0349C100578A8D /* RSParser.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 84FF5F8D1EFA285800C15A01; + remoteInfo = RSParserTests; + }; + 849B897E1F0349D000578A8D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 849B89681F0349C100578A8D /* RSParser.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 84FF5F831EFA285800C15A01; + remoteInfo = RSParser; + }; 849C64721ED37A5D003D8FC0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 849C64581ED37A5D003D8FC0 /* Project object */; @@ -125,34 +146,6 @@ remoteGlobalIDString = 849C645F1ED37A5D003D8FC0; remoteInfo = Evergreen; }; - 84B06F7C1ED37BCA00F0B54B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84B06F761ED37BCA00F0B54B /* RSXML.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 84F22C0D1B52DDEA000060CE; - remoteInfo = RSXML; - }; - 84B06F7E1ED37BCA00F0B54B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84B06F761ED37BCA00F0B54B /* RSXML.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 84F22C171B52DDEA000060CE; - remoteInfo = RSXMLTests; - }; - 84B06F801ED37BCA00F0B54B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84B06F761ED37BCA00F0B54B /* RSXML.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 84AD0C051E11B7D200B38510; - remoteInfo = RSXMLiOS; - }; - 84B06F841ED37BDD00F0B54B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 84B06F761ED37BCA00F0B54B /* RSXML.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 84F22C0C1B52DDEA000060CE; - remoteInfo = RSXML; - }; 84B06F9C1ED37DA000F0B54B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 84B06F961ED37DA000F0B54B /* RSDatabase.xcodeproj */; @@ -331,6 +324,7 @@ dstSubfolderSpec = 10; files = ( 84FB9A301EDCD6C4003D53B9 /* Sparkle.framework in Embed Frameworks */, + 849B897D1F0349D000578A8D /* RSParser.framework in Embed Frameworks */, 84B06FB31ED37DBD00F0B54B /* RSDatabase.framework in Embed Frameworks */, 84B0700B1ED3822600F0B54B /* RSTextDrawing.framework in Embed Frameworks */, 84B06FEA1ED3803A00F0B54B /* RSFeedFinder.framework in Embed Frameworks */, @@ -340,7 +334,6 @@ 8471A2F61ED4D062008F099E /* LocalAccount.framework in Embed Frameworks */, 8471A2C51ED4CEBF008F099E /* DataModel.framework in Embed Frameworks */, 84B06FC31ED37E9600F0B54B /* RSWeb.framework in Embed Frameworks */, - 84B06F831ED37BDD00F0B54B /* RSXML.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -397,6 +390,7 @@ 849A97AB1ED9F9BC007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Evergreen/Base.lproj/AddFolderSheet.xib; sourceTree = SOURCE_ROOT; }; 849A97AE1ED9FA08007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Evergreen/Base.lproj/FeedList.storyboard; sourceTree = SOURCE_ROOT; }; 849A97B11ED9FA69007D329B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Evergreen/Base.lproj/MainWindow.storyboard; sourceTree = SOURCE_ROOT; }; + 849B89681F0349C100578A8D /* RSParser.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSParser.xcodeproj; path = Frameworks/RSParser/RSParser.xcodeproj; sourceTree = ""; }; 849C64601ED37A5D003D8FC0 /* Evergreen.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Evergreen.app; sourceTree = BUILT_PRODUCTS_DIR; }; 849C64631ED37A5D003D8FC0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Evergreen/AppDelegate.swift; sourceTree = ""; }; 849C64671ED37A5D003D8FC0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Evergreen/Assets.xcassets; sourceTree = ""; }; @@ -405,7 +399,6 @@ 849C64711ED37A5D003D8FC0 /* EvergreenTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EvergreenTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 849C64751ED37A5D003D8FC0 /* EvergreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EvergreenTests.swift; sourceTree = ""; }; 849C64771ED37A5D003D8FC0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 84B06F761ED37BCA00F0B54B /* RSXML.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSXML.xcodeproj; path = Frameworks/RSXML/RSXML.xcodeproj; sourceTree = ""; }; 84B06F961ED37DA000F0B54B /* RSDatabase.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSDatabase.xcodeproj; path = Frameworks/RSDatabase/RSDatabase.xcodeproj; sourceTree = ""; }; 84B06FA21ED37DAC00F0B54B /* RSCore.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSCore.xcodeproj; path = Frameworks/RSCore/RSCore.xcodeproj; sourceTree = ""; }; 84B06FB61ED37E8B00F0B54B /* RSWeb.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RSWeb.xcodeproj; path = Frameworks/RSWeb/RSWeb.xcodeproj; sourceTree = ""; }; @@ -422,6 +415,7 @@ buildActionMask = 2147483647; files = ( 84B06FB21ED37DBD00F0B54B /* RSDatabase.framework in Frameworks */, + 849B897C1F0349D000578A8D /* RSParser.framework in Frameworks */, 84B0700A1ED3822600F0B54B /* RSTextDrawing.framework in Frameworks */, 84B06FE91ED3803A00F0B54B /* RSFeedFinder.framework in Frameworks */, 84B06FFD1ED3818D00F0B54B /* RSTree.framework in Frameworks */, @@ -431,7 +425,6 @@ 8471A2F51ED4D062008F099E /* LocalAccount.framework in Frameworks */, 8471A2C41ED4CEBF008F099E /* DataModel.framework in Frameworks */, 84B06FC21ED37E9600F0B54B /* RSWeb.framework in Frameworks */, - 84B06F821ED37BDD00F0B54B /* RSXML.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -628,6 +621,15 @@ path = Evergreen/Extensions; sourceTree = ""; }; + 849B89691F0349C100578A8D /* Products */ = { + isa = PBXGroup; + children = ( + 849B89751F0349C100578A8D /* RSParser.framework */, + 849B89771F0349C100578A8D /* RSParserTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; 849C64571ED37A5D003D8FC0 = { isa = PBXGroup; children = ( @@ -654,10 +656,10 @@ 84B06FA21ED37DAC00F0B54B /* RSCore.xcodeproj */, 84B06F961ED37DA000F0B54B /* RSDatabase.xcodeproj */, 84B06FE01ED3803200F0B54B /* RSFeedFinder.xcodeproj */, + 849B89681F0349C100578A8D /* RSParser.xcodeproj */, 84B070011ED3821800F0B54B /* RSTextDrawing.xcodeproj */, 84B06FF41ED3818000F0B54B /* RSTree.xcodeproj */, 84B06FB61ED37E8B00F0B54B /* RSWeb.xcodeproj */, - 84B06F761ED37BCA00F0B54B /* RSXML.xcodeproj */, ); sourceTree = ""; }; @@ -679,16 +681,6 @@ path = EvergreenTests; sourceTree = ""; }; - 84B06F771ED37BCA00F0B54B /* Products */ = { - isa = PBXGroup; - children = ( - 84B06F7D1ED37BCA00F0B54B /* RSXML.framework */, - 84B06F7F1ED37BCA00F0B54B /* RSXMLTests.xctest */, - 84B06F811ED37BCA00F0B54B /* RSXML.framework */, - ); - name = Products; - sourceTree = ""; - }; 84B06F971ED37DA000F0B54B /* Products */ = { isa = PBXGroup; children = ( @@ -779,7 +771,6 @@ buildRules = ( ); dependencies = ( - 84B06F851ED37BDD00F0B54B /* PBXTargetDependency */, 84B06FB11ED37DBD00F0B54B /* PBXTargetDependency */, 84B06FB51ED37DBD00F0B54B /* PBXTargetDependency */, 84B06FC51ED37E9600F0B54B /* PBXTargetDependency */, @@ -789,6 +780,7 @@ 84B0700D1ED3822600F0B54B /* PBXTargetDependency */, 8471A2C71ED4CEBF008F099E /* PBXTargetDependency */, 8471A2F81ED4D062008F099E /* PBXTargetDependency */, + 849B897F1F0349D000578A8D /* PBXTargetDependency */, ); name = Evergreen; productName = Evergreen; @@ -872,6 +864,10 @@ ProductGroup = 84B06FE11ED3803200F0B54B /* Products */; ProjectRef = 84B06FE01ED3803200F0B54B /* RSFeedFinder.xcodeproj */; }, + { + ProductGroup = 849B89691F0349C100578A8D /* Products */; + ProjectRef = 849B89681F0349C100578A8D /* RSParser.xcodeproj */; + }, { ProductGroup = 84B070021ED3821800F0B54B /* Products */; ProjectRef = 84B070011ED3821800F0B54B /* RSTextDrawing.xcodeproj */; @@ -884,10 +880,6 @@ ProductGroup = 84B06FB71ED37E8B00F0B54B /* Products */; ProjectRef = 84B06FB61ED37E8B00F0B54B /* RSWeb.xcodeproj */; }, - { - ProductGroup = 84B06F771ED37BCA00F0B54B /* Products */; - ProjectRef = 84B06F761ED37BCA00F0B54B /* RSXML.xcodeproj */; - }, ); projectRoot = ""; targets = ( @@ -919,25 +911,18 @@ remoteRef = 8471A2F31ED4D04D008F099E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 84B06F7D1ED37BCA00F0B54B /* RSXML.framework */ = { + 849B89751F0349C100578A8D /* RSParser.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; - path = RSXML.framework; - remoteRef = 84B06F7C1ED37BCA00F0B54B /* PBXContainerItemProxy */; + path = RSParser.framework; + remoteRef = 849B89741F0349C100578A8D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 84B06F7F1ED37BCA00F0B54B /* RSXMLTests.xctest */ = { + 849B89771F0349C100578A8D /* RSParserTests.xctest */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = RSXMLTests.xctest; - remoteRef = 84B06F7E1ED37BCA00F0B54B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84B06F811ED37BCA00F0B54B /* RSXML.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = RSXML.framework; - remoteRef = 84B06F801ED37BCA00F0B54B /* PBXContainerItemProxy */; + path = RSParserTests.xctest; + remoteRef = 849B89761F0349C100578A8D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 84B06F9D1ED37DA000F0B54B /* RSDatabase.framework */ = { @@ -1157,16 +1142,16 @@ name = LocalAccount; targetProxy = 8471A2F71ED4D062008F099E /* PBXContainerItemProxy */; }; + 849B897F1F0349D000578A8D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = RSParser; + targetProxy = 849B897E1F0349D000578A8D /* PBXContainerItemProxy */; + }; 849C64731ED37A5D003D8FC0 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 849C645F1ED37A5D003D8FC0 /* Evergreen */; targetProxy = 849C64721ED37A5D003D8FC0 /* PBXContainerItemProxy */; }; - 84B06F851ED37BDD00F0B54B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = RSXML; - targetProxy = 84B06F841ED37BDD00F0B54B /* PBXContainerItemProxy */; - }; 84B06FB11ED37DBD00F0B54B /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RSCore;