diff --git a/platform/ios/platform/ios/Integration Tests/Camera Tests/MLNCameraTransitionTests.mm b/platform/ios/platform/ios/Integration Tests/Camera Tests/MLNCameraTransitionTests.mm
index b9d5d7f55..85dab267f 100644
--- a/platform/ios/platform/ios/Integration Tests/Camera Tests/MLNCameraTransitionTests.mm	
+++ b/platform/ios/platform/ios/Integration Tests/Camera Tests/MLNCameraTransitionTests.mm	
@@ -13,7 +13,7 @@
     expectation.expectedFulfillmentCount = 2;
     expectation.assertForOverFulfill = YES;
 
-    __weak typeof(self) weakself = self;
+    __weak MLNCameraTransitionTests *weakself = self;
 
     self.regionDidChange = ^(MLNMapView *mapView, MLNCameraChangeReason reason, BOOL animated) {
 
@@ -44,7 +44,7 @@
     expectation.expectedFulfillmentCount = 2;
     expectation.assertForOverFulfill = YES;
 
-    __weak typeof(self) weakself = self;
+    __weak MLNCameraTransitionTests *weakself = self;
 
     self.regionDidChange = ^(MLNMapView *mapView, MLNCameraChangeReason reason, BOOL animated) {
 
@@ -74,7 +74,7 @@
     expectation.expectedFulfillmentCount = 1;
     expectation.assertForOverFulfill = YES;
 
-    __weak typeof(self) weakself = self;
+    __weak MLNCameraTransitionTests *weakself = self;
     __block BOOL startedReset = NO;
     __block BOOL finishedReset = NO;
 
@@ -122,7 +122,7 @@
     [self.mapView setCenterCoordinate:dc zoomLevel:zoomLevel animated:NO];
     [self.mapView setCenterCoordinate:dc_west zoomLevel:zoomLevel animated:YES];
 
-    __weak typeof(self) weakself = self;
+    __weak MLNCameraTransitionTests *weakself = self;
 
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.15 * NSEC_PER_SEC),
                    dispatch_get_main_queue(),
@@ -152,7 +152,7 @@
     expectation.expectedFulfillmentCount = 2;
     expectation.assertForOverFulfill = YES;
 
-    __weak typeof(self) weakself = self;
+    __weak MLNCameraTransitionTests *weakself = self;
     __block NSInteger delegateCallCount = 0;
 
     CLLocationCoordinate2D target = CLLocationCoordinate2DMake(40.0, 40.0);
@@ -229,7 +229,7 @@
 
     XCTestExpectation *expectation = [self expectationWithDescription:@"regionDidChange expectation"];
 
-    __weak typeof(self) weakself = self;
+    __weak MLNCameraTransitionTests *weakself = self;
     __block NSInteger delegateCallCount = 0;
     expectation.expectedFulfillmentCount = 3;
     expectation.assertForOverFulfill = YES;
@@ -333,7 +333,7 @@
 
 // MARK: - Pending tests
 
-- (void)testContinuallyResettingNorthInIsChanging🙁{
+- (void)testContinuallyResettingNorthInIsChangingPENDING{
     // See https://github.com/mapbox/mapbox-gl-native/pull/11614
     // This test currently fails, unsurprisingly, since we're continually
     // setting the camera to the same parameters during its update.
@@ -365,8 +365,8 @@
     XCTAssertEqualWithAccuracy(self.mapView.direction, 0.0, 0.001, @"Camera should have reset to north. %0.3f", self.mapView.direction);
 }
 
-- (void)testContinuallySettingCoordinateInIsChanging🙁 {
-    // See above comment in `-testContinuallyResettingNorthInIsChanging🙁`
+- (void)testContinuallySettingCoordinateInIsChangingPENDING {
+    // See above comment in `-testContinuallyResettingNorthInIsChangingPENDING`
 
     // Reset to non-zero, prior to testing
     [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(0.0, 0.0) animated:NO];
@@ -375,7 +375,7 @@
     expectation.expectedFulfillmentCount = 2;
     expectation.assertForOverFulfill = YES;
 
-    __weak typeof(self) weakself = self;
+    __weak MLNCameraTransitionTests *weakself = self;
 
     self.regionIsChanging = ^(MLNMapView *mapView) {
         [weakself.mapView setCenterCoordinate:CLLocationCoordinate2DMake(-40.0, -40.0) animated:YES];
diff --git a/platform/ios/platform/ios/Integration Tests/MLNIntegrationTestCase.m b/platform/ios/platform/ios/Integration Tests/MLNIntegrationTestCase.m
index 9dcf8cd73..8dcf86e8d 100644
--- a/platform/ios/platform/ios/Integration Tests/MLNIntegrationTestCase.m	
+++ b/platform/ios/platform/ios/Integration Tests/MLNIntegrationTestCase.m	
@@ -16,8 +16,7 @@
     for (XCTest *test in tests) {
 
         // Check for pending tests
-        if ([test.name containsString:@"PENDING"] ||
-            [test.name containsString:@"🙁"]) {
+        if ([test.name containsString:@"PENDING"]) {
             if (!runPendingTests) {
                 printf("warning: '%s' is a pending test - skipping\n", test.name.UTF8String);
                 continue;
@@ -25,7 +24,7 @@
         }
 
         // Check for tests that require a valid access token
-        if ([test.name containsString:@"🔒"]) {
+        if ([test.name containsString:@"LOCKED"]) {
             if (!apiKey) {
                 printf("warning: MLN_API_KEY env var is required for test '%s' - skipping.\n", test.name.UTF8String);
                 continue;
@@ -43,7 +42,7 @@
 
     NSString *apiKey;
 
-    if ([self.name containsString:@"🔒"]) {
+    if ([self.name containsString:@"LOCKED"]) {
         apiKey = [[NSProcessInfo processInfo] environment][@"MLN_API_KEY"];
 
         if (!apiKey) {
diff --git a/platform/ios/platform/ios/Integration Tests/MLNNetworkConfigurationIntegrationTests.mm b/platform/ios/platform/ios/Integration Tests/MLNNetworkConfigurationIntegrationTests.mm
index 1a7c544c1..a19b5f94b 100644
--- a/platform/ios/platform/ios/Integration Tests/MLNNetworkConfigurationIntegrationTests.mm	
+++ b/platform/ios/platform/ios/Integration Tests/MLNNetworkConfigurationIntegrationTests.mm	
@@ -211,7 +211,7 @@
     }
 }
 
-- (void)testNetworkConfigurationWithSharedSession🔒 {
+- (void)testNetworkConfigurationWithSharedSessionLOCKED {
     NSURLSession *session = [NSURLSession sharedSession];
     [self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
 }
@@ -230,19 +230,19 @@
     //  [self internalTestNetworkConfigurationWithSession:session], NSException, NSInvalidArgumentException);
 }
 
-- (void)testNetworkConfigurationWithDefaultSessionConfiguration🔒 {
+- (void)testNetworkConfigurationWithDefaultSessionConfigurationLOCKED {
     NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
     NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
     [self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
 }
 
-- (void)testNetworkConfigurationWithEmphemeralSessionConfiguration🔒 {
+- (void)testNetworkConfigurationWithEmphemeralSessionConfigurationLOCKED {
     NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration ephemeralSessionConfiguration];
     NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig];
     [self internalTestNetworkConfigurationWithSession:session shouldDownload:YES];
 }
 
-- (void)testNetworkConfigurationWithSessionConfigurationWithDelegate🔒 {
+- (void)testNetworkConfigurationWithSessionConfigurationWithDelegateLOCKED {
     __block BOOL didCallAuthChallenge = NO;
     __block BOOL isMainThread = YES;
 
@@ -266,7 +266,7 @@
     XCTAssert(didCallAuthChallenge);
 }
 
-- (void)testFailureForNetworkConfigurationWithSessionWithDataDelegate🔒 {
+- (void)testFailureForNetworkConfigurationWithSessionWithDataDelegateLOCKED {
     __block BOOL didCallReceiveData = NO;
 
     NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
@@ -297,7 +297,7 @@
     XCTAssertFalse(didCallReceiveData);
 }
 
-- (void)testNetworkConfigurationWithSessionConfigurationWithCustomHeaders🔒 {
+- (void)testNetworkConfigurationWithSessionConfigurationWithCustomHeadersLOCKED {
     // Custom session configuration, based on `MLNNetworkConfiguration.defaultSessionConfiguration`
     NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
     sessionConfig.HTTPAdditionalHeaders = @{ @"testing" : @YES };
diff --git a/platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MLNMapSnapshotterSwiftTests.swift b/platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MLNMapSnapshotterSwiftTests.swift
index 31c21656b..fc2498a8a 100644
--- a/platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MLNMapSnapshotterSwiftTests.swift	
+++ b/platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MLNMapSnapshotterSwiftTests.swift	
@@ -20,7 +20,7 @@ class MLNMapSnapshotterSwiftTests: MLNMapViewIntegrationTest {
         MLNSettings.use(MLNWellKnownTileServer.mapTiler)
     }
 
-    func testCapturingSnapshotterInSnapshotCompletion🔒() {
+    func testCapturingSnapshotterInSnapshotCompletionLOCKED() {
         // See the Obj-C testDeallocatingSnapshotterDuringSnapshot
         // This Swift test, is essentially the same except for capturing the snapshotter
 
@@ -62,7 +62,7 @@ class MLNMapSnapshotterSwiftTests: MLNMapViewIntegrationTest {
         wait(for: [expectation], timeout: timeout)
     }
     
-    func testSnapshotOverlaySwiftErgonomics🔒() {
+    func testSnapshotOverlaySwiftErgonomicsLOCKED() {
         let options     = MLNMapSnapshotterSwiftTests.snapshotterOptions(size: mapView.bounds.size)
         let snapshotter = MLNMapSnapshotter(options: options)
         let expectation = self.expectation(description: "snapshot")
diff --git a/platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MLNMapSnapshotterTest.m b/platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MLNMapSnapshotterTest.m
index bc754943a..0e633289a 100644
--- a/platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MLNMapSnapshotterTest.m	
+++ b/platform/ios/platform/ios/Integration Tests/Snapshotter Tests/MLNMapSnapshotterTest.m	
@@ -47,7 +47,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     [MLNSettings useWellKnownTileServer:MLNMapTiler];
 }
 
-- (void)testMultipleSnapshotsWithASingleSnapshotter🔒 {
+- (void)testMultipleSnapshotsWithASingleSnapshotterLOCKED {
     CGSize size = self.mapView.bounds.size;
 
     XCTestExpectation *expectation = [self expectationWithDescription:@"snapshots"];
@@ -77,7 +77,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     [self waitForExpectations:@[expectation] timeout:10.0];
 }
 
-- (void)testSnapshotterWithoutStrongReference🔒 {
+- (void)testSnapshotterWithoutStrongReferenceLOCKED {
     XCTestExpectation *expectation = [self expectationWithDescription:@"Completion handler should be called even if there’s no strong reference to the snapshotter."];
     
     CGSize size = self.mapView.bounds.size;
@@ -100,7 +100,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     MLNTestAssertNil(self, weakSnapshotter, @"Completion handler should not leak snapshotter.");
 }
 
-- (void)testSnapshotterInBackgroundWithoutStrongReference🔒 {
+- (void)testSnapshotterInBackgroundWithoutStrongReferenceLOCKED {
     // See also https://github.com/mapbox/mapbox-gl-native/issues/12336
 
     NSTimeInterval timeout         = 10.0;
@@ -146,7 +146,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     MLNTestAssertNil(self, weakSnapshotter, @"Snapshotter should not leak.");
 }
 
-- (void)testSnapshotterUsingNestedDispatchQueues🔒 {
+- (void)testSnapshotterUsingNestedDispatchQueuesLOCKED {
     // This is the opposite pair to the above test `testDeallocatingSnapshotterDuringSnapshot`
     // The only significant difference is that the snapshotter is a `__block` variable, so
     // its lifetime should continue until it's set to nil in the completion block.
@@ -189,7 +189,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     [self waitForExpectations:@[expectation] timeout:timeout];
 }
 
-- (void)testCancellingSnapshot🔒 {
+- (void)testCancellingSnapshotLOCKED {
     CGSize size                    = self.mapView.bounds.size;
     CLLocationCoordinate2D coord   = CLLocationCoordinate2DMake(30.0, 30.0);
 
@@ -209,7 +209,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     MLNTestAssertNil(self, weakSnapshotter, @"Snapshotter should not leak after being canceled.");
 }
 
-- (void)testAllocatingSnapshotOnBackgroundQueue🔒 {
+- (void)testAllocatingSnapshotOnBackgroundQueueLOCKED {
     XCTestExpectation *expectation = [self expectationWithDescription:@"snapshots"];
 
     CGSize size                  = self.mapView.bounds.size;
@@ -242,7 +242,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     [self waitForExpectations:@[expectation] timeout:2.0];
 }
 
-- (void)testSnapshotterFromBackgroundQueueShouldFail🔒 {
+- (void)testSnapshotterFromBackgroundQueueShouldFailLOCKED {
     CGSize size = self.mapView.bounds.size;
     CLLocationCoordinate2D coord = CLLocationCoordinate2DMake(30.0, 30.0);
 
@@ -293,7 +293,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     [self waitForExpectations:@[expectation] timeout:60.0];
 }
 
-- (void)testMultipleSnapshotters🔒🙁 {
+- (void)testMultipleSnapshottersLOCKEDandPENDING {
     NSUInteger numSnapshots = 8;
     CGSize size = self.mapView.bounds.size;
 
@@ -335,7 +335,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     [self waitForExpectations:@[expectation] timeout:60.0];
 }
 
-- (void)testSnapshotPointConversion🔒 {
+- (void)testSnapshotPointConversionLOCKED {
     CGSize size = self.mapView.bounds.size;
 
     XCTestExpectation *expectation = [self expectationWithDescription:@"snapshot"];
@@ -373,7 +373,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     [self waitForExpectations:@[expectation] timeout:10.0];
 }
 
-- (void)testSnapshotPointConversionCoordinateOrdering🔒 {
+- (void)testSnapshotPointConversionCoordinateOrderingLOCKED {
     CGSize size = self.mapView.bounds.size;
 
     XCTestExpectation *expectation = [self expectationWithDescription:@"snapshot"];
@@ -416,7 +416,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     [self waitForExpectations:@[expectation] timeout:10.0];
 }
 
-- (void)testSnapshotWithOverlayHandlerFailure🔒 {
+- (void)testSnapshotWithOverlayHandlerFailureLOCKED {
     CGSize size = self.mapView.bounds.size;
 
     XCTestExpectation *expectation = [self expectationWithDescription:@"snapshot with overlay fails"];
@@ -445,7 +445,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     [self waitForExpectations:@[expectation] timeout:10.0];
 }
 
-- (void)testSnapshotWithOverlayHandlerSuccess🔒 {
+- (void)testSnapshotWithOverlayHandlerSuccessLOCKED {
     CGSize size = self.mapView.bounds.size;
     CGRect snapshotRect = CGRectMake(0, 0, size.width, size.height);
 
@@ -485,7 +485,7 @@ MLNMapSnapshotter* snapshotterWithBounds(MLNCoordinateBounds bounds, CGSize size
     [self waitForExpectations:@[expectation] timeout:10.0];
 }
 
-- (void)testSnapshotCoordinatesWithOverlayHandler🔒 {
+- (void)testSnapshotCoordinatesWithOverlayHandlerLOCKED {
     CGSize size = self.mapView.bounds.size;
 
     XCTestExpectation *expectation = [self expectationWithDescription:@"snapshot with overlay succeeds"];
diff --git a/platform/ios/platform/ios/app/MBXViewController.m b/platform/ios/platform/ios/app/MBXViewController.m
index 0c868bc30..0aacefff1 100644
--- a/platform/ios/platform/ios/app/MBXViewController.m
+++ b/platform/ios/platform/ios/app/MBXViewController.m
@@ -693,7 +693,7 @@ CLLocationCoordinate2D randomWorldCoordinate(void) {
                         _originalContentInsets = [self.mapView contentInset];
                     }
                     _contentInsetsEnabled = !_contentInsetsEnabled;
-                    self.automaticallyAdjustsScrollViewInsets = !_contentInsetsEnabled;
+                    _mapView.automaticallyAdjustsContentInset = !_contentInsetsEnabled;
                     UIEdgeInsets contentInsets = self.mapView.bounds.size.width > self.mapView.bounds.size.height
                         ? UIEdgeInsetsMake(_originalContentInsets.top, 0.5 * self.mapView.bounds.size.width, _originalContentInsets.bottom, 0.0)
                         : UIEdgeInsetsMake(0.25 * self.mapView.bounds.size.height, 0.0, _originalContentInsets.bottom, 0.25 * self.mapView.bounds.size.width);
@@ -1833,7 +1833,7 @@ CLLocationCoordinate2D randomWorldCoordinate(void) {
             [NSLayoutConstraint constraintWithItem:secondMapView
                                          attribute:NSLayoutAttributeBottom
                                          relatedBy:NSLayoutRelationEqual
-                                            toItem:self.bottomLayoutGuide
+                                            toItem:self.view.safeAreaLayoutGuide.bottomAnchor
                                          attribute:NSLayoutAttributeBottom
                                         multiplier:1
                                           constant:0],
@@ -1853,7 +1853,7 @@ CLLocationCoordinate2D randomWorldCoordinate(void) {
         [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.mapView
                                                               attribute:NSLayoutAttributeBottom
                                                               relatedBy:NSLayoutRelationEqual
-                                                                 toItem:self.bottomLayoutGuide
+                                                                 toItem:self.view.safeAreaLayoutGuide.bottomAnchor
                                                               attribute:NSLayoutAttributeTop
                                                              multiplier:1
                                                                constant:0]];
@@ -1976,7 +1976,7 @@ CLLocationCoordinate2D randomWorldCoordinate(void) {
     if (_contentInsetsEnabled)
     {
         _contentInsetsEnabled = NO;
-        self.automaticallyAdjustsScrollViewInsets = YES;
+        _mapView.automaticallyAdjustsContentInset = YES;
         [self.mapView setContentInset:UIEdgeInsetsZero];
     }
     while (self.contentInsetsOverlays && [self.contentInsetsOverlays count]) {
diff --git a/platform/ios/platform/ios/app/insert_access_token.sh b/platform/ios/platform/ios/app/insert_access_token.sh
index b9c79618a..4e8b267b5 100755
--- a/platform/ios/platform/ios/app/insert_access_token.sh
+++ b/platform/ios/platform/ios/app/insert_access_token.sh
@@ -1,7 +1,7 @@
 echo "Inserting MapLibre API key..."
 token_file=~/.maplibre
 token_file2=~/maplibre
-token="$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null || $MLN_API_KEY)"
+token="$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null || echo $MLN_API_KEY)"
 if [ "$token" ]; then
     plutil -replace MLNApiKey -string $token "$TARGET_BUILD_DIR/$INFOPLIST_PATH"
     echo "API key insertion successful"
diff --git a/platform/ios/platform/ios/benchmark/insert_access_token.sh b/platform/ios/platform/ios/benchmark/insert_access_token.sh
index 5bae44829..4e8b267b5 100755
--- a/platform/ios/platform/ios/benchmark/insert_access_token.sh
+++ b/platform/ios/platform/ios/benchmark/insert_access_token.sh
@@ -1,7 +1,7 @@
 echo "Inserting MapLibre API key..."
 token_file=~/.maplibre
 token_file2=~/maplibre
-token="$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null  || $MLN_API_KEY)"
+token="$(cat $token_file 2>/dev/null || cat $token_file2 2>/dev/null || echo $MLN_API_KEY)"
 if [ "$token" ]; then
     plutil -replace MLNApiKey -string $token "$TARGET_BUILD_DIR/$INFOPLIST_PATH"
     echo "API key insertion successful"
diff --git a/platform/ios/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/platform/ios/ios.xcodeproj/project.pbxproj
index 1adecd70f..6581bdbe3 100644
--- a/platform/ios/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/platform/ios/ios.xcodeproj/project.pbxproj
@@ -3602,7 +3602,6 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
@@ -3613,8 +3612,8 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Integration Tests/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.integration-tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3632,7 +3631,6 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
@@ -3643,8 +3641,8 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Integration Tests/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.integration-tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3661,7 +3659,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
@@ -3671,9 +3668,8 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = GJZR2MEM28;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Integration Test Harness/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.Integration-Test-Harness";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3687,7 +3683,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
@@ -3697,9 +3692,8 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = GJZR2MEM28;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Integration Test Harness/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.Integration-Test-Harness";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3711,7 +3705,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD)";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -3719,9 +3713,10 @@
 				CURRENT_PROJECT_VERSION = 15256;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-Wno-ambiguous-macro";
@@ -3745,6 +3740,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = app/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.maplibre.maplibregl;
 				PRODUCT_NAME = "MapLibre GL";
@@ -3756,26 +3752,25 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = KBDAWM7T4E;
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../../../../include",
 					"$(PROJECT_DIR)/../../../default/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/variant/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geometry.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geojson.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/optional",
 					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/expected-lite/include",
 					"$(PROJECT_DIR)/../../../../vendor/polylabel/include",
-					"$(PROJECT_DIR)/../../../../vendor/expected/include",
 					"$(PROJECT_DIR)/../../../darwin/include",
+					"$(PROJECT_DIR)/../darwin/include",
 				);
 				INFOPLIST_FILE = benchmark/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_GENERATE_MAP_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.maplibre.bench;
@@ -3819,17 +3814,16 @@
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../../../../include",
 					"$(PROJECT_DIR)/../../../default/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/variant/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geometry.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geojson.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/optional",
 					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include",
 					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/expected-lite/include",
 					"$(PROJECT_DIR)/../../../../vendor/polylabel/include",
-					"$(PROJECT_DIR)/../../../platform/darwin/include",
+					"$(PROJECT_DIR)/../../../darwin/include",
+					"$(PROJECT_DIR)/../darwin/include",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3867,6 +3861,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				DEVELOPMENT_TEAM = V6F7X5J9Y7;
 				INFOPLIST_FILE = test/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_CFLAGS = "-fvisibility=hidden";
 				OTHER_CPLUSPLUSFLAGS = (
@@ -3893,7 +3888,6 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
@@ -3904,8 +3898,8 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Integration Tests/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.integration-tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3922,7 +3916,6 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
@@ -3933,8 +3926,8 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = GJZR2MEM28;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "Integration Test Harness/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mapbox.Integration-Test-Harness";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3948,7 +3941,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -3976,7 +3968,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -3986,7 +3977,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "iosapp UITests/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -4006,7 +3997,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -4033,7 +4023,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -4042,7 +4031,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "iosapp UITests/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.maplibre.iosapp-UITests";
@@ -4059,7 +4048,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -4086,7 +4074,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -4095,7 +4082,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = "iosapp UITests/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.maplibre.iosapp-UITests";
@@ -4112,7 +4099,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -4140,7 +4126,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -4170,7 +4155,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -4197,7 +4181,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -4223,7 +4206,6 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
@@ -4250,7 +4232,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -4274,7 +4255,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD)";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -4282,12 +4263,13 @@
 				CURRENT_PROJECT_VERSION = 15256;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-Wno-ambiguous-macro";
@@ -4302,7 +4284,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD)";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -4310,9 +4292,10 @@
 				CURRENT_PROJECT_VERSION = 15256;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = c11;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-Wno-ambiguous-macro";
@@ -4336,6 +4319,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = app/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.maplibre.maplibregl;
 				PRODUCT_NAME = "MapLibre GL";
@@ -4354,6 +4338,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = app/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.maplibre.maplibregl;
 				PRODUCT_NAME = "MapLibre GL";
@@ -4369,6 +4354,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				DEVELOPMENT_TEAM = V6F7X5J9Y7;
 				INFOPLIST_FILE = test/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_CFLAGS = "-fvisibility=hidden";
 				OTHER_CPLUSPLUSFLAGS = (
@@ -4398,6 +4384,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				DEVELOPMENT_TEAM = V6F7X5J9Y7;
 				INFOPLIST_FILE = test/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				OTHER_CFLAGS = "-fvisibility=hidden";
 				OTHER_CPLUSPLUSFLAGS = (
@@ -4500,17 +4487,16 @@
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../../../../include",
 					"$(PROJECT_DIR)/../../../default/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/variant/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geometry.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geojson.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/optional",
 					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include",
 					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/expected-lite/include",
 					"$(PROJECT_DIR)/../../../../vendor/polylabel/include",
-					"$(PROJECT_DIR)/../../../platform/darwin/include",
+					"$(PROJECT_DIR)/../../../darwin/include",
+					"$(PROJECT_DIR)/../darwin/include",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4539,17 +4525,16 @@
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../../../../include",
 					"$(PROJECT_DIR)/../../../default/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/variant/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geometry.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geojson.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/optional",
 					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include",
 					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/expected-lite/include",
 					"$(PROJECT_DIR)/../../../../vendor/polylabel/include",
-					"$(PROJECT_DIR)/../../../platform/darwin/include",
+					"$(PROJECT_DIR)/../../../darwin/include",
+					"$(PROJECT_DIR)/../darwin/include",
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -4573,26 +4558,25 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = KBDAWM7T4E;
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../../../../include",
 					"$(PROJECT_DIR)/../../../default/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/variant/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geometry.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geojson.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/optional",
 					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/expected-lite/include",
 					"$(PROJECT_DIR)/../../../../vendor/polylabel/include",
-					"$(PROJECT_DIR)/../../../../vendor/expected/include",
-					"$(PROJECT_DIR)/../../../platform/darwin/include",
+					"$(PROJECT_DIR)/../../../darwin/include",
+					"$(PROJECT_DIR)/../darwin/include",
 				);
 				INFOPLIST_FILE = benchmark/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_GENERATE_MAP_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.maplibre.bench;
@@ -4605,26 +4589,25 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = KBDAWM7T4E;
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/../../../../include",
 					"$(PROJECT_DIR)/../../../default/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/variant/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geometry.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/value/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/geojson.hpp/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/optional",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/typewrapper/include",
-					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/mapbox/weak/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/variant/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geometry.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/geojson.hpp/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/deps/optional",
 					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/rapidjson/include",
+					"$(PROJECT_DIR)/../../../../vendor/mapbox-base/extras/expected-lite/include",
 					"$(PROJECT_DIR)/../../../../vendor/polylabel/include",
-					"$(PROJECT_DIR)/../../../../vendor/expected/include",
-					"$(PROJECT_DIR)/../../../platform/darwin/include",
+					"$(PROJECT_DIR)/../../../darwin/include",
+					"$(PROJECT_DIR)/../darwin/include",
 				);
 				INFOPLIST_FILE = benchmark/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_GENERATE_MAP_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.maplibre.bench;
diff --git a/platform/ios/platform/ios/test/MLNMapViewContentInsetTests.m b/platform/ios/platform/ios/test/MLNMapViewContentInsetTests.m
index f79ec5e4c..b0659cf11 100644
--- a/platform/ios/platform/ios/test/MLNMapViewContentInsetTests.m
+++ b/platform/ios/platform/ios/test/MLNMapViewContentInsetTests.m
@@ -98,7 +98,7 @@
     XCTAssertTrue(CGPointEqualToPoint(attributionView.frame.origin, expectedAttributionOrigin));
     
     UIEdgeInsets insets = UIEdgeInsetsMake(15, 10, 20, 5);
-    self.viewController.automaticallyAdjustsScrollViewInsets = NO;
+    self.mapView.automaticallyAdjustsContentInset = NO;
     self.mapView.contentInset = insets;
     
     [self.mapView setNeedsLayout];