ARC support and fix all warnings and errors for Xcode 9.1 and iOS 11.1

ASIHTTPRequest.podspec

@@ -0,0 +1,61 @@
+Pod::Spec.new do |s|
+  s.name     = 'ASIHTTPRequest'
+  s.version  = '1.8.2'
+  s.summary  = 'Easy to use CFNetwork wrapper for HTTP requests, Objective-C, Mac OS X and iPhone.'
+  s.homepage = 'http://allseeing-i.com/ASIHTTPRequest'
+  s.author   = { 'Ben Copsey' => '[email protected]' }
+  s.license  = 'New BSD License'
+  s.source   = { :git => 'https://github.com/pokeb/asi-http-request.git', :tag => 'v1.8.2' }
+
+  s.description = %{
+    ASIHTTPRequest is an easy to use wrapper around the CFNetwork API that
+    makes some of the more tedious aspects of communicating with web servers
+    easier. It is written in Objective-C and works in both Mac OS X and iPhone
+    applications.
+
+    It is suitable performing basic HTTP requests and interacting with
+    REST-based services (GET / POST / PUT / DELETE). The included
+    ASIFormDataRequest subclass makes it easy to submit POST data and files
+    using multipart/form-data.
+
+    Please note that ASIHTTPRequest is not recommended for newer projects
+    since it's not actively maintained anymore.
+
+    For more info visit: http://allseeing-i.com/%5Brequest_release%5D
+  }
+
+  s.requires_arc = true
+  s.ios.deployment_target = '8.0'
+  # s.osx.deployment_target = '10.6'
+
+  s.subspec 'Core' do |core|
+    core.source_files = 'Classes/*.{h,m}'
+    core.ios.dependency 'Reachability' #, '~> 2.0', '>= 2.0.4'
+    core.ios.frameworks   = 'MobileCoreServices', 'CFNetwork', 'CoreGraphics'
+
+    core.osx.exclude_files = '**/*ASIAuthenticationDialog*'
+    core.osx.frameworks   = 'SystemConfiguration', 'CoreServices'
+
+    core.libraries = 'z.1'
+  end
+
+  s.subspec 'ASIWebPageRequest' do |ws|
+    ws.requires_arc = false
+    ws.source_files = 'Classes/ASIWebPageRequest/*.{h,m}'
+    ws.libraries      = 'xml2.2'
+    ws.xcconfig     = { 'HEADER_SEARCH_PATHS' => '"$(SDKROOT)/usr/include/libxml2"' }
+    ws.dependency 'ASIHTTPRequest/Core'
+  end
+
+  s.subspec 'CloudFiles' do |cfs|
+    cfs.requires_arc = false
+    cfs.source_files = 'Classes/CloudFiles/*.{h,m}','Classes/S3/ASINSXMLParserCompat.h'
+    cfs.dependency 'ASIHTTPRequest/Core'
+  end
+
+  s.subspec 'S3' do |s3s|
+    s3s.requires_arc = false
+    s3s.source_files = 'Classes/S3/*.{h,m}'
+    s3s.dependency 'ASIHTTPRequest/Core'
+  end
+end

Classes/ASIAuthenticationDialog.m

@@ -51,7 +51,7 @@ @implementation ASIAuthenticationDialog
 + (void)initialize
 {
 	if (self == [ASIAuthenticationDialog class]) {
-		requestsNeedingAuthentication = [[NSMutableArray array] retain];
+		requestsNeedingAuthentication = [NSMutableArray array];
 	}
 }
 
@@ -98,12 +98,7 @@ - (void)dealloc
 		[[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceOrientationDidChangeNotification object:nil];
 	}
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil];
-
-	[request release];
-	[tableView release];
 	[presentingController.view removeFromSuperview];
-	[presentingController release];
-	[super dealloc];
 }
 
 #pragma mark keyboard notifications
