尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Justin R. Miller
Commit 4bca0cb8bc3bf631f7124ebeb4f035c2d4e6543f 1 parent 20869b0e

basic iOS 7/Xcode 5 fixes & settings

Inline Side-by-side
Showing 3 changed files with 21 additions and 4 deletions
@@ -34,6 +34,14 @@ @@ -34,6 +34,14 @@
34 #import "RMMapLayer.h" 34 #import "RMMapLayer.h"
35 #import "RMQuadTree.h" 35 #import "RMQuadTree.h"
36 36
  37 +@interface RMQuadTreeNode (RMAnnotation)
  38 +
  39 +- (void)annotationDidChangeBoundingBox:(RMAnnotation *)annotation;
  40 +
  41 +@end
  42 +
  43 +#pragma mark -
  44 +
37 @implementation RMAnnotation 45 @implementation RMAnnotation
38 46
39 @synthesize coordinate; 47 @synthesize coordinate;
@@ -241,7 +241,7 @@ @@ -241,7 +241,7 @@
241 [aLabel setFont:font]; 241 [aLabel setFont:font];
242 #pragma clang diagnostic push 242 #pragma clang diagnostic push
243 #pragma clang diagnostic ignored "-Wdeprecated-declarations" 243 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
244 - [aLabel setTextAlignment:UITextAlignmentCenter]; 244 + [aLabel setTextAlignment:NSTextAlignmentCenter];
245 #pragma clang diagnostic pop 245 #pragma clang diagnostic pop
246 [aLabel setText:text]; 246 [aLabel setText:text];
247 247
@@ -774,7 +774,7 @@ @@ -774,7 +774,7 @@
774 29B97313FDCFA39411CA2CEA /* Project object */ = { 774 29B97313FDCFA39411CA2CEA /* Project object */ = {
775 isa = PBXProject; 775 isa = PBXProject;
776 attributes = { 776 attributes = {
777 - LastUpgradeCheck = 0460; 777 + LastUpgradeCheck = 0500;
778 }; 778 };
779 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapView" */; 779 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapView" */;
780 compatibilityVersion = "Xcode 3.2"; 780 compatibilityVersion = "Xcode 3.2";
@@ -956,11 +956,13 @@ @@ -956,11 +956,13 @@
956 C01FCF4F08A954540054247B /* Debug */ = { 956 C01FCF4F08A954540054247B /* Debug */ = {
957 isa = XCBuildConfiguration; 957 isa = XCBuildConfiguration;
958 buildSettings = { 958 buildSettings = {
  959 + CLANG_WARN_BOOL_CONVERSION = YES;
959 CLANG_WARN_CONSTANT_CONVERSION = YES; 960 CLANG_WARN_CONSTANT_CONVERSION = YES;
  961 + CLANG_WARN_EMPTY_BODY = YES;
960 CLANG_WARN_ENUM_CONVERSION = YES; 962 CLANG_WARN_ENUM_CONVERSION = YES;
961 CLANG_WARN_INT_CONVERSION = YES; 963 CLANG_WARN_INT_CONVERSION = YES;
962 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 964 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
963 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign"; 965 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
964 COPY_PHASE_STRIP = NO; 966 COPY_PHASE_STRIP = NO;
965 DEPLOYMENT_POSTPROCESSING = NO; 967 DEPLOYMENT_POSTPROCESSING = NO;
966 GCC_C_LANGUAGE_STANDARD = c99; 968 GCC_C_LANGUAGE_STANDARD = c99;
@@ -972,9 +974,12 @@ @@ -972,9 +974,12 @@
972 GCC_WARN_ABOUT_MISSING_NEWLINE = YES; 974 GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
973 GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; 975 GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
974 GCC_WARN_ABOUT_RETURN_TYPE = YES; 976 GCC_WARN_ABOUT_RETURN_TYPE = YES;
  977 + GCC_WARN_UNDECLARED_SELECTOR = YES;
975 GCC_WARN_UNINITIALIZED_AUTOS = YES; 978 GCC_WARN_UNINITIALIZED_AUTOS = YES;
  979 + GCC_WARN_UNUSED_FUNCTION = YES;
976 GCC_WARN_UNUSED_VARIABLE = YES; 980 GCC_WARN_UNUSED_VARIABLE = YES;
977 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 981 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
  982 + ONLY_ACTIVE_ARCH = YES;
978 OTHER_CFLAGS = ( 983 OTHER_CFLAGS = (
979 "-O", 984 "-O",
980 "-Wuninitialized", 985 "-Wuninitialized",
@@ -992,11 +997,13 @@ @@ -992,11 +997,13 @@
992 C01FCF5008A954540054247B /* Release */ = { 997 C01FCF5008A954540054247B /* Release */ = {
993 isa = XCBuildConfiguration; 998 isa = XCBuildConfiguration;
994 buildSettings = { 999 buildSettings = {
  1000 + CLANG_WARN_BOOL_CONVERSION = YES;
995 CLANG_WARN_CONSTANT_CONVERSION = YES; 1001 CLANG_WARN_CONSTANT_CONVERSION = YES;
  1002 + CLANG_WARN_EMPTY_BODY = YES;
996 CLANG_WARN_ENUM_CONVERSION = YES; 1003 CLANG_WARN_ENUM_CONVERSION = YES;
997 CLANG_WARN_INT_CONVERSION = YES; 1004 CLANG_WARN_INT_CONVERSION = YES;
998 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 1005 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
999 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 1006 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
1000 COPY_PHASE_STRIP = YES; 1007 COPY_PHASE_STRIP = YES;
1001 DEPLOYMENT_POSTPROCESSING = NO; 1008 DEPLOYMENT_POSTPROCESSING = NO;
1002 GCC_C_LANGUAGE_STANDARD = c99; 1009 GCC_C_LANGUAGE_STANDARD = c99;
@@ -1007,7 +1014,9 @@ @@ -1007,7 +1014,9 @@
1007 GCC_WARN_ABOUT_MISSING_NEWLINE = YES; 1014 GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
1008 GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; 1015 GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
1009 GCC_WARN_ABOUT_RETURN_TYPE = YES; 1016 GCC_WARN_ABOUT_RETURN_TYPE = YES;
  1017 + GCC_WARN_UNDECLARED_SELECTOR = YES;
1010 GCC_WARN_UNINITIALIZED_AUTOS = YES; 1018 GCC_WARN_UNINITIALIZED_AUTOS = YES;
  1019 + GCC_WARN_UNUSED_FUNCTION = YES;
1011 GCC_WARN_UNUSED_VARIABLE = YES; 1020 GCC_WARN_UNUSED_VARIABLE = YES;
1012 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 1021 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
1013 OTHER_LDFLAGS = ""; 1022 OTHER_LDFLAGS = "";