Merge branch 'master' into rclee-async-setupupstream/rclee-async-setup

1 files changed, 7 insertions, 7 deletions

diff --git a/platform/macos/src/MGLMapView+IBAdditions.mm b/platform/macos/src/MGLMapView+IBAdditions.mm
index eada47ef90..cef2863ee6 100644
--- a/platform/macos/src/MGLMapView+IBAdditions.mm
+++ b/platform/macos/src/MGLMapView+IBAdditions.mm
@@ -4,7 +4,7 @@
 
 @implementation MGLMapView (IBAdditions)
 
-+ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingStyleURL__ {
++ (NSSet<NSString *> *)keyPathsForValuesAffectingStyleURL__ {
     return [NSSet setWithObject:@"styleURL"];
 }
 
@@ -23,7 +23,7 @@
     self.styleURL = url;
 }
 
-+ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingLatitude {
++ (NSSet<NSString *> *)keyPathsForValuesAffectingLatitude {
     return [NSSet setWithObjects:@"centerCoordinate", @"camera", nil];
 }
 
@@ -45,7 +45,7 @@
     }
 }
 
-+ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingLongitude {
++ (NSSet<NSString *> *)keyPathsForValuesAffectingLongitude {
     return [NSSet setWithObjects:@"centerCoordinate", @"camera", nil];
 }
 
@@ -67,7 +67,7 @@
     }
 }
 
-+ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingAllowsZooming {
++ (NSSet<NSString *> *)keyPathsForValuesAffectingAllowsZooming {
     return [NSSet setWithObject:@"zoomEnabled"];
 }
 
@@ -79,7 +79,7 @@
     self.zoomEnabled = allowsZooming;
 }
 
-+ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingAllowsScrolling {
++ (NSSet<NSString *> *)keyPathsForValuesAffectingAllowsScrolling {
     return [NSSet setWithObject:@"scrollEnabled"];
 }
 
@@ -91,7 +91,7 @@
     self.scrollEnabled = allowsScrolling;
 }
 
-+ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingAllowsRotating {
++ (NSSet<NSString *> *)keyPathsForValuesAffectingAllowsRotating {
     return [NSSet setWithObject:@"rotateEnabled"];
 }
 
@@ -103,7 +103,7 @@
     self.rotateEnabled = allowsRotating;
 }
 
-+ (NS_SET_OF(NSString *) *)keyPathsForValuesAffectingAllowsTilting {
++ (NSSet<NSString *> *)keyPathsForValuesAffectingAllowsTilting {
     return [NSSet setWithObject:@"pitchEnabled"];
 }