[iOS] Revert 'Use modular headers everywhere'

This commit rolls back AliSoftware/OHHTTPStubs@806ba99fb71d0b8bebe505b3a939c0a755606bd8 so that we can keep using OHHTTPStubs in the same project without creating a separate framework target.

5 files changed, 14 insertions, 12 deletions

diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h
index 6c684caacb..f4c2a07a98 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.h
@@ -28,8 +28,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import <OHHTTPStubs/Compatibility.h>
-#import <OHHTTPStubs/OHHTTPStubsResponse.h>
+#import "Compatibility.h"
+#import "OHHTTPStubsResponse.h"
 
 
 NS_ASSUME_NONNULL_BEGIN
@@ -181,17 +181,17 @@ NS_ASSUME_NONNULL_END
 #pragma mark - Umbrella Header Imports
 
 
-#if ! __has_include(<OHHTTPStubs/OHHTTPStubs-umbrella.h>)
+#if ! __has_include("OHHTTPStubs/OHHTTPStubs-umbrella.h")
   // Because this is supposed to be an umbrella header, we should also import every public headers here
   // (Except if we use already have a better umbrella header generated by CocoaPods)
-  #if __has_include(<OHHTTPStubs/OHHTTPStubsResponse+JSON.h>)
-    #import <OHHTTPStubs/OHHTTPStubsResponse+JSON.h>
+  #if __has_include("OHHTTPStubs/OHHTTPStubsResponse+JSON.h")
+    #import "OHHTTPStubs/OHHTTPStubsResponse+JSON.h"
   #endif
-  #if __has_include(<OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h>)
-    #import <OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h>
+  #if __has_include("OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h")
+    #import "OHHTTPStubs/OHHTTPStubsResponse+HTTPMessage.h"
   #endif
-  #if __has_include(<OHHTTPStubs/OHHTTPStubs+Mocktail.h>)
-    #import <OHHTTPStubs/OHHTTPStubs+Mocktail.h>
+  #if __has_include("OHHTTPStubs/OHHTTPStubs+Mocktail.h")
+    #import "OHHTTPStubs/OHHTTPStubs+Mocktail.h"
   #endif
   #if __has_include("OHHTTPStubs/OHPathHelpers.h")
     #import "OHHTTPStubs/OHPathHelpers.h"
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m
index b381547c95..4fa31f907b 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubs.m
@@ -29,7 +29,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Imports
 
-#import <OHHTTPStubs/OHHTTPStubs.h>
+#import "OHHTTPStubs.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Types & Constants
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h
index acab3a3b58..27f487f9fa 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.h
@@ -27,7 +27,7 @@
 #pragma mark - Imports
 
 #import <Foundation/Foundation.h>
-#import <OHHTTPStubs/Compatibility.h>
+#import "Compatibility.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Defines & Constants
diff --git a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m
index d8d88e1c00..db8d7efa79 100644
--- a/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m
+++ b/test/ios/OHHTTPStubs/OHHTTPStubs/Sources/OHHTTPStubsResponse.m
@@ -29,7 +29,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Imports
 
-#import <OHHTTPStubs/OHHTTPStubsResponse.h>
+#import "OHHTTPStubsResponse.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 #pragma mark - Defines & Constants
diff --git a/test/ios/ios-tests.xcodeproj/project.pbxproj b/test/ios/ios-tests.xcodeproj/project.pbxproj
index 2807ee01bf..fed45bf7ed 100644
--- a/test/ios/ios-tests.xcodeproj/project.pbxproj
+++ b/test/ios/ios-tests.xcodeproj/project.pbxproj
@@ -88,6 +88,7 @@
 		96992E601B0FBC4F008978C0 /* CLLocationManager+MockLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CLLocationManager+MockLocation.h"; sourceTree = "<group>"; };
 		96992E611B0FBC4F008978C0 /* CLLocationManager+MockLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CLLocationManager+MockLocation.m"; sourceTree = "<group>"; };
 		DACAD7111B08719F009119DC /* MGLMapboxEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MGLMapboxEvents.h; path = ../../platform/ios/MGLMapboxEvents.h; sourceTree = SOURCE_ROOT; };
+		DADD9EB51BD16D8B00DA9161 /* Compatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Compatibility.h; path = OHHTTPStubs/OHHTTPStubs/Sources/Compatibility.h; sourceTree = SOURCE_ROOT; };
 		DD043323196DB9BC00E6F39D /* Mapbox GL Tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL Tests.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DD04335F196DBBD500E6F39D /* MGLTAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLTAppDelegate.m; sourceTree = SOURCE_ROOT; };
 		DD043360196DBBD500E6F39D /* MGLTViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGLTViewController.m; sourceTree = SOURCE_ROOT; };
@@ -273,6 +274,7 @@
 		DD0E6F861B01B67100DC035A /* OHHTTPStubs */ = {
 			isa = PBXGroup;
 			children = (
+				DADD9EB51BD16D8B00DA9161 /* Compatibility.h */,
 				DD0E6F8D1B01B68E00DC035A /* OHHTTPStubs.h */,
 				DD0E6F8E1B01B68E00DC035A /* OHHTTPStubs.m */,
 				DD0E6F8F1B01B68E00DC035A /* OHHTTPStubs+NSURLSessionConfiguration.m */,