diff --git a/platform/ios/app/MBXOrnamentsViewController.m b/platform/ios/app/MBXOrnamentsViewController.m index 861d5d767..09ae78750 100644 --- a/platform/ios/app/MBXOrnamentsViewController.m +++ b/platform/ios/app/MBXOrnamentsViewController.m @@ -1,6 +1,6 @@ #import "MBXOrnamentsViewController.h" -@import Mapbox; +#import @interface MBXOrnamentsViewController () diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m index 346a182a8..31a2ff1d6 100644 --- a/platform/ios/app/MBXViewController.m +++ b/platform/ios/app/MBXViewController.m @@ -729,7 +729,7 @@ CLLocationCoordinate2D randomWorldCoordinate() { acrossDistance:100 pitch:60 heading:0]; - __weak typeof(self) weakSelf = self; + __weak MBXViewController *weakSelf = self; [self.mapView setCamera:camera withDuration:0.3 animationTimingFunction:nil completionHandler:^{ [weakSelf.mapView setContentInset:contentInsets animated:YES completionHandler:nil]; }]; diff --git a/platform/ios/framework/Info.plist b/platform/ios/framework/Info.plist index d8962c53a..64bff94b7 100644 --- a/platform/ios/framework/Info.plist +++ b/platform/ios/framework/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + com.mapbox.core CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/platform/ios/src/MGLCompassButton.mm b/platform/ios/src/MGLCompassButton.mm index acb25a560..5bbd9bf92 100644 --- a/platform/ios/src/MGLCompassButton.mm +++ b/platform/ios/src/MGLCompassButton.mm @@ -1,7 +1,7 @@ #import "MGLCompassButton_Private.h" #import "MGLCompassDirectionFormatter.h" -#import +#import "MGLGeometry.h" #import "MGLMapView_Private.h" #import "UIImage+MGLAdditions.h" diff --git a/platform/ios/src/MGLCompassButton_Private.h b/platform/ios/src/MGLCompassButton_Private.h index c9741d79e..9ef55cfa5 100644 --- a/platform/ios/src/MGLCompassButton_Private.h +++ b/platform/ios/src/MGLCompassButton_Private.h @@ -1,6 +1,6 @@ #import -#import +#import "MGLCompassButton.h" @class MGLMapView; diff --git a/platform/ios/src/MGLScaleBar.mm b/platform/ios/src/MGLScaleBar.mm index cd8bc1d03..8525881da 100644 --- a/platform/ios/src/MGLScaleBar.mm +++ b/platform/ios/src/MGLScaleBar.mm @@ -1,4 +1,4 @@ -#import +#import "Mapbox.h" #import "MGLScaleBar.h" static const CGFloat MGLFeetPerMile = 5280; diff --git a/platform/ios/src/UIImage+MGLAdditions.h b/platform/ios/src/UIImage+MGLAdditions.h index 55835c50d..23fac9dbe 100644 --- a/platform/ios/src/UIImage+MGLAdditions.h +++ b/platform/ios/src/UIImage+MGLAdditions.h @@ -1,6 +1,6 @@ #import -#import +#import "MGLTypes.h" #include diff --git a/platform/macos/src/MGLAnnotationImage_Private.h b/platform/macos/src/MGLAnnotationImage_Private.h index 21963a86a..428f1db5d 100644 --- a/platform/macos/src/MGLAnnotationImage_Private.h +++ b/platform/macos/src/MGLAnnotationImage_Private.h @@ -1,4 +1,4 @@ -#import +#import "Mapbox.h" @interface MGLAnnotationImage (Private)