Removed iOS 4 support, no fall backs, always use NSJSONSerialization

paultopher · Oct 31, 2012 · 2d50c7f · 2d50c7f
1 parent e41b7f5
commit 2d50c7f
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 123 deletions.
diff --git a/MKNetworkKit/Categories/NSDictionary+RequestEncoding.m b/MKNetworkKit/Categories/NSDictionary+RequestEncoding.m
@@ -42,38 +42,33 @@ -(NSString*) urlEncodedKeyValueString {
   if([string length] > 0)
     [string deleteCharactersInRange:NSMakeRange([string length] - 1, 1)];
 
-  return string;    
+  return string;
 }
 
 
 -(NSString*) jsonEncodedKeyValueString {
 
-  if(NSClassFromString(@"NSJSONSerialization")) {
-    NSError *error = nil;
-    NSData *data = [NSClassFromString(@"NSJSONSerialization") dataWithJSONObject:self
-                                                                         options:0 // non-pretty printing
-                                                                           error:&error];
-    if(error)
-      DLog(@"JSON Parsing Error: %@", error);
-
-    return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-  } else {
-    DLog(@"JSON encoder missing, falling back to URL encoding");
-    return [self urlEncodedKeyValueString];
-  }
+  NSError *error = nil;
+  NSData *data = [NSJSONSerialization dataWithJSONObject:self
+                                                 options:0 // non-pretty printing
+                                                   error:&error];
+  if(error)
+    DLog(@"JSON Parsing Error: %@", error);
+
+  return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
 }
 
 
 -(NSString*) plistEncodedKeyValueString {
 
-  NSError *error = nil;    
-  NSData *data = [NSPropertyListSerialization dataWithPropertyList:self 
-                                                            format:NSPropertyListXMLFormat_v1_0 
+  NSError *error = nil;
+  NSData *data = [NSPropertyListSerialization dataWithPropertyList:self
+                                                            format:NSPropertyListXMLFormat_v1_0
                                                            options:0 error:&error];
   if(error)
     DLog(@"JSON Parsing Error: %@", error);
 
-  return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];    
+  return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
 }
 
 @end
diff --git a/MKNetworkKit/MKNetworkEngine.m b/MKNetworkKit/MKNetworkEngine.m
@@ -30,6 +30,12 @@
 #error MKNetworkKit does not support Objective-C Garbage Collection
 #endif
 
+#if TARGET_OS_IPHONE
+#ifndef __IPHONE_5_0
+#error MKNetworkKit does not support iOS 4 and lower
+#endif
+#endif
+
 #if ! __has_feature(objc_arc)
 #error MKNetworkKit is ARC only. Either turn on ARC for the project or use -fobjc-arc flag
 #endif