Merge pull request #4249 from AFNetworking/xcode-9.4

Update Travis settings for Xcode 9.4

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode9.4
 sudo: false
 env:
   global:
@@ -9,14 +9,16 @@ env:
   - FASTLANE_LANE=ci_commit
 matrix:
   include:
-    - osx_image: xcode9.3
+    - osx_image: xcode9.4
       env: FASTLANE_LANE=code_coverage FASTLANE_ENV=default
-    - osx_image: xcode9.3
-      env: FASTLANE_ENV=ios11_xcode93
-    - osx_image: xcode9.3
+    - osx_image: xcode9.4
+      env: FASTLANE_ENV=ios11_xcode94
+    - osx_image: xcode9.4
       env: FASTLANE_ENV=tvos11_xcode9
-    - osx_image: xcode9.3
+    - osx_image: xcode9.4
       env: FASTLANE_ENV=osx
+    - osx_image: xcode9.3
+      env: FASTLANE_ENV=ios11_xcode93
     - osx_image: xcode9.2
       env: FASTLANE_ENV=ios11_xcode92
     - osx_image: xcode9.1

AFNetworking/AFURLResponseSerialization.h

@@ -24,6 +24,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+/**
+ Recursively removes `NSNull` values from a JSON object.
+*/
+id AFJSONObjectByRemovingKeysWithNullValues(id JSONObject, NSJSONReadingOptions readingOptions);
+
 /**
  The `AFURLResponseSerialization` protocol is adopted by an object that decodes data into a more useful object representation, according to details in the server response. Response serializers may additionally perform validation on the incoming response and data.
 

AFNetworking/AFURLResponseSerialization.m

@@ -60,7 +60,7 @@ static BOOL AFErrorOrUnderlyingErrorHasCodeInDomain(NSError *error, NSInteger co
     return NO;
 }
 
-static id AFJSONObjectByRemovingKeysWithNullValues(id JSONObject, NSJSONReadingOptions readingOptions) {
+id AFJSONObjectByRemovingKeysWithNullValues(id JSONObject, NSJSONReadingOptions readingOptions) {
     if ([JSONObject isKindOfClass:[NSArray class]]) {
         NSMutableArray *mutableArray = [NSMutableArray arrayWithCapacity:[(NSArray *)JSONObject count]];
         for (id value in (NSArray *)JSONObject) {

fastlane/.env.default

@@ -1,6 +1,6 @@
-AF_IOS_SDK=iphonesimulator11.3
+AF_IOS_SDK=iphonesimulator11.4
 AF_MAC_SDK=macosx10.13
-AF_TVOS_SDK=appletvsimulator11.3
+AF_TVOS_SDK=appletvsimulator11.4
 
 AF_CONFIGURATION=Release
 

fastlane/.env.ios11_xcode93

@@ -1,3 +1,3 @@
 SCAN_DEVICE="iPhone 8"
-SCAN_SDK=$AF_IOS_SDK
+SCAN_SDK=iphonesimulator11.3
 EXAMPLE_DESTINATION="platform=iOS Simulator,name=iPhone 8"

fastlane/.env.ios11_xcode94

@@ -0,0 +1,3 @@
+SCAN_DEVICE="iPhone 8"
+SCAN_SDK=$AF_IOS_SDK
+EXAMPLE_DESTINATION="platform=iOS Simulator,name=iPhone 8"