Updated to version 1.4.1

LICENCE.md

@@ -1,5 +1,4 @@
 XMLDictionary
-version 1.4, April 16th, 2014
 
 Copyright (C) 2011 Charcoal Design
 

README.md

@@ -9,8 +9,8 @@ Unlike other DOM parsers, XMLDictionary does not attempt to replicate all of the
 Supported OS & SDK Versions
 -----------------------------
 
-* Supported build target - iOS 7.1 / Mac OS 10.9 (Xcode 5.1, Apple LLVM compiler 5.1)
-* Earliest supported deployment target - iOS 5.0 / Mac OS 10.7
+* Supported build target - iOS 10.2 / Mac OS 10.12 (Xcode 8.2, Apple LLVM compiler 8.0)
+* Earliest supported deployment target - iOS 8.0 / Mac OS 10.10
 * Earliest compatible deployment target - iOS 4.3 / Mac OS 10.6
 
 NOTE: 'Supported' means that the library has been tested with this version. 'Compatible' means that the library should work on this OS version (i.e. it doesn't rely on any unavailable SDK features) but is no longer being tested for compatibility and may require tweaking or bug fixes to run correctly.
@@ -195,6 +195,11 @@ Or if it is set to `XMLDictionaryAttributesModeUnprefixed` you would simply do t
 Release Notes
 ----------------
 
+Version 1.4.1
+
+- Upgraded for Xcode 8.2
+- Added tvOS and watchOS support to podspec
+
 Version 1.4
 
 - Added dictionaryWithXMLParser: constructor method

Tests/XMLTest.xcodeproj/project.pbxproj

@@ -141,7 +141,7 @@
 		013F12E7154BB2EA00F50A5E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0820;
 			};
 			buildConfigurationList = 013F12EA154BB2EA00F50A5E /* Build configuration list for PBXProject "XMLTest" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -220,6 +220,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
@@ -228,12 +229,17 @@
 				CLANG_WARN_OBJC_RECEIVER_WEAK = YES;
 				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -264,7 +270,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 2;
@@ -288,6 +294,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
@@ -296,11 +303,15 @@
 				CLANG_WARN_OBJC_RECEIVER_WEAK = YES;
 				CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
 				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -325,7 +336,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_PARAMETER = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 2;
@@ -343,6 +354,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "XMLTest/XMLTest-Prefix.pch";
 				INFOPLIST_FILE = "XMLTest/XMLTest-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -356,6 +368,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "XMLTest/XMLTest-Prefix.pch";
 				INFOPLIST_FILE = "XMLTest/XMLTest-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.charcoaldesign.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = 1;

Tests/XMLTest/AppDelegate.m

@@ -20,7 +20,7 @@ - (BOOL)application:(__unused UIApplication *)application didFinishLaunchingWith
     NSDictionary *xmlDoc = [NSDictionary dictionaryWithXMLString:xmlString];
     NSLog(@"dictionary: %@", xmlDoc);
 
-    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+    self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.viewController = [[ViewController alloc] initWithNibName:@"ViewController" bundle:nil];
     self.window.rootViewController = self.viewController;
     [self.window makeKeyAndVisible];

Tests/XMLTest/XMLTest-Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.charcoaldesign.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -35,5 +35,10 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 </dict>
 </plist>

XMLDictionary.podspec.json

@@ -0,0 +1,20 @@
+{
+  "name": "XMLDictionary",
+  "version": "1.4.1",
+  "license": "zlib",
+  "summary": "XMLDictionary is a class designed to simplify parsing and generating of XML on iOS and Mac OS.",
+  "homepage": "https://github.com/nicklockwood/XMLDictionary",
+  "authors": "Nick Lockwood",
+  "source": {
+    "git": "https://github.com/nicklockwood/XMLDictionary.git",
+    "tag": "1.4.1"
+  },
+  "source_files": "XMLDictionary/XMLDictionary.{h,m}",
+  "requires_arc": true,
+  "platforms": {
+    "ios": "4.3",
+    "osx": "10.6",
+    "watchos": "2.0",
+    "tvos": "9.0"
+  }
+}

XMLDictionary/XMLDictionary.h

@@ -1,7 +1,7 @@
 //
 //  XMLDictionary.h
 //
-//  Version 1.4
+//  Version 1.4.1
 //
 //  Created by Nick Lockwood on 15/11/2010.
 //  Copyright 2010 Charcoal Design. All rights reserved.
@@ -34,6 +34,9 @@
 #pragma GCC diagnostic ignored "-Wobjc-missing-property-synthesis"
 
 
+NS_ASSUME_NONNULL_BEGIN
+
+
 typedef NS_ENUM(NSInteger, XMLDictionaryAttributesMode)
 {
     XMLDictionaryAttributesModePrefixed = 0, //default
@@ -72,41 +75,44 @@ static NSString *const XMLDictionaryAttributePrefix = @"_";
 @property (nonatomic, assign) XMLDictionaryAttributesMode attributesMode;
 @property (nonatomic, assign) XMLDictionaryNodeNameMode nodeNameMode;
 
-- (NSDictionary *)dictionaryWithParser:(NSXMLParser *)parser;
-- (NSDictionary *)dictionaryWithData:(NSData *)data;
-- (NSDictionary *)dictionaryWithString:(NSString *)string;
-- (NSDictionary *)dictionaryWithFile:(NSString *)path;
+- (nullable NSDictionary<NSString *, id> *)dictionaryWithParser:(NSXMLParser *)parser;
+- (nullable NSDictionary<NSString *, id> *)dictionaryWithData:(NSData *)data;
+- (nullable NSDictionary<NSString *, id> *)dictionaryWithString:(NSString *)string;
+- (nullable NSDictionary<NSString *, id> *)dictionaryWithFile:(NSString *)path;
 
 @end
 
 
 @interface NSDictionary (XMLDictionary)
 
-+ (NSDictionary *)dictionaryWithXMLParser:(NSXMLParser *)parser;
-+ (NSDictionary *)dictionaryWithXMLData:(NSData *)data;
-+ (NSDictionary *)dictionaryWithXMLString:(NSString *)string;
-+ (NSDictionary *)dictionaryWithXMLFile:(NSString *)path;
++ (nullable NSDictionary<NSString *, id> *)dictionaryWithXMLParser:(NSXMLParser *)parser;
++ (nullable NSDictionary<NSString *, id> *)dictionaryWithXMLData:(NSData *)data;
++ (nullable NSDictionary<NSString *, id> *)dictionaryWithXMLString:(NSString *)string;
++ (nullable NSDictionary<NSString *, id> *)dictionaryWithXMLFile:(NSString *)path;
 
-- (NSDictionary *)attributes;
-- (NSDictionary *)childNodes;
-- (NSArray *)comments;
-- (NSString *)nodeName;
-- (NSString *)innerText;
-- (NSString *)innerXML;
-- (NSString *)XMLString;
+@property (nonatomic, readonly, copy, nullable) NSDictionary<NSString *, NSString *> *attributes;
+@property (nonatomic, readonly, copy, nullable) NSDictionary<NSString *, id> *childNodes;
+@property (nonatomic, readonly, copy, nullable) NSArray<NSString *> *comments;
+@property (nonatomic, readonly, copy, nullable) NSString *nodeName;
+@property (nonatomic, readonly, copy, nullable) NSString *innerText;
+@property (nonatomic, readonly, copy) NSString *innerXML;
+@property (nonatomic, readonly, copy) NSString *XMLString;
 
-- (NSArray *)arrayValueForKeyPath:(NSString *)keyPath;
-- (NSString *)stringValueForKeyPath:(NSString *)keyPath;
-- (NSDictionary *)dictionaryValueForKeyPath:(NSString *)keyPath;
+- (nullable NSArray *)arrayValueForKeyPath:(NSString *)keyPath;
+- (nullable NSString *)stringValueForKeyPath:(NSString *)keyPath;
+- (nullable NSDictionary<NSString *, id> *)dictionaryValueForKeyPath:(NSString *)keyPath;
 
 @end
 
 
 @interface NSString (XMLDictionary)
 
-- (NSString *)XMLEncodedString;
+@property (nonatomic, readonly, copy) NSString *XMLEncodedString;
 
 @end
 
 
+NS_ASSUME_NONNULL_END
+
+
 #pragma GCC diagnostic pop