diff --git a/Cartfile b/Cartfile index 714c0b9..d0c9e58 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "relikd/RSXML" "master" \ No newline at end of file +github "relikd/RSXML2" "v2.0.0" \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index ce92320..5c6dc66 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "relikd/RSXML" "d7b51de438dc575fddf2b89d93a2647024396b17" +github "relikd/RSXML2" "v2.0.0" diff --git a/baRSS.xcodeproj/project.pbxproj b/baRSS.xcodeproj/project.pbxproj index 07211d1..dedb9b9 100644 --- a/baRSS.xcodeproj/project.pbxproj +++ b/baRSS.xcodeproj/project.pbxproj @@ -14,9 +14,9 @@ 54209E942117325100F3B5EF /* DrawImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 54209E932117325100F3B5EF /* DrawImage.m */; }; 544B011A2114B41200386E5C /* ModalSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 544B01192114B41200386E5C /* ModalSheet.m */; }; 544B011D2114EE9100386E5C /* AppHook.m in Sources */ = {isa = PBXBuildFile; fileRef = 544B011C2114EE9100386E5C /* AppHook.m */; }; - 544DCCB9212A2B4D002DBC46 /* RSXML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 544DCCB8212A2B4D002DBC46 /* RSXML.framework */; }; - 544DCCBA212A2B4D002DBC46 /* RSXML.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 544DCCB8212A2B4D002DBC46 /* RSXML.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 544DCCBE212A2B6F002DBC46 /* RSXML.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 544DCCBD212A2B6F002DBC46 /* RSXML.framework.dSYM */; }; + 544DCCB9212A2B4D002DBC46 /* RSXML2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 544DCCB8212A2B4D002DBC46 /* RSXML2.framework */; }; + 544DCCBA212A2B4D002DBC46 /* RSXML2.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 544DCCB8212A2B4D002DBC46 /* RSXML2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 544DCCBE212A2B6F002DBC46 /* RSXML2.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 544DCCBD212A2B6F002DBC46 /* RSXML2.framework.dSYM */; }; 54501010230E9C8600F0B165 /* FeedDownload.m in Sources */ = {isa = PBXBuildFile; fileRef = 5450100F230E9C8600F0B165 /* FeedDownload.m */; }; 546A6A2922C583390034E806 /* SettingsGeneralView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54D857D122802309001BA1C8 /* SettingsGeneralView.m */; }; 546A6A2C22C584AF0034E806 /* SettingsAppearanceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 546A6A2A22C584AF0034E806 /* SettingsAppearanceView.m */; }; @@ -72,7 +72,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 544DCCBA212A2B4D002DBC46 /* RSXML.framework in Embed Frameworks */, + 544DCCBA212A2B4D002DBC46 /* RSXML2.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -83,7 +83,7 @@ dstPath = ""; dstSubfolderSpec = 16; files = ( - 544DCCBE212A2B6F002DBC46 /* RSXML.framework.dSYM in CopyFiles */, + 544DCCBE212A2B6F002DBC46 /* RSXML2.framework.dSYM in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -116,8 +116,8 @@ 544B01192114B41200386E5C /* ModalSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModalSheet.m; sourceTree = ""; }; 544B011B2114EE9100386E5C /* AppHook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppHook.h; sourceTree = ""; }; 544B011C2114EE9100386E5C /* AppHook.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppHook.m; sourceTree = ""; }; - 544DCCB8212A2B4D002DBC46 /* RSXML.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RSXML.framework; path = Carthage/Build/Mac/RSXML.framework; sourceTree = ""; }; - 544DCCBD212A2B6F002DBC46 /* RSXML.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = RSXML.framework.dSYM; path = Carthage/Build/Mac/RSXML.framework.dSYM; sourceTree = ""; }; + 544DCCB8212A2B4D002DBC46 /* RSXML2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RSXML2.framework; path = Carthage/Build/Mac/RSXML2.framework; sourceTree = ""; }; + 544DCCBD212A2B6F002DBC46 /* RSXML2.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = RSXML2.framework.dSYM; path = Carthage/Build/Mac/RSXML2.framework.dSYM; sourceTree = ""; }; 5450100E230E9C8600F0B165 /* FeedDownload.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FeedDownload.h; sourceTree = ""; }; 5450100F230E9C8600F0B165 /* FeedDownload.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FeedDownload.m; sourceTree = ""; }; 546A6A2A22C584AF0034E806 /* SettingsAppearanceView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsAppearanceView.m; sourceTree = ""; }; @@ -195,7 +195,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 544DCCB9212A2B4D002DBC46 /* RSXML.framework in Frameworks */, + 544DCCB9212A2B4D002DBC46 /* RSXML2.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -241,8 +241,8 @@ 544FBD4321064AEB008A260C /* Frameworks */ = { isa = PBXGroup; children = ( - 544DCCB8212A2B4D002DBC46 /* RSXML.framework */, - 544DCCBD212A2B6F002DBC46 /* RSXML.framework.dSYM */, + 544DCCB8212A2B4D002DBC46 /* RSXML2.framework */, + 544DCCBD212A2B6F002DBC46 /* RSXML2.framework.dSYM */, ); name = Frameworks; sourceTree = ""; diff --git a/baRSS/Core Data/Feed+Ext.m b/baRSS/Core Data/Feed+Ext.m index 5ed060f..24e4f85 100644 --- a/baRSS/Core Data/Feed+Ext.m +++ b/baRSS/Core Data/Feed+Ext.m @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import RSXML; +@import RSXML2; #import "Feed+Ext.h" #import "Constants.h" #import "UserPrefs.h" diff --git a/baRSS/Core Data/FeedArticle+Ext.m b/baRSS/Core Data/FeedArticle+Ext.m index e00a286..4428bad 100644 --- a/baRSS/Core Data/FeedArticle+Ext.m +++ b/baRSS/Core Data/FeedArticle+Ext.m @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import RSXML.RSParsedArticle; +@import RSXML2.RSParsedArticle; #import "FeedArticle+Ext.h" #import "Constants.h" #import "UserPrefs.h" diff --git a/baRSS/Feed Import/FaviconDownload.m b/baRSS/Feed Import/FaviconDownload.m index 0c49df4..be84d44 100644 --- a/baRSS/Feed Import/FaviconDownload.m +++ b/baRSS/Feed Import/FaviconDownload.m @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import RSXML; +@import RSXML2; #import "FaviconDownload.h" #import "Feed+Ext.h" #import "FeedMeta+Ext.h" diff --git a/baRSS/Feed Import/FeedDownload.m b/baRSS/Feed Import/FeedDownload.m index ae1f687..aac7018 100644 --- a/baRSS/Feed Import/FeedDownload.m +++ b/baRSS/Feed Import/FeedDownload.m @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import RSXML; +@import RSXML2; #import "FeedDownload.h" #import "FaviconDownload.h" #import "Feed+Ext.h" diff --git a/baRSS/Feed Import/OpmlFile.m b/baRSS/Feed Import/OpmlFile.m index b933a22..0caa832 100644 --- a/baRSS/Feed Import/OpmlFile.m +++ b/baRSS/Feed Import/OpmlFile.m @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import RSXML; +@import RSXML2; #import "OpmlFile.h" #import "FeedMeta+Ext.h" #import "FeedGroup+Ext.h" diff --git a/baRSS/Info.plist b/baRSS/Info.plist index 9bf3947..c29a122 100644 --- a/baRSS/Info.plist +++ b/baRSS/Info.plist @@ -70,7 +70,7 @@ CFBundleVersion - 13197 + 13207 LSApplicationCategoryType public.app-category.news LSMinimumSystemVersion diff --git a/baRSS/Preferences/About Tab/SettingsAboutView.m b/baRSS/Preferences/About Tab/SettingsAboutView.m index 94dbab4..5344089 100644 --- a/baRSS/Preferences/About Tab/SettingsAboutView.m +++ b/baRSS/Preferences/About Tab/SettingsAboutView.m @@ -66,7 +66,7 @@ [self str:mas add:@"gitlab.com" link:@"https://gitlab.com/relikd/baRSS"]; [self str:mas add:@" (MIT License)\n\n" bold:NO]; [self str:mas add:@"3rd-Party Libraries\n" bold:YES]; - [self str:mas add:@"RSXML" link:@"https://github.com/relikd/RSXML"]; + [self str:mas add:@"RSXML2" link:@"https://github.com/relikd/RSXML2"]; [self str:mas add:@" (MIT License)" bold:NO]; [self str:mas add:@"\n\n\n\nOptions\n" bold:YES]; [self str:mas add:@"Fix Cache" link:@"barss:config/fixcache"]; diff --git a/baRSS/Preferences/Feeds Tab/ModalFeedEdit.m b/baRSS/Preferences/Feeds Tab/ModalFeedEdit.m index 81e8883..0b1b3b4 100644 --- a/baRSS/Preferences/Feeds Tab/ModalFeedEdit.m +++ b/baRSS/Preferences/Feeds Tab/ModalFeedEdit.m @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import RSXML; +@import RSXML2; #import "ModalFeedEdit.h" #import "ModalFeedEditView.h" #import "RefreshStatisticsView.h"