From 211252e38e0dbef22334c783b0455d9d1f0155f1 Mon Sep 17 00:00:00 2001 From: Joshua Quick Date: Wed, 21 Jul 2021 19:28:22 -0700 Subject: [PATCH 1/2] Revert "chore: migrate from MKPinAnnotationView" This reverts commit 230150be31852e9dbb6a0e82ba5a3511f16b2f1c. --- ios/Classes/TiMapAnnotationProxy.h | 1 + ios/Classes/TiMapAnnotationProxy.m | 47 ++++++++++++++++++++++++++++ ios/Classes/TiMapPinAnnotationView.h | 2 +- ios/Classes/TiMapView.m | 19 ++++++++--- 4 files changed, 63 insertions(+), 6 deletions(-) diff --git a/ios/Classes/TiMapAnnotationProxy.h b/ios/Classes/TiMapAnnotationProxy.h index 83df458f..6054f5ea 100644 --- a/ios/Classes/TiMapAnnotationProxy.h +++ b/ios/Classes/TiMapAnnotationProxy.h @@ -33,6 +33,7 @@ - (NSString *)title; - (NSString *)subtitle; - (id)pincolor; +- (id)nativePinColor; - (BOOL)animatesDrop; - (void)setHidden:(id)value; - (UIView *)leftViewAccessory; diff --git a/ios/Classes/TiMapAnnotationProxy.m b/ios/Classes/TiMapAnnotationProxy.m index 9db1c54d..132531d1 100644 --- a/ios/Classes/TiMapAnnotationProxy.m +++ b/ios/Classes/TiMapAnnotationProxy.m @@ -236,6 +236,53 @@ - (void)setPincolor:(id)color } } +// Mapping both string-colors, color constant and native colors to a pin color +// This is overcomplicated to maintain iOS < 9 compatibility. Remove this when +// we have a minimum iOS verion of 9.0+ +- (id)nativePinColor +{ + id current = [self valueForUndefinedKey:@"pincolor"]; + + if ([current isKindOfClass:[NSString class]]) { + return [[TiUtils colorValue:current] color]; + } + + switch ([TiUtils intValue:current def:TiMapAnnotationPinColorRed]) { + case TiMapAnnotationPinColorGreen: { +#ifdef __IPHONE_9_0 + return [MKPinAnnotationView greenPinColor]; +#else + return MKPinAnnotationColorGreen; +#endif + } + case TiMapAnnotationPinColorPurple: { + return [MKPinAnnotationView purplePinColor]; + } + case TiMapAnnotationPinColorBlue: + return [UIColor blueColor]; + case TiMapAnnotationPinColorCyan: + return [UIColor cyanColor]; + case TiMapAnnotationPinColorMagenta: + return [UIColor magentaColor]; + case TiMapAnnotationPinColorOrange: + return [UIColor orangeColor]; + case TiMapAnnotationPinColorYellow: + return [UIColor yellowColor]; + + // UIColor extensions + case TiMapAnnotationPinColorAzure: + return [UIColor azureColor]; + case TiMapAnnotationPinColorRose: + return [UIColor roseColor]; + case TiMapAnnotationPinColorViolet: + return [UIColor violetColor]; + case TiMapAnnotationPinColorRed: + default: { + return [MKPinAnnotationView redPinColor]; + } + } +} + - (BOOL)animatesDrop { return [TiUtils boolValue:[self valueForUndefinedKey:@"animate"]]; diff --git a/ios/Classes/TiMapPinAnnotationView.h b/ios/Classes/TiMapPinAnnotationView.h index f918c12e..7411cb52 100644 --- a/ios/Classes/TiMapPinAnnotationView.h +++ b/ios/Classes/TiMapPinAnnotationView.h @@ -9,7 +9,7 @@ #import "TiMapView.h" #import -@interface TiMapPinAnnotationView : MKMarkerAnnotationView { +@interface TiMapPinAnnotationView : MKPinAnnotationView { @private NSString *lastHitName; diff --git a/ios/Classes/TiMapView.m b/ios/Classes/TiMapView.m index 9d3d2e0b..2217d7ec 100644 --- a/ios/Classes/TiMapView.m +++ b/ios/Classes/TiMapView.m @@ -1128,7 +1128,7 @@ - (void)mapView:(MKMapView *)mapView didDeselectAnnotationView:(MKAnnotationView - (void)mapView:(MKMapView *)mapView annotationView:(MKAnnotationView *)aview calloutAccessoryControlTapped:(UIControl *)control { if ([aview conformsToProtocol:@protocol(TiMapAnnotation)]) { - MKMarkerAnnotationView *pinview = (MKMarkerAnnotationView *)aview; + MKPinAnnotationView *pinview = (MKPinAnnotationView *)aview; NSString *clickSource = @"unknown"; if (aview.leftCalloutAccessoryView == control) { clickSource = @"leftButton"; @@ -1153,9 +1153,11 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap if (customView == nil && !marker) { id imagePath = [ann valueForUndefinedKey:@"image"]; image = [TiUtils image:imagePath proxy:ann]; - identifier = (image != nil) ? @"timap-image" : @"timap-marker"; + identifier = (image != nil) ? @"timap-image" : @"timap-pin"; } else if (customView) { identifier = @"timap-customView"; + } else { + identifier = @"timap-marker"; } MKAnnotationView *annView = nil; annView = (MKAnnotationView *)[mapView dequeueReusableAnnotationViewWithIdentifier:identifier]; @@ -1163,17 +1165,19 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap if (annView == nil) { if ([identifier isEqualToString:@"timap-customView"]) { annView = [[[TiMapCustomAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self] autorelease]; + } else if ([identifier isEqualToString:@"timap-marker"]) { + annView = [[[TiMapMarkerAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self] autorelease]; } else if ([identifier isEqualToString:@"timap-image"]) { annView = [[[TiMapImageAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self image:image] autorelease]; } else { - annView = [[[TiMapMarkerAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self] autorelease]; + annView = [[[TiMapPinAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self] autorelease]; } } if ([identifier isEqualToString:@"timap-customView"]) { [((TiMapCustomAnnotationView *)annView) setProxy:customView]; } else if ([identifier isEqualToString:@"timap-image"]) { annView.image = image; - } else { + } else if ([identifier isEqualToString:@"timap-marker"]) { MKMarkerAnnotationView *markerView = (MKMarkerAnnotationView *)annView; markerView.markerTintColor = [[TiUtils colorValue:[ann valueForUndefinedKey:@"markerColor"]] color]; markerView.glyphText = [ann valueForUndefinedKey:@"markerGlyphText"]; @@ -1183,8 +1187,13 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap markerView.selectedGlyphImage = [TiUtils image:[ann valueForUndefinedKey:@"markerSelectedGlyphImage"] proxy:ann]; markerView.titleVisibility = [TiUtils intValue:[ann valueForUndefinedKey:@"markerTitleVisibility"]]; markerView.subtitleVisibility = [TiUtils intValue:[ann valueForUndefinedKey:@"markerSubtitleVisibility"]]; - } + } else { + MKPinAnnotationView *pinview = (MKPinAnnotationView *)annView; + pinview.pinTintColor = [ann nativePinColor]; + pinview.animatesDrop = [ann animatesDrop] && ![ann placed]; + annView.calloutOffset = CGPointMake(-8, 0); + } annView.canShowCallout = [TiUtils boolValue:[ann valueForUndefinedKey:@"canShowCallout"] def:YES]; annView.enabled = YES; annView.centerOffset = ann.offset; From f5fa7cd96d4d18cc5029778bb094777d817820c1 Mon Sep 17 00:00:00 2001 From: Joshua Quick Date: Wed, 21 Jul 2021 19:49:48 -0700 Subject: [PATCH 2/2] fix(ios): include missing i386 and armv7 architectures Fixes TIMOB-28509 --- ios/Classes/TiMapAnnotationProxy.m | 6 ++---- ios/Classes/TiMapMarkerAnnotationView.h | 2 ++ ios/Classes/TiMapMarkerAnnotationView.m | 2 ++ ios/Classes/TiMapModule.h | 4 ++-- ios/Classes/TiMapModule.m | 11 ++++------ ios/Classes/TiMapView.h | 6 +++++- ios/Classes/TiMapView.m | 28 +++++++++++++++++++------ ios/Classes/TiMapViewProxy.h | 2 ++ ios/Classes/TiMapViewProxy.m | 2 ++ ios/TiMap_Prefix.pch | 6 ++++++ ios/manifest | 4 ++-- ios/map.xcodeproj/project.pbxproj | 6 +++--- package-lock.json | 4 ++-- package.json | 2 +- 14 files changed, 57 insertions(+), 28 deletions(-) diff --git a/ios/Classes/TiMapAnnotationProxy.m b/ios/Classes/TiMapAnnotationProxy.m index 132531d1..2c85f21e 100644 --- a/ios/Classes/TiMapAnnotationProxy.m +++ b/ios/Classes/TiMapAnnotationProxy.m @@ -249,11 +249,7 @@ - (id)nativePinColor switch ([TiUtils intValue:current def:TiMapAnnotationPinColorRed]) { case TiMapAnnotationPinColorGreen: { -#ifdef __IPHONE_9_0 return [MKPinAnnotationView greenPinColor]; -#else - return MKPinAnnotationColorGreen; -#endif } case TiMapAnnotationPinColorPurple: { return [MKPinAnnotationView purplePinColor]; @@ -489,6 +485,7 @@ - (void)setAnnotationDisplayPriority:(id)displayPriority } } +#if IS_IOS_11 - (void)setClusterIdentifier:(id)clusterIdentifier { id current = [self valueForUndefinedKey:@"clusterIdentifier"]; @@ -497,6 +494,7 @@ - (void)setClusterIdentifier:(id)clusterIdentifier [self setNeedsRefreshingWithSelection:YES]; } } +#endif - (void)setCustomView:(id)customView { diff --git a/ios/Classes/TiMapMarkerAnnotationView.h b/ios/Classes/TiMapMarkerAnnotationView.h index e3b5fa06..79961cf9 100644 --- a/ios/Classes/TiMapMarkerAnnotationView.h +++ b/ios/Classes/TiMapMarkerAnnotationView.h @@ -4,6 +4,7 @@ * Licensed under the terms of the Apache Public License * Please see the LICENSE included with this distribution for details. */ +#if IS_IOS_11 #import "TiBase.h" #import "TiMapView.h" #import @@ -17,3 +18,4 @@ - (NSString *)lastHitName; @end +#endif diff --git a/ios/Classes/TiMapMarkerAnnotationView.m b/ios/Classes/TiMapMarkerAnnotationView.m index e7d52de6..191aaa07 100644 --- a/ios/Classes/TiMapMarkerAnnotationView.m +++ b/ios/Classes/TiMapMarkerAnnotationView.m @@ -4,6 +4,7 @@ * Licensed under the terms of the Apache Public License * Please see the LICENSE included with this distribution for details. */ +#if IS_IOS_11 #import "TiMapMarkerAnnotationView.h" #import "TiMapAnnotationProxy.h" #import "TiMapView.h" @@ -63,3 +64,4 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event return result; } @end +#endif diff --git a/ios/Classes/TiMapModule.h b/ios/Classes/TiMapModule.h index 928252c0..4cfe8b74 100644 --- a/ios/Classes/TiMapModule.h +++ b/ios/Classes/TiMapModule.h @@ -11,15 +11,15 @@ UIColor *colorRed; } -+ (void)logAddedIniOS7Warning:(NSString *)name; - @property (nonatomic, readonly) NSNumber *STANDARD_TYPE; @property (nonatomic, readonly) NSNumber *NORMAL_TYPE; // For parity with Android @property (nonatomic, readonly) NSNumber *SATELLITE_TYPE; @property (nonatomic, readonly) NSNumber *HYBRID_TYPE; @property (nonatomic, readonly) NSNumber *HYBRID_FLYOVER_TYPE; @property (nonatomic, readonly) NSNumber *SATELLITE_FLYOVER_TYPE; +#if IS_IOS_11 @property (nonatomic, readonly) NSNumber *MUTED_STANDARD_TYPE; +#endif @property (nonatomic, readonly) NSNumber *ANNOTATION_RED; @property (nonatomic, readonly) NSNumber *ANNOTATION_GREEN; diff --git a/ios/Classes/TiMapModule.m b/ios/Classes/TiMapModule.m index dceb4910..215ec7f9 100644 --- a/ios/Classes/TiMapModule.m +++ b/ios/Classes/TiMapModule.m @@ -32,13 +32,6 @@ - (NSString *)apiName return @"Ti.Map"; } -#pragma mark Utils - -+ (void)logAddedIniOS7Warning:(NSString *)name -{ - NSLog(@"[WARN] `%@` is only supported on iOS 7 and greater.", name); -} - #pragma mark Public APIs - (TiMapViewProxy *)createView:(id)args @@ -57,7 +50,9 @@ - (TiMapCameraProxy *)createCamera:(id)args MAKE_SYSTEM_PROP(HYBRID_TYPE, MKMapTypeHybrid); MAKE_SYSTEM_PROP(HYBRID_FLYOVER_TYPE, MKMapTypeHybridFlyover); MAKE_SYSTEM_PROP(SATELLITE_FLYOVER_TYPE, MKMapTypeSatelliteFlyover); +#if IS_IOS_11 MAKE_SYSTEM_PROP(MUTED_STANDARD_TYPE, MKMapTypeMutedStandard); +#endif MAKE_SYSTEM_PROP(ANNOTATION_RED, TiMapAnnotationPinColorRed); MAKE_SYSTEM_PROP(ANNOTATION_GREEN, TiMapAnnotationPinColorGreen); MAKE_SYSTEM_PROP(ANNOTATION_PURPLE, TiMapAnnotationPinColorPurple); @@ -82,6 +77,7 @@ - (TiMapCameraProxy *)createCamera:(id)args MAKE_SYSTEM_PROP(POLYLINE_PATTERN_DASHED, TiMapOverlyPatternTypeDashed); MAKE_SYSTEM_PROP(POLYLINE_PATTERN_DOTTED, TiMapOverlyPatternTypeDotted); +#if IS_IOS_11 MAKE_SYSTEM_PROP(FEATURE_VISIBILITY_ADAPTIVE, MKFeatureVisibilityAdaptive); MAKE_SYSTEM_PROP(FEATURE_VISIBILITY_HIDDEN, MKFeatureVisibilityHidden); MAKE_SYSTEM_PROP(FEATURE_VISIBILITY_VISIBLE, MKFeatureVisibilityVisible); @@ -92,5 +88,6 @@ - (TiMapCameraProxy *)createCamera:(id)args MAKE_SYSTEM_PROP_DBL(FEATURE_DISPLAY_PRIORITY_REQUIRED, MKFeatureDisplayPriorityRequired); MAKE_SYSTEM_PROP_DBL(FEATURE_DISPLAY_PRIORITY_DEFAULT_HIGH, MKFeatureDisplayPriorityDefaultHigh); MAKE_SYSTEM_PROP_DBL(FEATURE_DISPLAY_PRIORITY_DEFAULT_LOW, MKFeatureDisplayPriorityDefaultLow); +#endif @end diff --git a/ios/Classes/TiMapView.h b/ios/Classes/TiMapView.h index 6237c4c0..deff37fe 100644 --- a/ios/Classes/TiMapView.h +++ b/ios/Classes/TiMapView.h @@ -32,8 +32,10 @@ NSMutableArray *circleProxies; NSMutableArray *polylineProxies; NSMutableArray *imageOverlayProxies; - NSMutableDictionary *clusterAnnotations; +#if IS_IOS_11 + NSMutableDictionary *clusterAnnotations; +#endif //selected annotation MKAnnotationView *selectedAnnotation; @@ -93,7 +95,9 @@ - (void)removeAllImageOverlays; - (void)firePinChangeDragState:(MKAnnotationView *)pinview newState:(MKAnnotationViewDragState)newState fromOldState:(MKAnnotationViewDragState)oldState; +#if IS_IOS_11 - (void)setClusterAnnotation:(TiMapAnnotationProxy *)annotation forMembers:(NSArray *)members; +#endif - (void)animateAnnotation:(TiMapAnnotationProxy *)newAnnotation withLocation:(CLLocationCoordinate2D)newLocation; #pragma mark Utils diff --git a/ios/Classes/TiMapView.m b/ios/Classes/TiMapView.m index 2217d7ec..f22a1d38 100644 --- a/ios/Classes/TiMapView.m +++ b/ios/Classes/TiMapView.m @@ -46,7 +46,9 @@ - (void)dealloc RELEASE_TO_NIL(polylineProxies); RELEASE_TO_NIL(circleProxies); RELEASE_TO_NIL(imageOverlayProxies); +#if IS_IOS_11 RELEASE_TO_NIL(clusterAnnotations); +#endif [super dealloc]; } @@ -917,6 +919,7 @@ - (void)showAnnotations:(id)args NO); } +#if IS_IOS_11 - (void)setClusterAnnotation:(TiMapAnnotationProxy *)annotation forMembers:(NSArray *)members { if (!clusterAnnotations) { @@ -935,6 +938,7 @@ - (TiMapAnnotationProxy *)clusterAnnotationProxyForMembers:(NSArray *)members { return [clusterAnnotations objectForKey:members]; } +#endif #pragma mark Utils @@ -1165,8 +1169,10 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap if (annView == nil) { if ([identifier isEqualToString:@"timap-customView"]) { annView = [[[TiMapCustomAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self] autorelease]; - } else if ([identifier isEqualToString:@"timap-marker"]) { +#if IS_IOS_11 + } else if ([TiMapView isiOS11OrGreater] && [identifier isEqualToString:@"timap-marker"]) { annView = [[[TiMapMarkerAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self] autorelease]; +#endif } else if ([identifier isEqualToString:@"timap-image"]) { annView = [[[TiMapImageAnnotationView alloc] initWithAnnotation:ann reuseIdentifier:identifier map:self image:image] autorelease]; } else { @@ -1177,7 +1183,8 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap [((TiMapCustomAnnotationView *)annView) setProxy:customView]; } else if ([identifier isEqualToString:@"timap-image"]) { annView.image = image; - } else if ([identifier isEqualToString:@"timap-marker"]) { +#if IS_IOS_11 + } else if ([TiMapView isiOS11OrGreater] && [identifier isEqualToString:@"timap-marker"]) { MKMarkerAnnotationView *markerView = (MKMarkerAnnotationView *)annView; markerView.markerTintColor = [[TiUtils colorValue:[ann valueForUndefinedKey:@"markerColor"]] color]; markerView.glyphText = [ann valueForUndefinedKey:@"markerGlyphText"]; @@ -1187,6 +1194,7 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap markerView.selectedGlyphImage = [TiUtils image:[ann valueForUndefinedKey:@"markerSelectedGlyphImage"] proxy:ann]; markerView.titleVisibility = [TiUtils intValue:[ann valueForUndefinedKey:@"markerTitleVisibility"]]; markerView.subtitleVisibility = [TiUtils intValue:[ann valueForUndefinedKey:@"markerSubtitleVisibility"]]; +#endif } else { MKPinAnnotationView *pinview = (MKPinAnnotationView *)annView; @@ -1197,9 +1205,13 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotationProxy:(TiMap annView.canShowCallout = [TiUtils boolValue:[ann valueForUndefinedKey:@"canShowCallout"] def:YES]; annView.enabled = YES; annView.centerOffset = ann.offset; - annView.clusteringIdentifier = [ann valueForUndefinedKey:@"clusterIdentifier"]; - annView.collisionMode = [TiUtils intValue:[ann valueForUndefinedKey:@"collisionMode"]]; - annView.displayPriority = [TiUtils floatValue:[ann valueForUndefinedKey:@"annotationDisplayPriority"] def:1000]; +#if IS_IOS_11 + if ([TiMapView isiOS11OrGreater]) { + annView.clusteringIdentifier = [ann valueForUndefinedKey:@"clusterIdentifier"]; + annView.collisionMode = [TiUtils intValue:[ann valueForUndefinedKey:@"collisionMode"]]; + annView.displayPriority = [TiUtils floatValue:[ann valueForUndefinedKey:@"annotationDisplayPriority"] def:1000]; + } +#endif UIView *left = [ann leftViewAccessory]; UIView *right = [ann rightViewAccessory]; @@ -1257,7 +1269,8 @@ - (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id> *)memberAnnotations { MKClusterAnnotation *annotation = [[MKClusterAnnotation alloc] initWithMemberAnnotations:memberAnnotations]; @@ -1282,6 +1297,7 @@ - (MKClusterAnnotation *)mapView:(MKMapView *)mapView clusterAnnotationForMember } return annotation; } +#endif // mapView:didAddAnnotationViews: is called after the annotation views have been added and positioned in the map. // The delegate can implement this method to animate the adding of the annotations views. diff --git a/ios/Classes/TiMapViewProxy.h b/ios/Classes/TiMapViewProxy.h index 49f5a221..52e4002b 100644 --- a/ios/Classes/TiMapViewProxy.h +++ b/ios/Classes/TiMapViewProxy.h @@ -64,5 +64,7 @@ - (void)removeImageOverlay:(id)arg; - (void)removeAllImageOverlays:(id)args; +#if IS_IOS_11 - (void)setClusterAnnotation:(id)args; +#endif @end diff --git a/ios/Classes/TiMapViewProxy.m b/ios/Classes/TiMapViewProxy.m index f7aca17f..ee4abbdf 100644 --- a/ios/Classes/TiMapViewProxy.m +++ b/ios/Classes/TiMapViewProxy.m @@ -864,6 +864,7 @@ - (void)setImageOverlays:(id)args } } +#if IS_IOS_11 - (void)setClusterAnnotation:(id)args { ENSURE_DICT(args); @@ -876,6 +877,7 @@ - (void)setClusterAnnotation:(id)args [(TiMapView *)[self view] setClusterAnnotation:annotationProxy forMembers:memberAnnotations]; } } +#endif #pragma mark Public APIs iOS 7 diff --git a/ios/TiMap_Prefix.pch b/ios/TiMap_Prefix.pch index 8bec24fa..b2bc9956 100644 --- a/ios/TiMap_Prefix.pch +++ b/ios/TiMap_Prefix.pch @@ -2,3 +2,9 @@ #ifdef __OBJC__ #import #endif + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 +#define IS_IOS_11 true +#else +#define IS_IOS_11 false +#endif diff --git a/ios/manifest b/ios/manifest index 741581a4..e8bdcf2f 100644 --- a/ios/manifest +++ b/ios/manifest @@ -3,9 +3,9 @@ # during compilation, packaging, distribution, etc. # -version: 5.1.0 +version: 5.1.1 apiversion: 2 -architectures: arm64 x86_64 +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 diff --git a/ios/map.xcodeproj/project.pbxproj b/ios/map.xcodeproj/project.pbxproj index 1e56d0d2..9123bef4 100644 --- a/ios/map.xcodeproj/project.pbxproj +++ b/ios/map.xcodeproj/project.pbxproj @@ -519,7 +519,7 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; @@ -555,7 +555,7 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-DDEBUG", @@ -595,7 +595,7 @@ GCC_WARN_UNUSED_VALUE = NO; GCC_WARN_UNUSED_VARIABLE = NO; INSTALL_PATH = /usr/local/lib; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; OTHER_CFLAGS = "-DTI_POST_1_2"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = TiMap; diff --git a/package-lock.json b/package-lock.json index 4ca3b8bd..a9898cac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@titanium-sdk/ti.map", - "version": "7.0.2", + "version": "7.0.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@titanium-sdk/ti.map", - "version": "7.0.2", + "version": "7.0.3", "hasInstallScript": true, "devDependencies": { "@commitlint/cli": "^12.0.0", diff --git a/package.json b/package.json index a08841db..568b951b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@titanium-sdk/ti.map", - "version": "7.0.2", + "version": "7.0.3", "description": "Provides Map UI elements for Titanium applications", "scripts": { "commit": "git-cz",