diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-09-17 22:00:20 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-09-17 22:00:20 +0300 |
| commit | 76417216262699351e8ad53541d820d0f3926190 (patch) | |
| tree | 00bfe303f477c31b027c5b88f44b60f8c8ed3e82 | |
| parent | 0a219d182c422e181b29c9dcc60c18ceafe1db48 (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-revert_ios_nits.tar.gz | |
Revert "[build] Fix iOS nits"upstream/tmpsantos-revert_ios_nits
This reverts commit 1304502f8182573176352bcab167d08963ba4c67.
| -rw-r--r-- | platform/ios/app/MBXOrnamentsViewController.m | 2 | ||||
| -rw-r--r-- | platform/ios/app/MBXViewController.m | 2 | ||||
| -rw-r--r-- | platform/ios/framework/Info.plist | 2 | ||||
| -rw-r--r-- | platform/ios/src/MGLCompassButton.mm | 2 | ||||
| -rw-r--r-- | platform/ios/src/MGLCompassButton_Private.h | 2 | ||||
| -rw-r--r-- | platform/ios/src/MGLScaleBar.mm | 2 | ||||
| -rw-r--r-- | platform/ios/src/UIImage+MGLAdditions.h | 2 | ||||
| -rw-r--r-- | platform/macos/src/MGLAnnotationImage_Private.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/platform/ios/app/MBXOrnamentsViewController.m b/platform/ios/app/MBXOrnamentsViewController.m index 09ae787503..861d5d7678 100644 --- a/platform/ios/app/MBXOrnamentsViewController.m +++ b/platform/ios/app/MBXOrnamentsViewController.m @@ -1,6 +1,6 @@ #import "MBXOrnamentsViewController.h" -#import <Mapbox/Mapbox.h> +@import Mapbox; @interface MBXOrnamentsViewController ()<MGLMapViewDelegate> diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m index 31a2ff1d6d..346a182a88 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 MBXViewController *weakSelf = self; + __weak typeof(self) 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 64bff94b78..d8962c53ab 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> diff --git a/platform/ios/src/MGLCompassButton.mm b/platform/ios/src/MGLCompassButton.mm index 5bbd9bf923..acb25a560c 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 "MGLGeometry.h" +#import <Mapbox/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 9ef55cfa5b..c9741d79e3 100644 --- a/platform/ios/src/MGLCompassButton_Private.h +++ b/platform/ios/src/MGLCompassButton_Private.h @@ -1,6 +1,6 @@ #import <UIKit/UIKit.h> -#import "MGLCompassButton.h" +#import <Mapbox/MGLCompassButton.h> @class MGLMapView; diff --git a/platform/ios/src/MGLScaleBar.mm b/platform/ios/src/MGLScaleBar.mm index 8525881da7..cd8bc1d030 100644 --- a/platform/ios/src/MGLScaleBar.mm +++ b/platform/ios/src/MGLScaleBar.mm @@ -1,4 +1,4 @@ -#import "Mapbox.h" +#import <Mapbox/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 23fac9dbeb..55835c50d6 100644 --- a/platform/ios/src/UIImage+MGLAdditions.h +++ b/platform/ios/src/UIImage+MGLAdditions.h @@ -1,6 +1,6 @@ #import <UIKit/UIKit.h> -#import "MGLTypes.h" +#import <Mapbox/MGLTypes.h> #include <mbgl/style/image.hpp> diff --git a/platform/macos/src/MGLAnnotationImage_Private.h b/platform/macos/src/MGLAnnotationImage_Private.h index 428f1db5d9..21963a86a0 100644 --- a/platform/macos/src/MGLAnnotationImage_Private.h +++ b/platform/macos/src/MGLAnnotationImage_Private.h @@ -1,4 +1,4 @@ -#import "Mapbox.h" +#import <Mapbox/Mapbox.h> @interface MGLAnnotationImage (Private) |