Bump to 3.0.0, fix include-error

tidev · Oct 2, 2017 · bbd65d2 · bbd65d2
1 parent 2220444
commit bbd65d2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/ios/Classes/TiMapModule.h b/ios/Classes/TiMapModule.h
@@ -7,17 +7,6 @@
 
 #import "TiModule.h"
 
-#define MAKE_IOS7_SYSTEM_PROP(name, map)                                            \
-  -(NSNumber *)name                                                                 \
-  {                                                                                 \
-    if (![TiUtils isIOS7OrGreater]) {                                               \
-      const char *propName = #name;                                                 \
-      [TiMapModule logAddedIniOS7Warning:[NSString stringWithUTF8String:propName]]; \
-      return nil;                                                                   \
-    }                                                                               \
-    return [NSNumber numberWithInt:map];                                            \
-  }
-
 @interface TiMapModule : TiModule {
   UIColor *colorRed;
 }

diff --git a/ios/Classes/TiMapModule.m b/ios/Classes/TiMapModule.m
@@ -86,8 +86,8 @@ - (TiMapCameraProxy *)createCamera:(id)args
 MAKE_SYSTEM_PROP(ANNOTATION_DRAG_STATE_CANCEL, MKAnnotationViewDragStateCanceling);
 MAKE_SYSTEM_PROP(ANNOTATION_DRAG_STATE_END, MKAnnotationViewDragStateEnding);
 
-MAKE_IOS7_SYSTEM_PROP(OVERLAY_LEVEL_ABOVE_LABELS, MKOverlayLevelAboveLabels);
-MAKE_IOS7_SYSTEM_PROP(OVERLAY_LEVEL_ABOVE_ROADS, MKOverlayLevelAboveRoads);
+MAKE_SYSTEM_PROP(OVERLAY_LEVEL_ABOVE_LABELS, MKOverlayLevelAboveLabels);
+MAKE_SYSTEM_PROP(OVERLAY_LEVEL_ABOVE_ROADS, MKOverlayLevelAboveRoads);
 
 MAKE_SYSTEM_PROP(POLYLINE_PATTERN_DASHED, TiMapOverlyPatternTypeDashed);
 MAKE_SYSTEM_PROP(POLYLINE_PATTERN_DOTTED, TiMapOverlyPatternTypeDotted);

diff --git a/ios/Classes/TiMapRouteProxy.h b/ios/Classes/TiMapRouteProxy.h
@@ -6,6 +6,8 @@
  */
 
 #import "TiMKOverlayPathUniversal.h"
+#import "TiProxy.h"
+#import "TiUtils.h"
 #import <MapKit/MapKit.h>
 
 @interface TiMapRouteProxy : TiProxy {

diff --git a/ios/manifest b/ios/manifest
@@ -2,17 +2,17 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.13.0
+version: 3.0.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: External version of Map module
 author: Jeff Haynie, Jon Alter, Pedro Enrique, Hans Knöchel, Vijay Singh
 license: Apache Public License v2
-copyright: Copyright (c) 2013-Present by Axway Appcelerator
+copyright: Copyright (c) 2013-present by Axway Appcelerator
 
 # these should not be edited
 name: map
 moduleid: ti.map
 guid: fee93b77-8eb3-418c-8f04-013664c4af83
 platform: iphone
-minsdk: 5.5.1
+minsdk: 6.2.2.GA