iOS / asi-http-request

Go to a project
Toggle navigation Toggle navigation pinning
Ben Copsey
4c8ff100 1 parent bb72651c

Fix 2.2.1 Simulator build

Inline Side-by-side
Showing 3 changed files with 10 additions and 1 deletions
@@ -447,7 +447,16 @@ static NSError *ASIUnableToCreateRequestError; @@ -447,7 +447,16 @@ static NSError *ASIUnableToCreateRequestError;
447 447
448 // Detect proxy settings and apply them 448 // Detect proxy settings and apply them
449 #if TARGET_OS_IPHONE 449 #if TARGET_OS_IPHONE
  450 + #if TARGET_IPHONE_SIMULATOR
  451 + #if __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_2_2
450 NSDictionary *proxySettings = [(NSDictionary *)CFNetworkCopySystemProxySettings() autorelease]; 452 NSDictionary *proxySettings = [(NSDictionary *)CFNetworkCopySystemProxySettings() autorelease];
  453 + #else
  454 + // Can't detect proxies in 2.2.1 Simulator
  455 + NSDictionary *proxySettings = [NSMutableDictionary dictionary];
  456 + #endif
  457 + #else
  458 + NSDictionary *proxySettings = [(NSDictionary *)CFNetworkCopySystemProxySettings() autorelease];
  459 + #endif
451 #else 460 #else
452 NSDictionary *proxySettings = [(NSDictionary *)SCDynamicStoreCopyProxies(NULL) autorelease]; 461 NSDictionary *proxySettings = [(NSDictionary *)SCDynamicStoreCopyProxies(NULL) autorelease];
453 #endif 462 #endif
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <key>CFBundleIconFile</key> 9 <key>CFBundleIconFile</key>
10 <string>iphone-icon.png</string> 10 <string>iphone-icon.png</string>
11 <key>CFBundleIdentifier</key> 11 <key>CFBundleIdentifier</key>
12 - <string>com.yourcompany.${PRODUCT_NAME:identifier}</string> 12 + <string>com.allseeinginteractive.trailsnetwork.asitest</string>
13 <key>CFBundleInfoDictionaryVersion</key> 13 <key>CFBundleInfoDictionaryVersion</key>
14 <string>6.0</string> 14 <string>6.0</string>
15 <key>CFBundlePackageType</key> 15 <key>CFBundlePackageType</key>
This diff was suppressed by a .gitattributes entry.