Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Update compile flags for iOS #7131

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion platform/darwin/src/MGLAccountManager.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#import <Foundation/Foundation.h>
#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

/**
The MGLAccountManager object provides a global way to set a Mapbox API access
token.
*/
MGL_EXTERN
@interface MGLAccountManager : NSObject

#pragma mark Authorizing Access
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLBackgroundStyleLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
`style` and obtain the background layer using the `-[MGLStyle layerWithIdentifier:]`
method and passing `background` for the identifier.
*/
MGL_EXTERN
@interface MGLBackgroundStyleLayer : MGLStyleLayer

- (instancetype)initWithIdentifier:(NSString *)identifier NS_DESIGNATED_INITIALIZER;
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLCircleStyleLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ typedef NS_ENUM(NSUInteger, MGLCirclePitchScale) {
`MGLMapView` for its `style` and obtain existing layers using the
`-[MGLStyle layerWithIdentifier:]` method.
*/
MGL_EXTERN
@interface MGLCircleStyleLayer : MGLVectorStyleLayer

#pragma mark - Accessing the Paint Attributes
Expand Down
4 changes: 3 additions & 1 deletion platform/darwin/src/MGLClockDirectionFormatter.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#import <Foundation/Foundation.h>
#import <CoreLocation/CoreLocation.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

/**
Expand All @@ -14,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
irrespective of the user’s orientation, use `MGLCompassDirectionFormatter`
instead.
*/
MGL_EXTERN
@interface MGLClockDirectionFormatter : NSFormatter

/**
Expand Down
4 changes: 3 additions & 1 deletion platform/darwin/src/MGLCompassDirectionFormatter.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#import <Foundation/Foundation.h>
#import <CoreLocation/CoreLocation.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

/**
Expand All @@ -12,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
irrespective of the user’s current location. To format a direction relative to
the user’s current location, use `MGLClockDirectionFormatter` instead.
*/
MGL_EXTERN
@interface MGLCompassDirectionFormatter : NSFormatter

/**
Expand Down
4 changes: 3 additions & 1 deletion platform/darwin/src/MGLCoordinateFormatter.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#import <Foundation/Foundation.h>
#import <CoreLocation/CoreLocation.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

/**
The `MGLCoordinateFormatter` class provides properly formatted descriptions of
geographic coordinate pairs. Use this class to create localized coordinate
strings when displaying location information to users.
*/
MGL_EXTERN
@interface MGLCoordinateFormatter : NSFormatter

/**
Expand Down
7 changes: 7 additions & 0 deletions platform/darwin/src/MGLFeature.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,48 +117,55 @@ NS_ASSUME_NONNULL_BEGIN
The `MGLPointFeature` class represents a point in a
<a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources">tile source</a>.
*/
MGL_EXTERN
@interface MGLPointFeature : MGLPointAnnotation <MGLFeature>
@end

/**
The `MGLPolylineFeature` class represents a polyline in a
<a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources">tile source</a>.
*/
MGL_EXTERN
@interface MGLPolylineFeature : MGLPolyline <MGLFeature>
@end

/**
The `MGLPolygonFeature` class represents a polygon in a
<a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources">tile source</a>.
*/
MGL_EXTERN
@interface MGLPolygonFeature : MGLPolygon <MGLFeature>
@end

/**
The `MGLPointCollectionFeature` class represents a multipoint in a
<a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources">tile source</a>.
*/
MGL_EXTERN
@interface MGLPointCollectionFeature : MGLPointCollection <MGLFeature>
@end

/**
The `MGLMultiPolylineFeature` class represents a multipolyline in a
<a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources">tile source</a>.
*/
MGL_EXTERN
@interface MGLMultiPolylineFeature : MGLMultiPolyline <MGLFeature>
@end

/**
The `MGLMultiPolygonFeature` class represents a multipolygon in a
<a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources">tile source</a>.
*/
MGL_EXTERN
@interface MGLMultiPolygonFeature : MGLMultiPolygon <MGLFeature>
@end

/**
The `MGLShapeCollectionFeature` class represents a shape collection in a
<a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources">tile source</a>.
*/
MGL_EXTERN
@interface MGLShapeCollectionFeature : MGLShapeCollection <MGLFeature>

@property (nonatomic, copy, readonly) NS_ARRAY_OF(MGLShape<MGLFeature> *) *shapes;
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLFillStyleLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ typedef NS_ENUM(NSUInteger, MGLFillTranslateAnchor) {
`MGLMapView` for its `style` and obtain existing layers using the
`-[MGLStyle layerWithIdentifier:]` method.
*/
MGL_EXTERN
@interface MGLFillStyleLayer : MGLVectorStyleLayer

#pragma mark - Accessing the Paint Attributes
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLForegroundStyleLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
subclasses of this class. Instead, create instances of `MGLRasterStyleLayer`
and the concrete subclasses of `MGLVectorStyleLayer`.
*/
MGL_EXTERN
@interface MGLForegroundStyleLayer : MGLStyleLayer

#pragma mark Initializing a Style Layer
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLGeoJSONSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationToleranc
@see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources-geojson">The
style specification.</a>
*/
MGL_EXTERN
@interface MGLGeoJSONSource : MGLSource

#pragma mark Initializing a Source
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLLineStyleLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ typedef NS_ENUM(NSUInteger, MGLLineTranslateAnchor) {
`MGLMapView` for its `style` and obtain existing layers using the
`-[MGLStyle layerWithIdentifier:]` method.
*/
MGL_EXTERN
@interface MGLLineStyleLayer : MGLVectorStyleLayer

#pragma mark - Accessing the Layout Attributes
Expand Down
4 changes: 3 additions & 1 deletion platform/darwin/src/MGLMapCamera.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#import <Foundation/Foundation.h>
#import <CoreGraphics/CoreGraphics.h>
#import <CoreLocation/CoreLocation.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

/**
An `MGLMapCamera` object represents a viewpoint from which the user observes
some point on an `MGLMapView`.
*/
MGL_EXTERN
@interface MGLMapCamera : NSObject <NSSecureCoding, NSCopying>

/** Coordinate at the center of the map view. */
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLMultiPoint.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
class to access information about the specific points associated with the line
or polygon.
*/
MGL_EXTERN
@interface MGLMultiPoint : MGLShape

/**
Expand Down
3 changes: 2 additions & 1 deletion platform/darwin/src/MGLNetworkConfiguration.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#import <Foundation/Foundation.h>
#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN

Expand All @@ -10,6 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
by any applications via the `MGLMapboxAPIBaseURL` dictionary key in the
application's `Info.plist`.
*/
MGL_EXTERN
@interface MGLNetworkConfiguration : NSObject

/// Returns the shared instance of the `MGLNetworkConfiguration` class.
Expand Down
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLOfflinePack.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#import <Foundation/Foundation.h>

#import "MGLTypes.h"
#import "MGLOfflineRegion.h"

NS_ASSUME_NONNULL_BEGIN
Expand Down Expand Up @@ -100,6 +99,7 @@ typedef struct MGLOfflinePackProgress {
`+[MGLOfflineStorage addPackForRegion:withContext:completionHandler:]` method.
A pack created using `-[MGLOfflinePack init]` is immediately invalid.
*/
MGL_EXTERN
@interface MGLOfflinePack : NSObject

/**
Expand Down
25 changes: 12 additions & 13 deletions platform/darwin/src/MGLOfflineStorage.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#import <Foundation/Foundation.h>

#import "MGLTypes.h"

NS_ASSUME_NONNULL_BEGIN
Expand All @@ -24,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
alternatively observe KVO change notifications to the pack’s `progress` key
path.
*/
extern const NSNotificationName MGLOfflinePackProgressChangedNotification;
MGL_EXTERN const NSNotificationName MGLOfflinePackProgressChangedNotification;

/**
Posted by the shared `MGLOfflineStorage` object whenever an `MGLOfflinePack`
Expand All @@ -37,7 +35,7 @@ extern const NSNotificationName MGLOfflinePackProgressChangedNotification;
`userInfo` dictionary contains the error object in the
`MGLOfflinePackErrorUserInfoKey` key.
*/
extern const NSNotificationName MGLOfflinePackErrorNotification;
MGL_EXTERN const NSNotificationName MGLOfflinePackErrorNotification;

/**
Posted by the shared `MGLOfflineStorage` object when the maximum number of
Expand All @@ -52,7 +50,7 @@ extern const NSNotificationName MGLOfflinePackErrorNotification;
calling the `-[MGLOfflineStorage removePack:withCompletionHandler:]` method.
Contact your Mapbox sales representative to have the limit raised.
*/
extern const NSNotificationName MGLOfflinePackMaximumMapboxTilesReachedNotification;
MGL_EXTERN const NSNotificationName MGLOfflinePackMaximumMapboxTilesReachedNotification;

/**
A key in the `userInfo` property of a notification posted by `MGLOfflinePack`.
Expand All @@ -65,9 +63,9 @@ typedef NSString *MGLOfflinePackUserInfoKey NS_EXTENSIBLE_STRING_ENUM;
`MGLOfflinePackProgressChangedNotification` notification. Call `-integerValue`
on the object to receive the `MGLOfflinePackState`-typed state.
*/
extern const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyState;
MGL_EXTERN const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyState;

extern NSString * const MGLOfflinePackStateUserInfoKey __attribute__((deprecated("Use MGLOfflinePackUserInfoKeyState")));
MGL_EXTERN NSString * const MGLOfflinePackStateUserInfoKey __attribute__((deprecated("Use MGLOfflinePackUserInfoKeyState")));

/**
The key for an `NSValue` object that indicates an offline pack’s current
Expand All @@ -76,19 +74,19 @@ extern NSString * const MGLOfflinePackStateUserInfoKey __attribute__((deprecated
`-MGLOfflinePackProgressValue` on the object to receive the
`MGLOfflinePackProgress`-typed progress.
*/
extern const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyProgress;
MGL_EXTERN const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyProgress;

extern NSString * const MGLOfflinePackProgressUserInfoKey __attribute__((deprecated("Use MGLOfflinePackUserInfoKeyProgress")));
MGL_EXTERN NSString * const MGLOfflinePackProgressUserInfoKey __attribute__((deprecated("Use MGLOfflinePackUserInfoKeyProgress")));

/**
The key for an `NSError` object that is encountered in the course of
downloading an offline pack. This key is used in the `userInfo` dictionary of
an `MGLOfflinePackErrorNotification` notification. The error’s domain is
`MGLErrorDomain`. See `MGLErrorCode` for possible error codes.
*/
extern const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyError;
MGL_EXTERN const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyError;

extern NSString * const MGLOfflinePackErrorUserInfoKey __attribute__((deprecated("Use MGLOfflinePackUserInfoKeyError")));
MGL_EXTERN NSString * const MGLOfflinePackErrorUserInfoKey __attribute__((deprecated("Use MGLOfflinePackUserInfoKeyError")));

/**
The key for an `NSNumber` object that indicates the maximum number of
Expand All @@ -98,9 +96,9 @@ extern NSString * const MGLOfflinePackErrorUserInfoKey __attribute__((deprecated
`-unsignedLongLongValue` on the object to receive the `uint64_t`-typed tile
limit.
*/
extern const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyMaximumCount;
MGL_EXTERN const MGLOfflinePackUserInfoKey MGLOfflinePackUserInfoKeyMaximumCount;

extern NSString * const MGLOfflinePackMaximumCountUserInfoKey __attribute__((deprecated("Use MGLOfflinePackUserInfoKeyMaximumCount")));
MGL_EXTERN NSString * const MGLOfflinePackMaximumCountUserInfoKey __attribute__((deprecated("Use MGLOfflinePackUserInfoKeyMaximumCount")));

/**
A block to be called once an offline pack has been completely created and
Expand Down Expand Up @@ -135,6 +133,7 @@ typedef void (^MGLOfflinePackRemovalCompletionHandler)(NSError * _Nullable error
fact that offline resources are stored in a database. The shared object
maintains a canonical collection of offline packs in its `packs` property.
*/
MGL_EXTERN
@interface MGLOfflineStorage : NSObject

/**
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLPointAnnotation.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
situations where all you want to do is associate a point on the map with a
title.
*/
MGL_EXTERN
@interface MGLPointAnnotation : MGLShape

/**
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLPointCollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
to the map view's style, the point collection represents as a group of distinct
annotations.
*/
MGL_EXTERN
@interface MGLPointCollection : MGLShape <MGLOverlay>

/**
Expand Down
2 changes: 2 additions & 0 deletions platform/darwin/src/MGLPolygon.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
are provided. The first and last points are connected to each other to create
the closed shape.
*/
MGL_EXTERN
@interface MGLPolygon : MGLMultiPoint <MGLOverlay>

/**
Expand Down Expand Up @@ -64,6 +65,7 @@ NS_ASSUME_NONNULL_BEGIN
@note `MGLMultiPolygon` objects cannot be added to a map view using
`-[MGLMapView addAnnotations:]` and related methods.
*/
MGL_EXTERN
@interface MGLMultiPolygon : MGLShape <MGLOverlay>

/**
Expand Down
2 changes: 2 additions & 0 deletions platform/darwin/src/MGLPolyline.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
the order they are provided. The first and last points are not connected to
each other.
*/
MGL_EXTERN
@interface MGLPolyline : MGLMultiPoint <MGLOverlay>

/**
Expand All @@ -39,6 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
@note `MGLMultiPolyline` objects cannot be added to a map view using
`-[MGLMapView addAnnotations:]` and related methods.
*/
MGL_EXTERN
@interface MGLMultiPolyline : MGLShape <MGLOverlay>

/**
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLRasterSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
@see <a href="https://www.mapbox.com/mapbox-gl-style-spec/#sources-raster">The
style specification.</a>
*/
MGL_EXTERN
@interface MGLRasterSource : MGLSource

#pragma mark Initializing a Source
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLRasterStyleLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
`MGLMapView` for its `style` and obtain existing layers using the
`-[MGLStyle layerWithIdentifier:]` method.
*/
MGL_EXTERN
@interface MGLRasterStyleLayer : MGLForegroundStyleLayer

#pragma mark - Accessing the Paint Attributes
Expand Down
4 changes: 2 additions & 2 deletions platform/darwin/src/MGLShape.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#import <Foundation/Foundation.h>

#import "MGLTypes.h"
#import "MGLAnnotation.h"

NS_ASSUME_NONNULL_BEGIN
Expand All @@ -11,6 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
and providing an appropriate value for the coordinate property inherited from
the `MGLAnnotation` protocol.
*/
MGL_EXTERN
@interface MGLShape : NSObject <MGLAnnotation>

/**
Expand Down
1 change: 1 addition & 0 deletions platform/darwin/src/MGLShapeCollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
@note `MGLShapeCollection` objects cannot be added to a map view using
`-[MGLMapView addAnnotations:]` and related methods.
*/
MGL_EXTERN
@interface MGLShapeCollection : MGLShape

/**
Expand Down
Loading