@@ -132,8 +127,8 @@ - (void)keyboardWillShow:(NSNotification *)notification
 - (void)orientationChanged:(NSNotification *)notification
 {
 	[self showTitle];
-	
-	UIInterfaceOrientation o = (UIInterfaceOrientation)[[UIApplication sharedApplication] statusBarOrientation];
+#ifndef TARGET_IS_EXTENSION
+	UIDeviceOrientation o = (UIDeviceOrientation)[[UIApplication sharedApplication] statusBarOrientation];
 	CGFloat angle = 0;
 	switch (o) {
 		case UIDeviceOrientationLandscapeLeft: angle = 90; break;
@@ -171,6 +166,7 @@ - (void)orientationChanged:(NSNotification *)notification
 	// Fix the view origin
 	self.view.frame = (CGRect){ { f.origin.x, f.origin.y },self.view.frame.size};
     [UIView commitAnimations];
+#endif
 }
 
 #pragma mark utilities
@@ -181,10 +177,12 @@ - (UIViewController *)presentingController
 		presentingController = [[ASIAutorotatingViewController alloc] initWithNibName:nil bundle:nil];
 
 		// Attach to the window, but don't interfere.
+#ifndef TARGET_IS_EXTENSION
 		UIWindow *window = [[[UIApplication sharedApplication] windows] objectAtIndex:0];
 		[window addSubview:[presentingController view]];
 		[[presentingController view] setFrame:CGRectZero];
 		[[presentingController view] setUserInteractionEnabled:NO];
+#endif
 	}
 
 	return presentingController;
@@ -234,11 +232,10 @@ + (void)dismiss
 
 - (void)viewDidDisappear:(BOOL)animated
 {
-	[self retain];
-	[sharedDialog release];
-	sharedDialog = nil;
 	[self performSelector:@selector(presentNextDialog) withObject:nil afterDelay:0];
-	[self release];
+	sharedDialog = nil;
+
+    [super viewDidDisappear:animated];
 }
 
 - (void)dismiss
