Cleaned up imports and added errors when compiled with non-ARC compiler

kokomo · Apr 1, 2012 · ff82f3b · ff82f3b
1 parent d4c439a
commit ff82f3b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/MKNetworkKit/Categories/NSDictionary+RequestEncoding.m b/MKNetworkKit/Categories/NSDictionary+RequestEncoding.m
@@ -23,8 +23,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
-#import "NSDictionary+RequestEncoding.h"
-#import "NSString+MKNetworkKitAdditions.h"
+#import "MKNetworkKit.h"
 
 @implementation NSDictionary (RequestEncoding)
 

diff --git a/MKNetworkKit/MKNetworkEngine.h b/MKNetworkKit/MKNetworkEngine.h
@@ -24,7 +24,7 @@
 //  THE SOFTWARE.
 
 #import "MKNetworkOperation.h"
-
+#import "Reachability.h"
 /*!
  @header MKNetworkEngine.h
  @abstract   Represents a subclassable Network Engine for your app

diff --git a/MKNetworkKit/MKNetworkEngine.m b/MKNetworkKit/MKNetworkEngine.m
@@ -23,10 +23,17 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
-#import "MKNetworkEngine.h"
-#import "Reachability.h"
+#import "MKNetworkKit.h"
 #define kFreezableOperationExtension @"mknetworkkitfrozenoperation"
 
+#ifdef __OBJC_GC__
+#error MKNetworkKit does not support Objective-C Garbage Collection
+#endif
+
+#if ! __has_feature(objc_arc)
+#error MKNetworkKit is ARC only. Either turn on ARC for the project or use -fobjc-arc flag
+#endif
+
 @interface MKNetworkEngine (/*Private Methods*/)
 
 @property (strong, nonatomic) NSString *hostName;

diff --git a/MKNetworkKit/MKNetworkKit.h b/MKNetworkKit/MKNetworkKit.h
@@ -27,7 +27,7 @@
 #define MKNetworkKit_MKNetworkKit_h
 
 #ifndef __IPHONE_4_0
-#warning "MKNetworkKit uses features only available in iOS SDK 4.0 and later."
+#error "MKNetworkKit uses features only available in iOS SDK 4.0 and later."
 #endif
 
 #if TARGET_OS_IPHONE

diff --git a/MKNetworkKit/MKNetworkOperation.m b/MKNetworkKit/MKNetworkOperation.m
@@ -23,10 +23,15 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
-#import "MKNetworkOperation.h"
-#import "NSDictionary+RequestEncoding.h"
-#import "NSString+MKNetworkKitAdditions.h"
+#import "MKNetworkKit.h"
 
+#ifdef __OBJC_GC__
+#error MKNetworkKit does not support Objective-C Garbage Collection
+#endif
+
+#if ! __has_feature(objc_arc)
+#error MKNetworkKit is ARC only. Either turn on ARC for the project or use -fobjc-arc flag
+#endif
 
 @interface MKNetworkOperation (/*Private Methods*/)
 @property (strong, nonatomic) NSURLConnection *connection;