diff --git a/RSXML2.xcodeproj/project.pbxproj b/RSXML2.xcodeproj/project.pbxproj index ff9bf0f..43ffdac 100644 --- a/RSXML2.xcodeproj/project.pbxproj +++ b/RSXML2.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -327,8 +327,9 @@ 84F22C041B52DDEA000060CE /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1640; ORGANIZATIONNAME = relikd; TargetAttributes = { 84F22C0C1B52DDEA000060CE = { @@ -464,9 +465,11 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -493,7 +496,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; RUN_CLANG_STATIC_ANALYZER = YES; @@ -539,9 +542,11 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; @@ -562,7 +567,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = macosx; @@ -576,19 +581,24 @@ buildSettings = { CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = UY657LKNHJ; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; INFOPLIST_FILE = RSXML2/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = de.relikd.RSXML2; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -603,19 +613,24 @@ buildSettings = { CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = UY657LKNHJ; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; FRAMEWORK_VERSION = A; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; INFOPLIST_FILE = RSXML2/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = de.relikd.RSXML2; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -627,11 +642,15 @@ 84F22C251B52DDEA000060CE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; INFOPLIST_FILE = RSXML2Tests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = de.relikd.RSXML2Tests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 3.0; @@ -641,11 +660,15 @@ 84F22C261B52DDEA000060CE /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; HEADER_SEARCH_PATHS = "${SDKROOT}/usr/include/libxml2"; INFOPLIST_FILE = RSXML2Tests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = de.relikd.RSXML2Tests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 3.0; diff --git a/RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2.xcscheme b/RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2.xcscheme index 996ef29..b2874e1 100644 --- a/RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2.xcscheme +++ b/RSXML2.xcodeproj/xcshareddata/xcschemes/RSXML2.xcscheme @@ -1,6 +1,6 @@ NS_ASSUME_NONNULL_BEGIN diff --git a/RSXML2/RSDateParser.h b/RSXML2/RSDateParser.h index dbe8c43..321f9c9 100644 --- a/RSXML2/RSDateParser.h +++ b/RSXML2/RSDateParser.h @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; +#import /*Common web dates -- RFC 822 and 8601 -- are handled here: diff --git a/RSXML2/RSHTMLLinkParser.h b/RSXML2/RSHTMLLinkParser.h index 541162b..8573141 100644 --- a/RSXML2/RSHTMLLinkParser.h +++ b/RSXML2/RSHTMLLinkParser.h @@ -22,7 +22,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; +#import #import @class RSHTMLMetadataAnchor; diff --git a/RSXML2/RSHTMLMetadata.h b/RSXML2/RSHTMLMetadata.h index 973e9c4..c85c1c9 100644 --- a/RSXML2/RSHTMLMetadata.h +++ b/RSXML2/RSHTMLMetadata.h @@ -22,8 +22,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; -@import CoreGraphics; +#import +#import typedef enum { RSFeedTypeNone, diff --git a/RSXML2/RSHTMLMetadataParser.h b/RSXML2/RSHTMLMetadataParser.h index 62047a6..88257a8 100644 --- a/RSXML2/RSHTMLMetadataParser.h +++ b/RSXML2/RSHTMLMetadataParser.h @@ -22,7 +22,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; +#import #import @class RSHTMLMetadata; diff --git a/RSXML2/RSOPMLItem.h b/RSXML2/RSOPMLItem.h index 00eb200..24073a6 100644 --- a/RSXML2/RSOPMLItem.h +++ b/RSXML2/RSOPMLItem.h @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; +#import //#ifndef TARGET_IOS //#define OPML_EXPORT 0 diff --git a/RSXML2/RSParsedArticle.h b/RSXML2/RSParsedArticle.h index 63dcfd3..30fcfc0 100644 --- a/RSXML2/RSParsedArticle.h +++ b/RSXML2/RSParsedArticle.h @@ -22,7 +22,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/RSXML2/RSParsedFeed.h b/RSXML2/RSParsedFeed.h index 8adc7a9..aea736c 100644 --- a/RSXML2/RSParsedFeed.h +++ b/RSXML2/RSParsedFeed.h @@ -22,7 +22,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/RSXML2/RSSAXParser.h b/RSXML2/RSSAXParser.h index fb2e97b..b45a10c 100644 --- a/RSXML2/RSSAXParser.h +++ b/RSXML2/RSSAXParser.h @@ -22,7 +22,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; +#import /*Thread-safe, not re-entrant. diff --git a/RSXML2/RSXML2.h b/RSXML2/RSXML2.h index c1472ac..f74c9c8 100644 --- a/RSXML2/RSXML2.h +++ b/RSXML2/RSXML2.h @@ -22,7 +22,6 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; // General #import diff --git a/RSXML2/RSXMLData.h b/RSXML2/RSXMLData.h index b254220..258ffad 100644 --- a/RSXML2/RSXMLData.h +++ b/RSXML2/RSXMLData.h @@ -22,7 +22,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; +#import #import NS_ASSUME_NONNULL_BEGIN diff --git a/RSXML2/RSXMLError.h b/RSXML2/RSXMLError.h index 39796bc..f34c0df 100644 --- a/RSXML2/RSXMLError.h +++ b/RSXML2/RSXMLError.h @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; +#import extern NSErrorDomain const kLIBXMLParserErrorDomain; extern NSErrorDomain const kRSXMLParserErrorDomain; diff --git a/RSXML2/RSXMLParser.h b/RSXML2/RSXMLParser.h index 99476c8..c414dc4 100644 --- a/RSXML2/RSXMLParser.h +++ b/RSXML2/RSXMLParser.h @@ -21,7 +21,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -@import Foundation; +#import #import #define EqualBytes(bytes1, bytes2, length) (memcmp(bytes1, bytes2, length) == 0) diff --git a/RSXML2Tests/RSXMLTests.m b/RSXML2Tests/RSXMLTests.m index 8d2f3d6..61f34bc 100644 --- a/RSXML2Tests/RSXMLTests.m +++ b/RSXML2Tests/RSXMLTests.m @@ -284,7 +284,7 @@ [[xmlData getParser] parseSync:&error]; XCTAssertNotNil(error); XCTAssertEqual(error.code, 76); - XCTAssertEqualObjects(error.localizedDescription, @"Opening and ending tag mismatch: channel line 0 and rss"); + XCTAssertEqualObjects(error.localizedDescription, @"Opening and ending tag mismatch: channel line 10 and rss"); } - (void)testHttpSchemePrepending {