@@ -267,12 +264,12 @@ - (void)showTitle
 {
 	UINavigationBar *navigationBar = [[[self view] subviews] objectAtIndex:0];
 	UINavigationItem *navItem = [[navigationBar items] objectAtIndex:0];
-	if (UIInterfaceOrientationIsPortrait([[UIDevice currentDevice] orientation])) {
+	if (UIInterfaceOrientationIsPortrait((UIInterfaceOrientation)[[UIDevice currentDevice] orientation])) {
 		// Setup the title
 		if ([self type] == ASIProxyAuthenticationType) {
-			[navItem setPrompt:@"Login to this secure proxy server."];
+			[navItem setPrompt:NSLocalizedString(@"Login to this secure proxy server.", nil)];
 		} else {
-			[navItem setPrompt:@"Login to this secure server."];
+			[navItem setPrompt:NSLocalizedString(@"Login to this secure server.", nil)];
 		}
 	} else {
 		[navItem setPrompt:nil];
@@ -293,10 +290,10 @@ - (void)show
 	}
 
 	// Setup toolbar
-	UINavigationBar *bar = [[[UINavigationBar alloc] init] autorelease];
+	UINavigationBar *bar = [[UINavigationBar alloc] init];
 	[bar setAutoresizingMask:UIViewAutoresizingFlexibleWidth];
 
-	UINavigationItem *navItem = [[[UINavigationItem alloc] init] autorelease];
+	UINavigationItem *navItem = [[UINavigationItem alloc] init];
 	bar.items = [NSArray arrayWithObject:navItem];
 
 	[[self view] addSubview:bar];
@@ -310,16 +307,16 @@ - (void)show
 		[navItem setTitle:[[[self request] url] host]];
 	}
 
-	[navItem setLeftBarButtonItem:[[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancelAuthenticationFromDialog:)] autorelease]];
-	[navItem setRightBarButtonItem:[[[UIBarButtonItem alloc] initWithTitle:@"Login" style:UIBarButtonItemStyleDone target:self action:@selector(loginWithCredentialsFromDialog:)] autorelease]];
+	[navItem setLeftBarButtonItem:[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancelAuthenticationFromDialog:)]];
+	[navItem setRightBarButtonItem:[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Login", nil) style:UIBarButtonItemStyleDone target:self action:@selector(loginWithCredentialsFromDialog:)]];
 
 	// We show the login form in a table view, similar to Safari's authentication dialog
 	[bar sizeToFit];
 	CGRect f = [[self view] bounds];
 	f.origin.y = [bar frame].size.height;
 	f.size.height -= f.origin.y;
 
-	[self setTableView:[[[UITableView alloc] initWithFrame:f style:UITableViewStyleGrouped] autorelease]];
+	[self setTableView:[[UITableView alloc] initWithFrame:f style:UITableViewStyleGrouped]];
 	[[self tableView] setDelegate:self];
 	[[self tableView] setDataSource:self];
 	[[self tableView] setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
@@ -458,15 +455,15 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_0
-	UITableViewCell *cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:nil] autorelease];
+	UITableViewCell *cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:nil];
 #else
 	UITableViewCell *cell = [[[UITableViewCell alloc] initWithFrame:CGRectMake(0,0,0,0) reuseIdentifier:nil] autorelease];
 #endif
 
 	[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
 
 	CGRect f = CGRectInset([cell bounds], 10, 10);
-	UITextField *textField = [[[UITextField alloc] initWithFrame:f] autorelease];
+	UITextField *textField = [[UITextField alloc] initWithFrame:f];
 	[textField setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
 	[textField setAutocapitalizationType:UITextAutocapitalizationTypeNone];
 	[textField setAutocorrectionType:UITextAutocorrectionTypeNo];
@@ -475,12 +472,12 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 	NSInteger r = [indexPath row];
 
 	if (s == kUsernameSection && r == kUsernameRow) {
-		[textField setPlaceholder:@"User"];
+		[textField setPlaceholder:NSLocalizedString(@"User", nil)];
 	} else if (s == kPasswordSection && r == kPasswordRow) {
-		[textField setPlaceholder:@"Password"];
+		[textField setPlaceholder:NSLocalizedString(@"Password", nil)];
 		[textField setSecureTextEntry:YES];
 	} else if (s == kDomainSection && r == kDomainRow) {
-		[textField setPlaceholder:@"Domain"];
+		[textField setPlaceholder:NSLocalizedString(@"Domain", nil)];
 	}
 	[cell.contentView addSubview:textField];
 

Classes/ASICacheDelegate.h

@@ -15,37 +15,37 @@
 // Note that some of the behaviours below are mutally exclusive - you cannot combine ASIAskServerIfModifiedWhenStaleCachePolicy and ASIAskServerIfModifiedCachePolicy, for example.
 typedef enum _ASICachePolicy {
 
-	// The default cache policy. When you set a request to use this, it will use the cache's defaultCachePolicy
-	// ASIDownloadCache's default cache policy is 'ASIAskServerIfModifiedWhenStaleCachePolicy'
-	ASIUseDefaultCachePolicy = 0,
+    // The default cache policy. When you set a request to use this, it will use the cache's defaultCachePolicy
+    // ASIDownloadCache's default cache policy is 'ASIAskServerIfModifiedWhenStaleCachePolicy'
+    ASIUseDefaultCachePolicy = 0,
 
-	// Tell the request not to read from the cache
-	ASIDoNotReadFromCacheCachePolicy = 1,
+    // Tell the request not to read from the cache
+    ASIDoNotReadFromCacheCachePolicy = 1,
 
-	// The the request not to write to the cache
-	ASIDoNotWriteToCacheCachePolicy = 2,
+    // The the request not to write to the cache
+    ASIDoNotWriteToCacheCachePolicy = 2,
 
-	// Ask the server if there is an updated version of this resource (using a conditional GET) ONLY when the cached data is stale
-	ASIAskServerIfModifiedWhenStaleCachePolicy = 4,
+    // Ask the server if there is an updated version of this resource (using a conditional GET) ONLY when the cached data is stale
+    ASIAskServerIfModifiedWhenStaleCachePolicy = 4,
 
-	// Always ask the server if there is an updated version of this resource (using a conditional GET)
-	ASIAskServerIfModifiedCachePolicy = 8,
+    // Always ask the server if there is an updated version of this resource (using a conditional GET)
+    ASIAskServerIfModifiedCachePolicy = 8,
 
-	// If cached data exists, use it even if it is stale. This means requests will not talk to the server unless the resource they are requesting is not in the cache
-	ASIOnlyLoadIfNotCachedCachePolicy = 16,
+    // If cached data exists, use it even if it is stale. This means requests will not talk to the server unless the resource they are requesting is not in the cache
+    ASIOnlyLoadIfNotCachedCachePolicy = 16,
 
-	// If cached data exists, use it even if it is stale. If cached data does not exist, stop (will not set an error on the request)
-	ASIDontLoadCachePolicy = 32,
+    // If cached data exists, use it even if it is stale. If cached data does not exist, stop (will not set an error on the request)
+    ASIDontLoadCachePolicy = 32,
 
-	// Specifies that cached data may be used if the request fails. If cached data is used, the request will succeed without error. Usually used in combination with other options above.
-	ASIFallbackToCacheIfLoadFailsCachePolicy = 64
+    // Specifies that cached data may be used if the request fails. If cached data is used, the request will succeed without error. Usually used in combination with other options above.
+    ASIFallbackToCacheIfLoadFailsCachePolicy = 64
 } ASICachePolicy;
 
 // Cache storage policies control whether cached data persists between application launches (ASICachePermanentlyCacheStoragePolicy) or not (ASICacheForSessionDurationCacheStoragePolicy)
 // Calling [ASIHTTPRequest clearSession] will remove any data stored using ASICacheForSessionDurationCacheStoragePolicy
 typedef enum _ASICacheStoragePolicy {
-	ASICacheForSessionDurationCacheStoragePolicy = 0,
-	ASICachePermanentlyCacheStoragePolicy = 1
+  ASICacheForSessionDurationCacheStoragePolicy = 0,
+  ASICachePermanentlyCacheStoragePolicy = 1
 } ASICacheStoragePolicy;
 
 

Classes/ASIDataCompressor.h

@@ -14,12 +14,11 @@
 #import <zlib.h>
 
 @interface ASIDataCompressor : NSObject {
-	BOOL streamReady;
-	z_stream zStream;
+  z_stream zStream;
 }
 
 // Convenience constructor will call setupStream for you
-+ (id)compressor;
++ (instancetype)compressor;
 
 // Compress the passed chunk of data
 // Passing YES for shouldFinish will finalize the deflated data - you must pass YES when you are on the last chunk of data

Classes/ASIDataCompressor.m

@@ -18,24 +18,23 @@ + (NSError *)deflateErrorWithCode:(int)code;
 
 @implementation ASIDataCompressor
 
-+ (id)compressor
++ (instancetype)compressor
 {
-	ASIDataCompressor *compressor = [[[self alloc] init] autorelease];
+  ASIDataCompressor *compressor = [[self alloc] init];
 	[compressor setupStream];
 	return compressor;
 }
 
 - (void)dealloc
 {
-	if (streamReady) {
+  if (_streamReady) {
 		[self closeStream];
 	}
-	[super dealloc];
 }
 
 - (NSError *)setupStream
 {
-	if (streamReady) {
+  if (_streamReady) {
 		return nil;
 	}
 	// Setup the inflate stream
@@ -48,17 +47,17 @@ - (NSError *)setupStream
 	if (status != Z_OK) {
 		return [[self class] deflateErrorWithCode:status];
 	}
-	streamReady = YES;
+  _streamReady = YES;
 	return nil;
 }
 
 - (NSError *)closeStream
 {
-	if (!streamReady) {
+  if (!_streamReady) {
 		return nil;
 	}
 	// Close the deflate stream
-	streamReady = NO;
+  _streamReady = NO;
 	int status = deflateEnd(&zStream);
 	if (status != Z_OK) {
 		return [[self class] deflateErrorWithCode:status];
@@ -98,7 +97,7 @@ - (NSData *)compressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSErro
 			if (err) {
 				*err = [[self class] deflateErrorWithCode:status];
 			}
-			return NO;
+			return nil;
 		}
 	}
 
@@ -125,7 +124,7 @@ + (NSData *)compressData:(NSData*)uncompressedData error:(NSError **)err
 
 + (BOOL)compressDataFromFile:(NSString *)sourcePath toFile:(NSString *)destinationPath error:(NSError **)err
 {
-	NSFileManager *fileManager = [[[NSFileManager alloc] init] autorelease];
+  NSFileManager *fileManager = [[NSFileManager alloc] init];
 
 	// Create an empty file at the destination path
 	if (![fileManager createFileAtPath:destinationPath contents:[NSData data] attributes:nil]) {
@@ -215,5 +214,4 @@ + (NSError *)deflateErrorWithCode:(int)code
 	return [NSError errorWithDomain:NetworkRequestErrorDomain code:ASICompressionError userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSString stringWithFormat:@"Compression of data failed with code %d",code],NSLocalizedDescriptionKey,nil]];
 }
 
-@synthesize streamReady;
 @end

Classes/ASIDataDecompressor.h

@@ -14,12 +14,11 @@
 #import <zlib.h>
 
 @interface ASIDataDecompressor : NSObject {
-	BOOL streamReady;
 	z_stream zStream;
 }
 
 // Convenience constructor will call setupStream for you
-+ (id)decompressor;
++ (instancetype)decompressor;
 
 // Uncompress the passed chunk of data
 - (NSData *)uncompressBytes:(Bytef *)bytes length:(NSUInteger)length error:(NSError **)err;