[ios, macos] Tail work from 15385 (#15647)

* [ios] Tweak iosapp headers.

* [ios] Revert bundle identifier change.

* [ios, macos] Remove parameter not referenced.

16 files changed, 19 insertions, 24 deletions

diff --git a/platform/darwin/src/MGLMapSnapshotter.h b/platform/darwin/src/MGLMapSnapshotter.h
index 0f20cf1bb..33febe0d0 100644
--- a/platform/darwin/src/MGLMapSnapshotter.h
+++ b/platform/darwin/src/MGLMapSnapshotter.h
@@ -228,7 +228,6 @@ MGL_EXPORT
  Starts the snapshot creation and executes the specified blocks with the result
  on the specified queue. Use this option if you want to add custom drawing on top of the
  resulting `MGLMapSnapShot`.
- @param queue The queue to handle the result on.
  @param overlayHandler The block to handle manipulation of the `MGLMapSnapshotter`'s `CGContext`.
  @param completionHandler The block to handle the result in.
  */
diff --git a/platform/ios/app/MBXAnnotationView.h b/platform/ios/app/MBXAnnotationView.h
index 5337ffae5..6bd799673 100644
--- a/platform/ios/app/MBXAnnotationView.h
+++ b/platform/ios/app/MBXAnnotationView.h
@@ -1,4 +1,4 @@
-#import <Mapbox/Mapbox.h>
+@import Mapbox;
 
 @interface MBXAnnotationView : MGLAnnotationView
 @end
diff --git a/platform/ios/app/MBXAppDelegate.m b/platform/ios/app/MBXAppDelegate.m
index 519c70766..bf62866b8 100644
--- a/platform/ios/app/MBXAppDelegate.m
+++ b/platform/ios/app/MBXAppDelegate.m
@@ -1,6 +1,7 @@
+@import Mapbox;
+
 #import "MBXAppDelegate.h"
 #import "MBXViewController.h"
-#import <Mapbox/Mapbox.h>
 
 @interface MBXAppDelegate() <MGLMetricsManagerDelegate>
 
diff --git a/platform/ios/app/MBXCustomCalloutView.h b/platform/ios/app/MBXCustomCalloutView.h
index 961f2d7f6..5a7c9c926 100644
--- a/platform/ios/app/MBXCustomCalloutView.h
+++ b/platform/ios/app/MBXCustomCalloutView.h
@@ -1,5 +1,4 @@
-#import <UIKit/UIKit.h>
-#import <Mapbox/Mapbox.h>
+@import Mapbox;
 
 /**
  * Basic custom callout view to demonstrate how to
diff --git a/platform/ios/app/MBXCustomLocationViewController.m b/platform/ios/app/MBXCustomLocationViewController.m
index 0473f8c2e..c77d990ba 100644
--- a/platform/ios/app/MBXCustomLocationViewController.m
+++ b/platform/ios/app/MBXCustomLocationViewController.m
@@ -1,6 +1,6 @@
-#import "MBXCustomLocationViewController.h"
+@import Mapbox;
 
-#import <Mapbox/Mapbox.h>
+#import "MBXCustomLocationViewController.h"
 
 @interface MBXCustomLocationManager : NSObject<MGLLocationManager>
 @end
diff --git a/platform/ios/app/MBXEmbeddedMapViewController.m b/platform/ios/app/MBXEmbeddedMapViewController.m
index f26a007c1..dacbdb512 100644
--- a/platform/ios/app/MBXEmbeddedMapViewController.m
+++ b/platform/ios/app/MBXEmbeddedMapViewController.m
@@ -1,5 +1,6 @@
+@import Mapbox;
+
 #import "MBXEmbeddedMapViewController.h"
-#import <Mapbox/Mapbox.h>
 
 typedef NS_ENUM(NSInteger, MBXEmbeddedControl) {
     MBXEmbeddedControlZoom = 0,
diff --git a/platform/ios/app/MBXOfflinePacksTableViewController.m b/platform/ios/app/MBXOfflinePacksTableViewController.m
index 90497ca93..bc8407a46 100644
--- a/platform/ios/app/MBXOfflinePacksTableViewController.m
+++ b/platform/ios/app/MBXOfflinePacksTableViewController.m
@@ -1,6 +1,7 @@
+@import Mapbox;
+
 #import "MBXOfflinePacksTableViewController.h"
 
-#import <Mapbox/Mapbox.h>
 
 static NSString * const MBXOfflinePackContextNameKey = @"Name";
 
diff --git a/platform/ios/app/MBXOrnamentsViewController.m b/platform/ios/app/MBXOrnamentsViewController.m
index 09ae78750..f451f647e 100644
--- a/platform/ios/app/MBXOrnamentsViewController.m
+++ b/platform/ios/app/MBXOrnamentsViewController.m
@@ -1,6 +1,6 @@
-#import "MBXOrnamentsViewController.h"
+@import Mapbox;
 
-#import <Mapbox/Mapbox.h>
+#import "MBXOrnamentsViewController.h"
 
 @interface MBXOrnamentsViewController ()<MGLMapViewDelegate>
 
diff --git a/platform/ios/app/MBXSnapshotsViewController.m b/platform/ios/app/MBXSnapshotsViewController.m
index 95d3251e2..747ff3924 100644
--- a/platform/ios/app/MBXSnapshotsViewController.m
+++ b/platform/ios/app/MBXSnapshotsViewController.m
@@ -1,6 +1,6 @@
-#import "MBXSnapshotsViewController.h"
+@import Mapbox;
 
-#import <Mapbox/Mapbox.h>
+#import "MBXSnapshotsViewController.h"
 
 @interface MBXSnapshotsViewController ()
 
diff --git a/platform/ios/app/MBXState.h b/platform/ios/app/MBXState.h
index 346c31d58..cf68016e9 100644
--- a/platform/ios/app/MBXState.h
+++ b/platform/ios/app/MBXState.h
@@ -1,5 +1,4 @@
-#import <Foundation/Foundation.h>
-#import <Mapbox/Mapbox.h>
+@import Mapbox;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/platform/ios/app/MBXStateManager.m b/platform/ios/app/MBXStateManager.m
index 7203ae462..f9dc771e2 100644
--- a/platform/ios/app/MBXStateManager.m
+++ b/platform/ios/app/MBXStateManager.m
@@ -1,5 +1,4 @@
 #import "MBXStateManager.h"
-#import <Mapbox/Mapbox.h>
 #import "MBXState.h"
 #import "MBXViewController.h"
 
diff --git a/platform/ios/app/MBXUserLocationAnnotationView.h b/platform/ios/app/MBXUserLocationAnnotationView.h
index 39ed729d2..a60658dd1 100644
--- a/platform/ios/app/MBXUserLocationAnnotationView.h
+++ b/platform/ios/app/MBXUserLocationAnnotationView.h
@@ -1,4 +1,4 @@
-#import <Mapbox/Mapbox.h>
+@import Mapbox;
 
 @interface MBXUserLocationAnnotationView : MGLUserLocationAnnotationView
 
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index 31a2ff1d6..82a68e074 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -1,3 +1,5 @@
+@import Mapbox;
+
 #import "MBXViewController.h"
 
 #import "MBXAppDelegate.h"
@@ -12,8 +14,6 @@
 #import "MBXState.h"
 
 #import "MBXFrameTimeGraphView.h"
-
-#import <Mapbox/Mapbox.h>
 #import "../src/MGLMapView_Experimental.h"
 
 #import <objc/runtime.h>
diff --git a/platform/ios/benchmark/MBXBenchAppDelegate.m b/platform/ios/benchmark/MBXBenchAppDelegate.m
index 522ebb2db..d1a0ddf94 100644
--- a/platform/ios/benchmark/MBXBenchAppDelegate.m
+++ b/platform/ios/benchmark/MBXBenchAppDelegate.m
@@ -1,6 +1,5 @@
 #import "MBXBenchAppDelegate.h"
 #import "MBXBenchViewController.h"
-#import <Mapbox/Mapbox.h>
 
 @implementation MBXBenchAppDelegate
 
diff --git a/platform/ios/benchmark/MBXBenchViewController.mm b/platform/ios/benchmark/MBXBenchViewController.mm
index 67d9b5cb6..901eb07cd 100644
--- a/platform/ios/benchmark/MBXBenchViewController.mm
+++ b/platform/ios/benchmark/MBXBenchViewController.mm
@@ -1,8 +1,5 @@
 #import "MBXBenchViewController.h"
-
 #import "MBXBenchAppDelegate.h"
-
-#import <Mapbox/Mapbox.h>
 #import "MGLMapView_Private.h"
 
 #include "locations.hpp"
diff --git a/platform/ios/framework/Info.plist b/platform/ios/framework/Info.plist
index 64bff94b7..d8962c53a 100644
--- a/platform/ios/framework/Info.plist
+++ b/platform/ios/framework/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.mapbox.core</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>