From c2ba9b06a4754fae54d2ea43f955e62068dc6cc1 Mon Sep 17 00:00:00 2001 From: relikd Date: Mon, 16 Sep 2019 00:18:25 +0200 Subject: [PATCH] RSXML2 rename --- .gitignore | 8 +- README.md | 19 ++- RSXML.podspec => RSXML2.podspec | 14 +- .../project.pbxproj | 142 +++++++++--------- .../contents.xcworkspacedata | 2 +- ...8756A8AF-348E-4D58-81F2-569F71868FB1.plist | 0 ...B9957C87-0F96-4C9B-864E-DF5BD201D1DC.plist | 0 .../Info.plist | 0 .../xcshareddata/xcschemes/RSXML2.xcscheme | 30 ++-- .../xcshareddata/xcschemes/RSXML2iOS.xcscheme | 18 +-- {RSXML => RSXML2}/Info.plist | 2 +- {RSXML => RSXML2}/NSDictionary+RSXML.h | 0 {RSXML => RSXML2}/NSDictionary+RSXML.m | 0 {RSXML => RSXML2}/NSString+RSXML.h | 0 {RSXML => RSXML2}/NSString+RSXML.m | 0 {RSXML => RSXML2}/RSAtomParser.h | 0 {RSXML => RSXML2}/RSAtomParser.m | 0 {RSXML => RSXML2}/RSDateParser.h | 0 {RSXML => RSXML2}/RSDateParser.m | 0 {RSXML => RSXML2}/RSFeedParser.h | 0 {RSXML => RSXML2}/RSFeedParser.m | 0 {RSXML => RSXML2}/RSHTMLLinkParser.h | 0 {RSXML => RSXML2}/RSHTMLLinkParser.m | 0 {RSXML => RSXML2}/RSHTMLMetadata.h | 0 {RSXML => RSXML2}/RSHTMLMetadata.m | 0 {RSXML => RSXML2}/RSHTMLMetadataParser.h | 0 {RSXML => RSXML2}/RSHTMLMetadataParser.m | 0 {RSXML => RSXML2}/RSOPMLItem.h | 0 {RSXML => RSXML2}/RSOPMLItem.m | 0 {RSXML => RSXML2}/RSOPMLParser.h | 0 {RSXML => RSXML2}/RSOPMLParser.m | 0 {RSXML => RSXML2}/RSParsedArticle.h | 0 {RSXML => RSXML2}/RSParsedArticle.m | 0 {RSXML => RSXML2}/RSParsedFeed.h | 0 {RSXML => RSXML2}/RSParsedFeed.m | 0 {RSXML => RSXML2}/RSRSSParser.h | 0 {RSXML => RSXML2}/RSRSSParser.m | 0 {RSXML => RSXML2}/RSSAXParser.h | 0 {RSXML => RSXML2}/RSSAXParser.m | 0 RSXML/RSXML.h => RSXML2/RSXML2.h | 30 ++-- {RSXML => RSXML2}/RSXMLData.h | 0 {RSXML => RSXML2}/RSXMLData.m | 0 {RSXML => RSXML2}/RSXMLError.h | 0 {RSXML => RSXML2}/RSXMLError.m | 0 {RSXML => RSXML2}/RSXMLParser.h | 0 {RSXML => RSXML2}/RSXMLParser.m | 0 {RSXMLTests => RSXML2Tests}/Info.plist | 0 .../RSDateParserTests.m | 2 +- {RSXMLTests => RSXML2Tests}/RSEntityTests.m | 2 +- {RSXMLTests => RSXML2Tests}/RSHTMLTests.m | 2 +- {RSXMLTests => RSXML2Tests}/RSOPMLTests.m | 2 +- {RSXMLTests => RSXML2Tests}/RSXMLTests.m | 2 +- .../Resources/DaringFireball.atom | 0 .../Resources/DaringFireball.html | 0 .../Resources/EMarley.rss | 0 .../Resources/KatieFloyd.rss | 0 .../Resources/OneFootTsunami.atom | 0 .../Resources/Subs.opml | 0 .../Resources/broken.rss | 0 .../Resources/ccc-media.rdf | 0 .../Resources/furbo.html | 0 .../Resources/inessential.html | 0 .../Resources/lower-ascii.rss | 0 .../Resources/manton.rss | 0 .../Resources/scriptingNews.rss | 0 .../Resources/sixcolors.html | 0 {RSXMLTests => RSXML2Tests}/download_feeds.sh | 0 {RSXMLTests => RSXML2Tests}/download_list.txt | 0 {RSXMLiOS => RSXML2iOS}/Info.plist | 2 +- 69 files changed, 141 insertions(+), 136 deletions(-) rename RSXML.podspec => RSXML2.podspec (65%) rename {RSXML.xcodeproj => RSXML2.xcodeproj}/project.pbxproj (90%) rename {RSXML.xcodeproj => RSXML2.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (72%) rename {RSXML.xcodeproj => RSXML2.xcodeproj}/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/8756A8AF-348E-4D58-81F2-569F71868FB1.plist (100%) rename {RSXML.xcodeproj => RSXML2.xcodeproj}/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/B9957C87-0F96-4C9B-864E-DF5BD201D1DC.plist (100%) rename {RSXML.xcodeproj => RSXML2.xcodeproj}/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/Info.plist (100%) rename RSXML.xcodeproj/xcshareddata/xcschemes/RSXML.xcscheme => RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2.xcscheme (78%) rename RSXML.xcodeproj/xcshareddata/xcschemes/RSXMLiOS.xcscheme => RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2iOS.xcscheme (83%) rename {RSXML => RSXML2}/Info.plist (91%) rename {RSXML => RSXML2}/NSDictionary+RSXML.h (100%) rename {RSXML => RSXML2}/NSDictionary+RSXML.m (100%) rename {RSXML => RSXML2}/NSString+RSXML.h (100%) rename {RSXML => RSXML2}/NSString+RSXML.m (100%) rename {RSXML => RSXML2}/RSAtomParser.h (100%) rename {RSXML => RSXML2}/RSAtomParser.m (100%) rename {RSXML => RSXML2}/RSDateParser.h (100%) rename {RSXML => RSXML2}/RSDateParser.m (100%) rename {RSXML => RSXML2}/RSFeedParser.h (100%) rename {RSXML => RSXML2}/RSFeedParser.m (100%) rename {RSXML => RSXML2}/RSHTMLLinkParser.h (100%) rename {RSXML => RSXML2}/RSHTMLLinkParser.m (100%) rename {RSXML => RSXML2}/RSHTMLMetadata.h (100%) rename {RSXML => RSXML2}/RSHTMLMetadata.m (100%) rename {RSXML => RSXML2}/RSHTMLMetadataParser.h (100%) rename {RSXML => RSXML2}/RSHTMLMetadataParser.m (100%) rename {RSXML => RSXML2}/RSOPMLItem.h (100%) rename {RSXML => RSXML2}/RSOPMLItem.m (100%) rename {RSXML => RSXML2}/RSOPMLParser.h (100%) rename {RSXML => RSXML2}/RSOPMLParser.m (100%) rename {RSXML => RSXML2}/RSParsedArticle.h (100%) rename {RSXML => RSXML2}/RSParsedArticle.m (100%) rename {RSXML => RSXML2}/RSParsedFeed.h (100%) rename {RSXML => RSXML2}/RSParsedFeed.m (100%) rename {RSXML => RSXML2}/RSRSSParser.h (100%) rename {RSXML => RSXML2}/RSRSSParser.m (100%) rename {RSXML => RSXML2}/RSSAXParser.h (100%) rename {RSXML => RSXML2}/RSSAXParser.m (100%) rename RSXML/RSXML.h => RSXML2/RSXML2.h (72%) rename {RSXML => RSXML2}/RSXMLData.h (100%) rename {RSXML => RSXML2}/RSXMLData.m (100%) rename {RSXML => RSXML2}/RSXMLError.h (100%) rename {RSXML => RSXML2}/RSXMLError.m (100%) rename {RSXML => RSXML2}/RSXMLParser.h (100%) rename {RSXML => RSXML2}/RSXMLParser.m (100%) rename {RSXMLTests => RSXML2Tests}/Info.plist (100%) rename {RSXMLTests => RSXML2Tests}/RSDateParserTests.m (99%) rename {RSXMLTests => RSXML2Tests}/RSEntityTests.m (99%) rename {RSXMLTests => RSXML2Tests}/RSHTMLTests.m (99%) rename {RSXMLTests => RSXML2Tests}/RSOPMLTests.m (99%) rename {RSXMLTests => RSXML2Tests}/RSXMLTests.m (99%) rename {RSXMLTests => RSXML2Tests}/Resources/DaringFireball.atom (100%) rename {RSXMLTests => RSXML2Tests}/Resources/DaringFireball.html (100%) rename {RSXMLTests => RSXML2Tests}/Resources/EMarley.rss (100%) rename {RSXMLTests => RSXML2Tests}/Resources/KatieFloyd.rss (100%) rename {RSXMLTests => RSXML2Tests}/Resources/OneFootTsunami.atom (100%) rename {RSXMLTests => RSXML2Tests}/Resources/Subs.opml (100%) rename {RSXMLTests => RSXML2Tests}/Resources/broken.rss (100%) rename {RSXMLTests => RSXML2Tests}/Resources/ccc-media.rdf (100%) rename {RSXMLTests => RSXML2Tests}/Resources/furbo.html (100%) rename {RSXMLTests => RSXML2Tests}/Resources/inessential.html (100%) rename {RSXMLTests => RSXML2Tests}/Resources/lower-ascii.rss (100%) rename {RSXMLTests => RSXML2Tests}/Resources/manton.rss (100%) rename {RSXMLTests => RSXML2Tests}/Resources/scriptingNews.rss (100%) rename {RSXMLTests => RSXML2Tests}/Resources/sixcolors.html (100%) rename {RSXMLTests => RSXML2Tests}/download_feeds.sh (100%) rename {RSXMLTests => RSXML2Tests}/download_list.txt (100%) rename {RSXMLiOS => RSXML2iOS}/Info.plist (96%) diff --git a/.gitignore b/.gitignore index fe02f5d..34a0524 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,11 @@ # Ignore downloaded files for test cases -RSXMLTests/Resources/feed_[0-9]*.rss +RSXML2Tests/Resources/feed_[0-9]*.rss + +### macOS ### +.DS_Store +.AppleDouble +.LSOverride +._* # Xcode # diff --git a/README.md b/README.md index e188ef4..db6b20c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,14 @@ -# RSXML +[![Current release](https://img.shields.io/github/v/release/relikd/RSXML2)][releases] +[![macOS 10.10+](https://img.shields.io/badge/macOS-10.10+-888)][releases] +[![iOS 8.0+](https://img.shields.io/badge/iOS-8.0+-888)][releases] +[![MIT license](https://img.shields.io/badge/license-MIT-7B2)](LICENSE) + + +# RSXML2 This is utility code for parsing XML and HTML using libXML2’s SAX parser. It does not depend on any other third-party frameworks and builds two targets: one for Mac, one for iOS. -**Note:** This is an actively maintained fork of the [RSXML library by Brent Simmons](https://github.com/brentsimmons/RSXML). The original library seems to be inactive in favor of the new version [RSParser](https://github.com/brentsimmons/RSParser) which is written with Swift support in mind. If you prefer Swift you should go ahead and work with that project. However, the reason for this fork is to keep a version alive which is Objective-C only. +**Note:** This is an actively maintained fork of the [RSXML library by Brent Simmons](https://github.com/brentsimmons/RSXML). The original library seems to be inactive in favor of the new version [RSParser](https://github.com/brentsimmons/RSParser) which is written with Swift support in mind. If you prefer Swift you should go ahead and use that library. However, the reason for this fork is to keep a version alive which is Objective-C only. @@ -56,11 +62,4 @@ You can define the parser type by declaring it like this: `RSXMLData 'MIT', :file => 'LICENSE' } - s.author = { 'Brent Simmons' => '' } - s.source = { :git => 'https://github.com/brentsimmons/RSXML.git', :tag => s.version.to_s } + s.author = { 'Oleg Geier' => '' } + s.source = { :git => 'https://github.com/relikd/RSXML2.git', :tag => s.version.to_s } s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.10' - s.source_files = 'RSXML/*' + s.source_files = 'RSXML2/*' - s.public_header_files = 'RSXML/*.h' + s.public_header_files = 'RSXML2/*.h' s.libraries = 'xml2.2' s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' } diff --git a/RSXML.xcodeproj/project.pbxproj b/RSXML2.xcodeproj/project.pbxproj similarity index 90% rename from RSXML.xcodeproj/project.pbxproj rename to RSXML2.xcodeproj/project.pbxproj index 56e2f4f..ecd126f 100644 --- a/RSXML.xcodeproj/project.pbxproj +++ b/RSXML2.xcodeproj/project.pbxproj @@ -39,7 +39,7 @@ 8486F1161BB646140092794F /* NSString+RSXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 8486F1141BB646140092794F /* NSString+RSXML.m */; }; 84AD0BF51E11A6FB00B38510 /* RSDateParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AD0BF31E11A6FB00B38510 /* RSDateParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; 84AD0BF61E11A6FB00B38510 /* RSDateParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 84AD0BF41E11A6FB00B38510 /* RSDateParser.m */; }; - 84AD0C0D1E11B8BE00B38510 /* RSXML.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F22C101B52DDEA000060CE /* RSXML.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 84AD0C0D1E11B8BE00B38510 /* RSXML2.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F22C101B52DDEA000060CE /* RSXML2.h */; settings = {ATTRIBUTES = (Public, ); }; }; 84AD0C0E1E11B8CA00B38510 /* RSXMLError.h in Headers */ = {isa = PBXBuildFile; fileRef = 84E4BE431C8B8FE400A90B41 /* RSXMLError.h */; settings = {ATTRIBUTES = (Public, ); }; }; 84AD0C0F1E11B8CA00B38510 /* RSXMLError.m in Sources */ = {isa = PBXBuildFile; fileRef = 84E4BE441C8B8FE400A90B41 /* RSXMLError.m */; }; 84AD0C101E11B8CA00B38510 /* RSSAXParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F22C271B52DDFE000060CE /* RSSAXParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -80,8 +80,8 @@ 84E4BE451C8B8FE400A90B41 /* RSXMLError.h in Headers */ = {isa = PBXBuildFile; fileRef = 84E4BE431C8B8FE400A90B41 /* RSXMLError.h */; settings = {ATTRIBUTES = (Public, ); }; }; 84E4BE461C8B8FE400A90B41 /* RSXMLError.m in Sources */ = {isa = PBXBuildFile; fileRef = 84E4BE441C8B8FE400A90B41 /* RSXMLError.m */; }; 84E4BE481C8B989D00A90B41 /* RSHTMLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 84E4BE471C8B989D00A90B41 /* RSHTMLTests.m */; }; - 84F22C111B52DDEA000060CE /* RSXML.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F22C101B52DDEA000060CE /* RSXML.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 84F22C181B52DDEA000060CE /* RSXML.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F22C0D1B52DDEA000060CE /* RSXML.framework */; }; + 84F22C111B52DDEA000060CE /* RSXML2.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F22C101B52DDEA000060CE /* RSXML2.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 84F22C181B52DDEA000060CE /* RSXML2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F22C0D1B52DDEA000060CE /* RSXML2.framework */; }; 84F22C1D1B52DDEA000060CE /* RSXMLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 84F22C1C1B52DDEA000060CE /* RSXMLTests.m */; }; 84F22C291B52DDFE000060CE /* RSSAXParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 84F22C271B52DDFE000060CE /* RSSAXParser.h */; settings = {ATTRIBUTES = (Public, ); }; }; 84F22C2A1B52DDFE000060CE /* RSSAXParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 84F22C281B52DDFE000060CE /* RSSAXParser.m */; }; @@ -121,28 +121,28 @@ 842D51751B530BF200E63D52 /* RSParsedFeed.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSParsedFeed.m; sourceTree = ""; }; 842D51781B5311AD00E63D52 /* RSOPMLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSOPMLParser.h; sourceTree = ""; }; 842D51791B5311AD00E63D52 /* RSOPMLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSOPMLParser.m; sourceTree = ""; }; - 8475C4061D57AB4C0076751E /* RSHTMLLinkParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSHTMLLinkParser.h; path = RSXML/RSHTMLLinkParser.h; sourceTree = ""; }; - 8475C4071D57AB4C0076751E /* RSHTMLLinkParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = RSHTMLLinkParser.m; path = RSXML/RSHTMLLinkParser.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; + 8475C4061D57AB4C0076751E /* RSHTMLLinkParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSHTMLLinkParser.h; path = RSXML2/RSHTMLLinkParser.h; sourceTree = ""; }; + 8475C4071D57AB4C0076751E /* RSHTMLLinkParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = RSHTMLLinkParser.m; path = RSXML2/RSHTMLLinkParser.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 8486F1131BB646140092794F /* NSString+RSXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+RSXML.h"; sourceTree = ""; }; 8486F1141BB646140092794F /* NSString+RSXML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+RSXML.m"; sourceTree = ""; }; 84AD0BF31E11A6FB00B38510 /* RSDateParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSDateParser.h; sourceTree = ""; }; 84AD0BF41E11A6FB00B38510 /* RSDateParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSDateParser.m; sourceTree = ""; }; - 84AD0C051E11B7D200B38510 /* RSXML.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RSXML.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 84AD0C051E11B7D200B38510 /* RSXML2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RSXML2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 84AD0C081E11B7D200B38510 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 84AD0C381E11BAA800B38510 /* libxml2.2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.2.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/usr/lib/libxml2.2.tbd; sourceTree = DEVELOPER_DIR; }; 84AD0C3A1E11C2D500B38510 /* RSEntityTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSEntityTests.m; sourceTree = ""; }; 84AD0C3C1E11D75400B38510 /* RSDateParserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSDateParserTests.m; sourceTree = ""; }; - 84BF3E141C8CDD1A005562D8 /* RSHTMLMetadataParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSHTMLMetadataParser.h; path = RSXML/RSHTMLMetadataParser.h; sourceTree = ""; }; - 84BF3E151C8CDD1A005562D8 /* RSHTMLMetadataParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = RSHTMLMetadataParser.m; path = RSXML/RSHTMLMetadataParser.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - 84BF3E1A1C8CDD6D005562D8 /* RSHTMLMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSHTMLMetadata.h; path = RSXML/RSHTMLMetadata.h; sourceTree = ""; }; - 84BF3E1B1C8CDD6D005562D8 /* RSHTMLMetadata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = RSHTMLMetadata.m; path = RSXML/RSHTMLMetadata.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; + 84BF3E141C8CDD1A005562D8 /* RSHTMLMetadataParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSHTMLMetadataParser.h; path = RSXML2/RSHTMLMetadataParser.h; sourceTree = ""; }; + 84BF3E151C8CDD1A005562D8 /* RSHTMLMetadataParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = RSHTMLMetadataParser.m; path = RSXML2/RSHTMLMetadataParser.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; + 84BF3E1A1C8CDD6D005562D8 /* RSHTMLMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RSHTMLMetadata.h; path = RSXML2/RSHTMLMetadata.h; sourceTree = ""; }; + 84BF3E1B1C8CDD6D005562D8 /* RSHTMLMetadata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = RSHTMLMetadata.m; path = RSXML2/RSHTMLMetadata.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 84E4BE431C8B8FE400A90B41 /* RSXMLError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSXMLError.h; sourceTree = ""; }; 84E4BE441C8B8FE400A90B41 /* RSXMLError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSXMLError.m; sourceTree = ""; }; 84E4BE471C8B989D00A90B41 /* RSHTMLTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSHTMLTests.m; sourceTree = ""; }; - 84F22C0D1B52DDEA000060CE /* RSXML.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RSXML.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 84F22C101B52DDEA000060CE /* RSXML.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RSXML.h; path = RSXML/RSXML.h; sourceTree = ""; }; - 84F22C121B52DDEA000060CE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = RSXML/Info.plist; sourceTree = ""; }; - 84F22C171B52DDEA000060CE /* RSXMLTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RSXMLTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 84F22C0D1B52DDEA000060CE /* RSXML2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RSXML2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 84F22C101B52DDEA000060CE /* RSXML2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RSXML2.h; path = RSXML2/RSXML2.h; sourceTree = ""; }; + 84F22C121B52DDEA000060CE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = RSXML2/Info.plist; sourceTree = ""; }; + 84F22C171B52DDEA000060CE /* RSXML2Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RSXML2Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 84F22C1C1B52DDEA000060CE /* RSXMLTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RSXMLTests.m; sourceTree = ""; }; 84F22C1E1B52DDEA000060CE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 84F22C271B52DDFE000060CE /* RSSAXParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSSAXParser.h; sourceTree = ""; }; @@ -171,7 +171,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 84F22C181B52DDEA000060CE /* RSXML.framework in Frameworks */, + 84F22C181B52DDEA000060CE /* RSXML2.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -197,7 +197,7 @@ 54702A9721D407A00050A741 /* RSXMLParser.m */, ); name = General; - path = RSXML; + path = RSXML2; sourceTree = ""; }; 842D515E1B52E83100E63D52 /* Feeds */ = { @@ -215,7 +215,7 @@ 842D51621B53058B00E63D52 /* RSParsedArticle.m */, ); name = Feeds; - path = RSXML; + path = RSXML2; sourceTree = ""; }; 842D517C1B5311B000E63D52 /* OPML */ = { @@ -227,15 +227,15 @@ 8429D1B51C83A03100F97695 /* RSOPMLItem.m */, ); name = OPML; - path = RSXML; + path = RSXML2; sourceTree = ""; }; - 84AD0C061E11B7D200B38510 /* RSXMLiOS */ = { + 84AD0C061E11B7D200B38510 /* RSXML2iOS */ = { isa = PBXGroup; children = ( 84AD0C081E11B7D200B38510 /* Info.plist */, ); - path = RSXMLiOS; + path = RSXML2iOS; sourceTree = ""; }; 84AD0C371E11BAA800B38510 /* Frameworks */ = { @@ -262,14 +262,14 @@ 84F22C031B52DDEA000060CE = { isa = PBXGroup; children = ( - 84F22C101B52DDEA000060CE /* RSXML.h */, + 84F22C101B52DDEA000060CE /* RSXML2.h */, 54702A9521D407520050A741 /* General */, 842D517C1B5311B000E63D52 /* OPML */, 842D515E1B52E83100E63D52 /* Feeds */, 84E4BE4D1C8B98E400A90B41 /* HTML */, 84F22C121B52DDEA000060CE /* Info.plist */, - 84F22C1B1B52DDEA000060CE /* RSXMLTests */, - 84AD0C061E11B7D200B38510 /* RSXMLiOS */, + 84F22C1B1B52DDEA000060CE /* RSXML2Tests */, + 84AD0C061E11B7D200B38510 /* RSXML2iOS */, 84F22C0E1B52DDEA000060CE /* Products */, 84F22C451B52DF90000060CE /* libxml2.2.tbd */, 84AD0C371E11BAA800B38510 /* Frameworks */, @@ -279,14 +279,14 @@ 84F22C0E1B52DDEA000060CE /* Products */ = { isa = PBXGroup; children = ( - 84F22C0D1B52DDEA000060CE /* RSXML.framework */, - 84F22C171B52DDEA000060CE /* RSXMLTests.xctest */, - 84AD0C051E11B7D200B38510 /* RSXML.framework */, + 84F22C0D1B52DDEA000060CE /* RSXML2.framework */, + 84F22C171B52DDEA000060CE /* RSXML2Tests.xctest */, + 84AD0C051E11B7D200B38510 /* RSXML2.framework */, ); name = Products; sourceTree = ""; }; - 84F22C1B1B52DDEA000060CE /* RSXMLTests */ = { + 84F22C1B1B52DDEA000060CE /* RSXML2Tests */ = { isa = PBXGroup; children = ( 84F22C1C1B52DDEA000060CE /* RSXMLTests.m */, @@ -297,7 +297,7 @@ 54FCE5F321493B5E00FABB65 /* Resources */, 84F22C1E1B52DDEA000060CE /* Info.plist */, ); - path = RSXMLTests; + path = RSXML2Tests; sourceTree = ""; }; /* End PBXGroup section */ @@ -324,7 +324,7 @@ 84AD0C291E11B8D400B38510 /* RSParsedFeed.h in Headers */, 84AD0C181E11B8CF00B38510 /* RSOPMLParser.h in Headers */, 84AD0C141E11B8CA00B38510 /* NSString+RSXML.h in Headers */, - 84AD0C0D1E11B8BE00B38510 /* RSXML.h in Headers */, + 84AD0C0D1E11B8BE00B38510 /* RSXML2.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -346,7 +346,7 @@ 842D51521B52E80100E63D52 /* RSFeedParser.h in Headers */, 54C707DD21D42B710029BFF1 /* NSDictionary+RSXML.h in Headers */, 84E4BE451C8B8FE400A90B41 /* RSXMLError.h in Headers */, - 84F22C111B52DDEA000060CE /* RSXML.h in Headers */, + 84F22C111B52DDEA000060CE /* RSXML2.h in Headers */, 842D514C1B52E7FC00E63D52 /* RSAtomParser.h in Headers */, 842D515A1B52E81B00E63D52 /* RSRSSParser.h in Headers */, 84F22C291B52DDFE000060CE /* RSSAXParser.h in Headers */, @@ -356,9 +356,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 84AD0C041E11B7D200B38510 /* RSXMLiOS */ = { + 84AD0C041E11B7D200B38510 /* RSXML2iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 84AD0C0A1E11B7D200B38510 /* Build configuration list for PBXNativeTarget "RSXMLiOS" */; + buildConfigurationList = 84AD0C0A1E11B7D200B38510 /* Build configuration list for PBXNativeTarget "RSXML2iOS" */; buildPhases = ( 84AD0C001E11B7D200B38510 /* Sources */, 84AD0C011E11B7D200B38510 /* Frameworks */, @@ -369,14 +369,14 @@ ); dependencies = ( ); - name = RSXMLiOS; - productName = RSXMLiOS; - productReference = 84AD0C051E11B7D200B38510 /* RSXML.framework */; + name = RSXML2iOS; + productName = RSXML2iOS; + productReference = 84AD0C051E11B7D200B38510 /* RSXML2.framework */; productType = "com.apple.product-type.framework"; }; - 84F22C0C1B52DDEA000060CE /* RSXML */ = { + 84F22C0C1B52DDEA000060CE /* RSXML2 */ = { isa = PBXNativeTarget; - buildConfigurationList = 84F22C211B52DDEA000060CE /* Build configuration list for PBXNativeTarget "RSXML" */; + buildConfigurationList = 84F22C211B52DDEA000060CE /* Build configuration list for PBXNativeTarget "RSXML2" */; buildPhases = ( 84F22C081B52DDEA000060CE /* Sources */, 84F22C091B52DDEA000060CE /* Frameworks */, @@ -387,14 +387,14 @@ ); dependencies = ( ); - name = RSXML; - productName = RSXML; - productReference = 84F22C0D1B52DDEA000060CE /* RSXML.framework */; + name = RSXML2; + productName = RSXML2; + productReference = 84F22C0D1B52DDEA000060CE /* RSXML2.framework */; productType = "com.apple.product-type.framework"; }; - 84F22C161B52DDEA000060CE /* RSXMLTests */ = { + 84F22C161B52DDEA000060CE /* RSXML2Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 84F22C241B52DDEA000060CE /* Build configuration list for PBXNativeTarget "RSXMLTests" */; + buildConfigurationList = 84F22C241B52DDEA000060CE /* Build configuration list for PBXNativeTarget "RSXML2Tests" */; buildPhases = ( 84F22C131B52DDEA000060CE /* Sources */, 84F22C141B52DDEA000060CE /* Frameworks */, @@ -405,9 +405,9 @@ dependencies = ( 84F22C1A1B52DDEA000060CE /* PBXTargetDependency */, ); - name = RSXMLTests; - productName = RSXMLTests; - productReference = 84F22C171B52DDEA000060CE /* RSXMLTests.xctest */; + name = RSXML2Tests; + productName = RSXML2Tests; + productReference = 84F22C171B52DDEA000060CE /* RSXML2Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -418,7 +418,7 @@ attributes = { LastSwiftUpdateCheck = 0700; LastUpgradeCheck = 0700; - ORGANIZATIONNAME = "Ranchero Software, LLC"; + ORGANIZATIONNAME = "relikd"; TargetAttributes = { 84AD0C041E11B7D200B38510 = { CreatedOnToolsVersion = 8.2.1; @@ -433,7 +433,7 @@ }; }; }; - buildConfigurationList = 84F22C071B52DDEA000060CE /* Build configuration list for PBXProject "RSXML" */; + buildConfigurationList = 84F22C071B52DDEA000060CE /* Build configuration list for PBXProject "RSXML2" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -445,9 +445,9 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 84F22C0C1B52DDEA000060CE /* RSXML */, - 84F22C161B52DDEA000060CE /* RSXMLTests */, - 84AD0C041E11B7D200B38510 /* RSXMLiOS */, + 84F22C0C1B52DDEA000060CE /* RSXML2 */, + 84F22C161B52DDEA000060CE /* RSXML2Tests */, + 84AD0C041E11B7D200B38510 /* RSXML2iOS */, ); }; /* End PBXProject section */ @@ -543,7 +543,7 @@ /* Begin PBXTargetDependency section */ 84F22C1A1B52DDEA000060CE /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 84F22C0C1B52DDEA000060CE /* RSXML */; + target = 84F22C0C1B52DDEA000060CE /* RSXML2 */; targetProxy = 84F22C191B52DDEA000060CE /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -564,12 +564,12 @@ "$(inherited)", ); HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; - INFOPLIST_FILE = RSXMLiOS/Info.plist; + INFOPLIST_FILE = RSXML2iOS/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSXMLiOS; - PRODUCT_NAME = RSXML; + PRODUCT_BUNDLE_IDENTIFIER = de.relikd.RSXML2iOS; + PRODUCT_NAME = RSXML2; SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -588,12 +588,12 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_PREPROCESSOR_DEFINITIONS = "TARGET_IOS=1"; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; - INFOPLIST_FILE = RSXMLiOS/Info.plist; + INFOPLIST_FILE = RSXML2iOS/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSXMLiOS; - PRODUCT_NAME = RSXML; + PRODUCT_BUNDLE_IDENTIFIER = de.relikd.RSXML2iOS; + PRODUCT_NAME = RSXML2; SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -660,7 +660,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; RUN_CLANG_STATIC_ANALYZER = YES; @@ -723,7 +723,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = macosx; @@ -744,10 +744,10 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; - INFOPLIST_FILE = RSXML/Info.plist; + INFOPLIST_FILE = RSXML2/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSXML; + PRODUCT_BUNDLE_IDENTIFIER = de.relikd.RSXML2; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -767,10 +767,10 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; - INFOPLIST_FILE = RSXML/Info.plist; + INFOPLIST_FILE = RSXML2/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSXML; + PRODUCT_BUNDLE_IDENTIFIER = de.relikd.RSXML2; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_VERSION = 3.0; @@ -783,9 +783,9 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COMBINE_HIDPI_IMAGES = YES; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; - INFOPLIST_FILE = RSXMLTests/Info.plist; + INFOPLIST_FILE = RSXML2Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSXMLTests; + PRODUCT_BUNDLE_IDENTIFIER = de.relikd.RSXML2Tests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 3.0; }; @@ -797,9 +797,9 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COMBINE_HIDPI_IMAGES = YES; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; - INFOPLIST_FILE = RSXMLTests/Info.plist; + INFOPLIST_FILE = RSXML2Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.RSXMLTests; + PRODUCT_BUNDLE_IDENTIFIER = de.relikd.RSXML2Tests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 3.0; }; @@ -808,7 +808,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 84AD0C0A1E11B7D200B38510 /* Build configuration list for PBXNativeTarget "RSXMLiOS" */ = { + 84AD0C0A1E11B7D200B38510 /* Build configuration list for PBXNativeTarget "RSXML2iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 84AD0C0B1E11B7D200B38510 /* Debug */, @@ -817,7 +817,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 84F22C071B52DDEA000060CE /* Build configuration list for PBXProject "RSXML" */ = { + 84F22C071B52DDEA000060CE /* Build configuration list for PBXProject "RSXML2" */ = { isa = XCConfigurationList; buildConfigurations = ( 84F22C1F1B52DDEA000060CE /* Debug */, @@ -826,7 +826,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 84F22C211B52DDEA000060CE /* Build configuration list for PBXNativeTarget "RSXML" */ = { + 84F22C211B52DDEA000060CE /* Build configuration list for PBXNativeTarget "RSXML2" */ = { isa = XCConfigurationList; buildConfigurations = ( 84F22C221B52DDEA000060CE /* Debug */, @@ -835,7 +835,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 84F22C241B52DDEA000060CE /* Build configuration list for PBXNativeTarget "RSXMLTests" */ = { + 84F22C241B52DDEA000060CE /* Build configuration list for PBXNativeTarget "RSXML2Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( 84F22C251B52DDEA000060CE /* Debug */, diff --git a/RSXML.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/RSXML2.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 72% rename from RSXML.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to RSXML2.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 124241c..4e7eae4 100644 --- a/RSXML.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/RSXML2.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:RSXML2.xcodeproj"> diff --git a/RSXML.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/8756A8AF-348E-4D58-81F2-569F71868FB1.plist b/RSXML2.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/8756A8AF-348E-4D58-81F2-569F71868FB1.plist similarity index 100% rename from RSXML.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/8756A8AF-348E-4D58-81F2-569F71868FB1.plist rename to RSXML2.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/8756A8AF-348E-4D58-81F2-569F71868FB1.plist diff --git a/RSXML.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/B9957C87-0F96-4C9B-864E-DF5BD201D1DC.plist b/RSXML2.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/B9957C87-0F96-4C9B-864E-DF5BD201D1DC.plist similarity index 100% rename from RSXML.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/B9957C87-0F96-4C9B-864E-DF5BD201D1DC.plist rename to RSXML2.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/B9957C87-0F96-4C9B-864E-DF5BD201D1DC.plist diff --git a/RSXML.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/Info.plist b/RSXML2.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/Info.plist similarity index 100% rename from RSXML.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/Info.plist rename to RSXML2.xcodeproj/xcshareddata/xcbaselines/84F22C161B52DDEA000060CE.xcbaseline/Info.plist diff --git a/RSXML.xcodeproj/xcshareddata/xcschemes/RSXML.xcscheme b/RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2.xcscheme similarity index 78% rename from RSXML.xcodeproj/xcshareddata/xcschemes/RSXML.xcscheme rename to RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2.xcscheme index 575075c..d9bfa2f 100644 --- a/RSXML.xcodeproj/xcshareddata/xcschemes/RSXML.xcscheme +++ b/RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "RSXML2.framework" + BlueprintName = "RSXML2" + ReferencedContainer = "container:RSXML2.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "RSXML2Tests.xctest" + BlueprintName = "RSXML2Tests" + ReferencedContainer = "container:RSXML2.xcodeproj"> @@ -43,9 +43,9 @@ + BuildableName = "RSXML2.framework" + BlueprintName = "RSXML2" + ReferencedContainer = "container:RSXML2.xcodeproj"> @@ -65,9 +65,9 @@ + BuildableName = "RSXML2.framework" + BlueprintName = "RSXML2" + ReferencedContainer = "container:RSXML2.xcodeproj"> @@ -83,9 +83,9 @@ + BuildableName = "RSXML2.framework" + BlueprintName = "RSXML2" + ReferencedContainer = "container:RSXML2.xcodeproj"> diff --git a/RSXML.xcodeproj/xcshareddata/xcschemes/RSXMLiOS.xcscheme b/RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2iOS.xcscheme similarity index 83% rename from RSXML.xcodeproj/xcshareddata/xcschemes/RSXMLiOS.xcscheme rename to RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2iOS.xcscheme index 57b9a13..08cbca6 100644 --- a/RSXML.xcodeproj/xcshareddata/xcschemes/RSXMLiOS.xcscheme +++ b/RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2iOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "RSXML2.framework" + BlueprintName = "RSXML2iOS" + ReferencedContainer = "container:RSXML2.xcodeproj"> @@ -46,9 +46,9 @@ + BuildableName = "RSXML2.framework" + BlueprintName = "RSXML2iOS" + ReferencedContainer = "container:RSXML2.xcodeproj"> @@ -64,9 +64,9 @@ + BuildableName = "RSXML2.framework" + BlueprintName = "RSXML2iOS" + ReferencedContainer = "container:RSXML2.xcodeproj"> diff --git a/RSXML/Info.plist b/RSXML2/Info.plist similarity index 91% rename from RSXML/Info.plist rename to RSXML2/Info.plist index bd129b8..e66fb56 100644 --- a/RSXML/Info.plist +++ b/RSXML2/Info.plist @@ -21,7 +21,7 @@ CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright - Copyright © 2015 Ranchero Software, LLC. All rights reserved. + Copyright © 2019 relikd. Public Domain. NSPrincipalClass diff --git a/RSXML/NSDictionary+RSXML.h b/RSXML2/NSDictionary+RSXML.h similarity index 100% rename from RSXML/NSDictionary+RSXML.h rename to RSXML2/NSDictionary+RSXML.h diff --git a/RSXML/NSDictionary+RSXML.m b/RSXML2/NSDictionary+RSXML.m similarity index 100% rename from RSXML/NSDictionary+RSXML.m rename to RSXML2/NSDictionary+RSXML.m diff --git a/RSXML/NSString+RSXML.h b/RSXML2/NSString+RSXML.h similarity index 100% rename from RSXML/NSString+RSXML.h rename to RSXML2/NSString+RSXML.h diff --git a/RSXML/NSString+RSXML.m b/RSXML2/NSString+RSXML.m similarity index 100% rename from RSXML/NSString+RSXML.m rename to RSXML2/NSString+RSXML.m diff --git a/RSXML/RSAtomParser.h b/RSXML2/RSAtomParser.h similarity index 100% rename from RSXML/RSAtomParser.h rename to RSXML2/RSAtomParser.h diff --git a/RSXML/RSAtomParser.m b/RSXML2/RSAtomParser.m similarity index 100% rename from RSXML/RSAtomParser.m rename to RSXML2/RSAtomParser.m diff --git a/RSXML/RSDateParser.h b/RSXML2/RSDateParser.h similarity index 100% rename from RSXML/RSDateParser.h rename to RSXML2/RSDateParser.h diff --git a/RSXML/RSDateParser.m b/RSXML2/RSDateParser.m similarity index 100% rename from RSXML/RSDateParser.m rename to RSXML2/RSDateParser.m diff --git a/RSXML/RSFeedParser.h b/RSXML2/RSFeedParser.h similarity index 100% rename from RSXML/RSFeedParser.h rename to RSXML2/RSFeedParser.h diff --git a/RSXML/RSFeedParser.m b/RSXML2/RSFeedParser.m similarity index 100% rename from RSXML/RSFeedParser.m rename to RSXML2/RSFeedParser.m diff --git a/RSXML/RSHTMLLinkParser.h b/RSXML2/RSHTMLLinkParser.h similarity index 100% rename from RSXML/RSHTMLLinkParser.h rename to RSXML2/RSHTMLLinkParser.h diff --git a/RSXML/RSHTMLLinkParser.m b/RSXML2/RSHTMLLinkParser.m similarity index 100% rename from RSXML/RSHTMLLinkParser.m rename to RSXML2/RSHTMLLinkParser.m diff --git a/RSXML/RSHTMLMetadata.h b/RSXML2/RSHTMLMetadata.h similarity index 100% rename from RSXML/RSHTMLMetadata.h rename to RSXML2/RSHTMLMetadata.h diff --git a/RSXML/RSHTMLMetadata.m b/RSXML2/RSHTMLMetadata.m similarity index 100% rename from RSXML/RSHTMLMetadata.m rename to RSXML2/RSHTMLMetadata.m diff --git a/RSXML/RSHTMLMetadataParser.h b/RSXML2/RSHTMLMetadataParser.h similarity index 100% rename from RSXML/RSHTMLMetadataParser.h rename to RSXML2/RSHTMLMetadataParser.h diff --git a/RSXML/RSHTMLMetadataParser.m b/RSXML2/RSHTMLMetadataParser.m similarity index 100% rename from RSXML/RSHTMLMetadataParser.m rename to RSXML2/RSHTMLMetadataParser.m diff --git a/RSXML/RSOPMLItem.h b/RSXML2/RSOPMLItem.h similarity index 100% rename from RSXML/RSOPMLItem.h rename to RSXML2/RSOPMLItem.h diff --git a/RSXML/RSOPMLItem.m b/RSXML2/RSOPMLItem.m similarity index 100% rename from RSXML/RSOPMLItem.m rename to RSXML2/RSOPMLItem.m diff --git a/RSXML/RSOPMLParser.h b/RSXML2/RSOPMLParser.h similarity index 100% rename from RSXML/RSOPMLParser.h rename to RSXML2/RSOPMLParser.h diff --git a/RSXML/RSOPMLParser.m b/RSXML2/RSOPMLParser.m similarity index 100% rename from RSXML/RSOPMLParser.m rename to RSXML2/RSOPMLParser.m diff --git a/RSXML/RSParsedArticle.h b/RSXML2/RSParsedArticle.h similarity index 100% rename from RSXML/RSParsedArticle.h rename to RSXML2/RSParsedArticle.h diff --git a/RSXML/RSParsedArticle.m b/RSXML2/RSParsedArticle.m similarity index 100% rename from RSXML/RSParsedArticle.m rename to RSXML2/RSParsedArticle.m diff --git a/RSXML/RSParsedFeed.h b/RSXML2/RSParsedFeed.h similarity index 100% rename from RSXML/RSParsedFeed.h rename to RSXML2/RSParsedFeed.h diff --git a/RSXML/RSParsedFeed.m b/RSXML2/RSParsedFeed.m similarity index 100% rename from RSXML/RSParsedFeed.m rename to RSXML2/RSParsedFeed.m diff --git a/RSXML/RSRSSParser.h b/RSXML2/RSRSSParser.h similarity index 100% rename from RSXML/RSRSSParser.h rename to RSXML2/RSRSSParser.h diff --git a/RSXML/RSRSSParser.m b/RSXML2/RSRSSParser.m similarity index 100% rename from RSXML/RSRSSParser.m rename to RSXML2/RSRSSParser.m diff --git a/RSXML/RSSAXParser.h b/RSXML2/RSSAXParser.h similarity index 100% rename from RSXML/RSSAXParser.h rename to RSXML2/RSSAXParser.h diff --git a/RSXML/RSSAXParser.m b/RSXML2/RSSAXParser.m similarity index 100% rename from RSXML/RSSAXParser.m rename to RSXML2/RSSAXParser.m diff --git a/RSXML/RSXML.h b/RSXML2/RSXML2.h similarity index 72% rename from RSXML/RSXML.h rename to RSXML2/RSXML2.h index 342a78d..c1472ac 100644 --- a/RSXML/RSXML.h +++ b/RSXML2/RSXML2.h @@ -25,24 +25,24 @@ @import Foundation; // General -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import // RSS & Atom Feeds -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import // OPML -#import -#import +#import +#import // HTML -#import -#import -#import +#import +#import +#import diff --git a/RSXML/RSXMLData.h b/RSXML2/RSXMLData.h similarity index 100% rename from RSXML/RSXMLData.h rename to RSXML2/RSXMLData.h diff --git a/RSXML/RSXMLData.m b/RSXML2/RSXMLData.m similarity index 100% rename from RSXML/RSXMLData.m rename to RSXML2/RSXMLData.m diff --git a/RSXML/RSXMLError.h b/RSXML2/RSXMLError.h similarity index 100% rename from RSXML/RSXMLError.h rename to RSXML2/RSXMLError.h diff --git a/RSXML/RSXMLError.m b/RSXML2/RSXMLError.m similarity index 100% rename from RSXML/RSXMLError.m rename to RSXML2/RSXMLError.m diff --git a/RSXML/RSXMLParser.h b/RSXML2/RSXMLParser.h similarity index 100% rename from RSXML/RSXMLParser.h rename to RSXML2/RSXMLParser.h diff --git a/RSXML/RSXMLParser.m b/RSXML2/RSXMLParser.m similarity index 100% rename from RSXML/RSXMLParser.m rename to RSXML2/RSXMLParser.m diff --git a/RSXMLTests/Info.plist b/RSXML2Tests/Info.plist similarity index 100% rename from RSXMLTests/Info.plist rename to RSXML2Tests/Info.plist diff --git a/RSXMLTests/RSDateParserTests.m b/RSXML2Tests/RSDateParserTests.m similarity index 99% rename from RSXMLTests/RSDateParserTests.m rename to RSXML2Tests/RSDateParserTests.m index df346eb..ed2639c 100644 --- a/RSXMLTests/RSDateParserTests.m +++ b/RSXML2Tests/RSDateParserTests.m @@ -22,7 +22,7 @@ // SOFTWARE. #import -@import RSXML; +@import RSXML2; @interface RSDateParserTests : XCTestCase diff --git a/RSXMLTests/RSEntityTests.m b/RSXML2Tests/RSEntityTests.m similarity index 99% rename from RSXMLTests/RSEntityTests.m rename to RSXML2Tests/RSEntityTests.m index 23eaa23..97d836c 100644 --- a/RSXMLTests/RSEntityTests.m +++ b/RSXML2Tests/RSEntityTests.m @@ -22,7 +22,7 @@ // SOFTWARE. #import -@import RSXML; +@import RSXML2; @interface RSEntityTests : XCTestCase diff --git a/RSXMLTests/RSHTMLTests.m b/RSXML2Tests/RSHTMLTests.m similarity index 99% rename from RSXMLTests/RSHTMLTests.m rename to RSXML2Tests/RSHTMLTests.m index 2e32ca3..b8d8837 100644 --- a/RSXMLTests/RSHTMLTests.m +++ b/RSXML2Tests/RSHTMLTests.m @@ -23,7 +23,7 @@ // SOFTWARE. #import -@import RSXML; +@import RSXML2; @interface RSHTMLTests : XCTestCase diff --git a/RSXMLTests/RSOPMLTests.m b/RSXML2Tests/RSOPMLTests.m similarity index 99% rename from RSXMLTests/RSOPMLTests.m rename to RSXML2Tests/RSOPMLTests.m index 133b28b..52d7a58 100644 --- a/RSXMLTests/RSOPMLTests.m +++ b/RSXML2Tests/RSOPMLTests.m @@ -23,7 +23,7 @@ // SOFTWARE. #import -@import RSXML; +@import RSXML2; @interface RSOPMLTests : XCTestCase diff --git a/RSXMLTests/RSXMLTests.m b/RSXML2Tests/RSXMLTests.m similarity index 99% rename from RSXMLTests/RSXMLTests.m rename to RSXML2Tests/RSXMLTests.m index c7a8682..8d2f3d6 100644 --- a/RSXMLTests/RSXMLTests.m +++ b/RSXML2Tests/RSXMLTests.m @@ -23,7 +23,7 @@ // SOFTWARE. #import -@import RSXML; +@import RSXML2; @interface RSXMLTests : XCTestCase diff --git a/RSXMLTests/Resources/DaringFireball.atom b/RSXML2Tests/Resources/DaringFireball.atom similarity index 100% rename from RSXMLTests/Resources/DaringFireball.atom rename to RSXML2Tests/Resources/DaringFireball.atom diff --git a/RSXMLTests/Resources/DaringFireball.html b/RSXML2Tests/Resources/DaringFireball.html similarity index 100% rename from RSXMLTests/Resources/DaringFireball.html rename to RSXML2Tests/Resources/DaringFireball.html diff --git a/RSXMLTests/Resources/EMarley.rss b/RSXML2Tests/Resources/EMarley.rss similarity index 100% rename from RSXMLTests/Resources/EMarley.rss rename to RSXML2Tests/Resources/EMarley.rss diff --git a/RSXMLTests/Resources/KatieFloyd.rss b/RSXML2Tests/Resources/KatieFloyd.rss similarity index 100% rename from RSXMLTests/Resources/KatieFloyd.rss rename to RSXML2Tests/Resources/KatieFloyd.rss diff --git a/RSXMLTests/Resources/OneFootTsunami.atom b/RSXML2Tests/Resources/OneFootTsunami.atom similarity index 100% rename from RSXMLTests/Resources/OneFootTsunami.atom rename to RSXML2Tests/Resources/OneFootTsunami.atom diff --git a/RSXMLTests/Resources/Subs.opml b/RSXML2Tests/Resources/Subs.opml similarity index 100% rename from RSXMLTests/Resources/Subs.opml rename to RSXML2Tests/Resources/Subs.opml diff --git a/RSXMLTests/Resources/broken.rss b/RSXML2Tests/Resources/broken.rss similarity index 100% rename from RSXMLTests/Resources/broken.rss rename to RSXML2Tests/Resources/broken.rss diff --git a/RSXMLTests/Resources/ccc-media.rdf b/RSXML2Tests/Resources/ccc-media.rdf similarity index 100% rename from RSXMLTests/Resources/ccc-media.rdf rename to RSXML2Tests/Resources/ccc-media.rdf diff --git a/RSXMLTests/Resources/furbo.html b/RSXML2Tests/Resources/furbo.html similarity index 100% rename from RSXMLTests/Resources/furbo.html rename to RSXML2Tests/Resources/furbo.html diff --git a/RSXMLTests/Resources/inessential.html b/RSXML2Tests/Resources/inessential.html similarity index 100% rename from RSXMLTests/Resources/inessential.html rename to RSXML2Tests/Resources/inessential.html diff --git a/RSXMLTests/Resources/lower-ascii.rss b/RSXML2Tests/Resources/lower-ascii.rss similarity index 100% rename from RSXMLTests/Resources/lower-ascii.rss rename to RSXML2Tests/Resources/lower-ascii.rss diff --git a/RSXMLTests/Resources/manton.rss b/RSXML2Tests/Resources/manton.rss similarity index 100% rename from RSXMLTests/Resources/manton.rss rename to RSXML2Tests/Resources/manton.rss diff --git a/RSXMLTests/Resources/scriptingNews.rss b/RSXML2Tests/Resources/scriptingNews.rss similarity index 100% rename from RSXMLTests/Resources/scriptingNews.rss rename to RSXML2Tests/Resources/scriptingNews.rss diff --git a/RSXMLTests/Resources/sixcolors.html b/RSXML2Tests/Resources/sixcolors.html similarity index 100% rename from RSXMLTests/Resources/sixcolors.html rename to RSXML2Tests/Resources/sixcolors.html diff --git a/RSXMLTests/download_feeds.sh b/RSXML2Tests/download_feeds.sh similarity index 100% rename from RSXMLTests/download_feeds.sh rename to RSXML2Tests/download_feeds.sh diff --git a/RSXMLTests/download_list.txt b/RSXML2Tests/download_list.txt similarity index 100% rename from RSXMLTests/download_list.txt rename to RSXML2Tests/download_list.txt diff --git a/RSXMLiOS/Info.plist b/RSXML2iOS/Info.plist similarity index 96% rename from RSXMLiOS/Info.plist rename to RSXML2iOS/Info.plist index ac8746e..a7f1a76 100644 --- a/RSXMLiOS/Info.plist +++ b/RSXML2iOS/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - RSXML + RSXML2 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier