Bug fix for issue robbiehanson#184 - Deprecations on OS X 10.9 Mavericks

robbiehanson · robbiehanson · commit a48c4bd4712e · 2014-04-17T17:54:08.000-07:00
diff --git a/GCD/GCDAsyncSocket.m b/GCD/GCDAsyncSocket.m
@@ -2580,7 +2580,7 @@ - (void)closeWithError:(NSError *)error
 		
 		SSLClose(sslContext);
 		
-		#if TARGET_OS_IPHONE
+		#if TARGET_OS_IPHONE || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
 		CFRelease(sslContext);
 		#else
 		SSLDisposeContext(sslContext);
@@ -6041,7 +6041,7 @@ - (void)ssl_startTLS
 	
 	BOOL isServer = [[tlsSettings objectForKey:(NSString *)kCFStreamSSLIsServer] boolValue];
 	
-	#if TARGET_OS_IPHONE
+	#if TARGET_OS_IPHONE || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
 	{
 		if (isServer)
 			sslContext = SSLCreateContext(kCFAllocatorDefault, kSSLServerSide, kSSLStreamType);
@@ -6054,7 +6054,7 @@ - (void)ssl_startTLS
 			return;
 		}
 	}
-	#else
+	#else // (__MAC_OS_X_VERSION_MIN_REQUIRED < 1080)
 	{
 		status = SSLNewContext(isServer, &sslContext);
 		if (status != noErr)
diff --git a/GCD/Xcode/SimpleHTTPClient/Desktop/SimpleHTTPClient.xcodeproj/project.pbxproj b/GCD/Xcode/SimpleHTTPClient/Desktop/SimpleHTTPClient.xcodeproj/project.pbxproj
@@ -326,7 +326,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 			};
@@ -366,7 +366,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VALUE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				SDKROOT = macosx;
 			};
 			name = Release;
@@ -381,7 +381,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SimpleHTTPClient/SimpleHTTPClient-Prefix.pch";
 				INFOPLIST_FILE = "SimpleHTTPClient/SimpleHTTPClient-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@@ -397,7 +396,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SimpleHTTPClient/SimpleHTTPClient-Prefix.pch";
 				INFOPLIST_FILE = "SimpleHTTPClient/SimpleHTTPClient-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};

Original file line number	Diff line number	Diff line change
`@@ -2580,7 +2580,7 @@ - (void)closeWithError:(NSError *)error`
`2580`	`2580`
`2581`	`2581`	`SSLClose(sslContext);`
`2582`	`2582`
`2583`		`- #if TARGET_OS_IPHONE`
	`2583`	`+ #if TARGET_OS_IPHONE \|\| (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)`
`2584`	`2584`	`CFRelease(sslContext);`
`2585`	`2585`	`#else`
`2586`	`2586`	`SSLDisposeContext(sslContext);`
`@@ -6041,7 +6041,7 @@ - (void)ssl_startTLS`
`6041`	`6041`
`6042`	`6042`	`BOOL isServer = [[tlsSettings objectForKey:(NSString *)kCFStreamSSLIsServer] boolValue];`
`6043`	`6043`
`6044`		`- #if TARGET_OS_IPHONE`
	`6044`	`+ #if TARGET_OS_IPHONE \|\| (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)`
`6045`	`6045`	`{`
`6046`	`6046`	`if (isServer)`
`6047`	`6047`	`sslContext = SSLCreateContext(kCFAllocatorDefault, kSSLServerSide, kSSLStreamType);`
`@@ -6054,7 +6054,7 @@ - (void)ssl_startTLS`
`6054`	`6054`	`return;`
`6055`	`6055`	`}`
`6056`	`6056`	`}`
`6057`		`- #else`
	`6057`	`+ #else // (__MAC_OS_X_VERSION_MIN_REQUIRED < 1080)`
`6058`	`6058`	`{`
`6059`	`6059`	`status = SSLNewContext(isServer, &sslContext);`
`6060`	`6060`	`if (status != noErr)`