From 8f71b204e6cb20f911187df49a1e72825e53b9b0 Mon Sep 17 00:00:00 2001 From: Calin Seciu Date: Mon, 31 Oct 2016 09:33:07 +0200 Subject: [PATCH] Update GraphHopper to 0.8.2 --- class.list | 59 +++++++++++-------- graphhopper | 2 +- .../project.pbxproj | 21 ++++++- .../graphhopper-ios-sample/Info.plist | 2 +- .../graphhopper-ios-sampleTests/Info.plist | 2 +- graphhopper.xcodeproj/project.pbxproj | 9 ++- 6 files changed, 67 insertions(+), 28 deletions(-) diff --git a/class.list b/class.list index 1848e83..d821a0c 100644 --- a/class.list +++ b/class.list @@ -19,26 +19,28 @@ graphhopper/core/src/main/java/com/graphhopper/GHResponse.java graphhopper/core/src/main/java/com/graphhopper/GraphHopper.java graphhopper/core/src/main/java/com/graphhopper/GraphHopperAPI.java graphhopper/core/src/main/java/com/graphhopper/PathWrapper.java +graphhopper/core/src/main/java/com/graphhopper/reader/ConditionalTagInspector.java graphhopper/core/src/main/java/com/graphhopper/reader/DataReader.java +graphhopper/core/src/main/java/com/graphhopper/reader/dem/AbstractEdgeElevationInterpolator.java +graphhopper/core/src/main/java/com/graphhopper/reader/dem/BridgeElevationInterpolator.java graphhopper/core/src/main/java/com/graphhopper/reader/dem/CGIARProvider.java +graphhopper/core/src/main/java/com/graphhopper/reader/dem/ElevationInterpolator.java graphhopper/core/src/main/java/com/graphhopper/reader/dem/ElevationProvider.java graphhopper/core/src/main/java/com/graphhopper/reader/dem/HeightTile.java +graphhopper/core/src/main/java/com/graphhopper/reader/dem/NodeElevationInterpolator.java graphhopper/core/src/main/java/com/graphhopper/reader/dem/SRTMProvider.java +graphhopper/core/src/main/java/com/graphhopper/reader/dem/TunnelElevationInterpolator.java +graphhopper/core/src/main/java/com/graphhopper/reader/osm/conditional/ConditionalOSMTagInspector.java graphhopper/core/src/main/java/com/graphhopper/reader/osm/conditional/ConditionalParser.java -graphhopper/core/src/main/java/com/graphhopper/reader/osm/conditional/ConditionalTagsInspector.java graphhopper/core/src/main/java/com/graphhopper/reader/osm/conditional/DateRange.java graphhopper/core/src/main/java/com/graphhopper/reader/osm/conditional/DateRangeParser.java graphhopper/core/src/main/java/com/graphhopper/reader/osm/conditional/ParsedCalendar.java graphhopper/core/src/main/java/com/graphhopper/reader/osm/conditional/ValueRange.java -graphhopper/core/src/main/java/com/graphhopper/reader/OSMElement.java -graphhopper/core/src/main/java/com/graphhopper/reader/OSMNode.java -graphhopper/core/src/main/java/com/graphhopper/reader/OSMReader.java -graphhopper/core/src/main/java/com/graphhopper/reader/OSMRelation.java -graphhopper/core/src/main/java/com/graphhopper/reader/OSMTagParser.java -graphhopper/core/src/main/java/com/graphhopper/reader/OSMTurnRelation.java -graphhopper/core/src/main/java/com/graphhopper/reader/OSMWay.java graphhopper/core/src/main/java/com/graphhopper/reader/PillarInfo.java -graphhopper/core/src/main/java/com/graphhopper/reader/PrinctonReader.java +graphhopper/core/src/main/java/com/graphhopper/reader/ReaderElement.java +graphhopper/core/src/main/java/com/graphhopper/reader/ReaderNode.java +graphhopper/core/src/main/java/com/graphhopper/reader/ReaderRelation.java +graphhopper/core/src/main/java/com/graphhopper/reader/ReaderWay.java graphhopper/core/src/main/java/com/graphhopper/routing/AbstractBidirAlgo.java graphhopper/core/src/main/java/com/graphhopper/routing/AbstractRoutingAlgorithm.java graphhopper/core/src/main/java/com/graphhopper/routing/AlgorithmOptions.java @@ -61,32 +63,29 @@ graphhopper/core/src/main/java/com/graphhopper/routing/RoutingAlgorithm.java graphhopper/core/src/main/java/com/graphhopper/routing/RoutingAlgorithmFactory.java graphhopper/core/src/main/java/com/graphhopper/routing/RoutingAlgorithmFactoryDecorator.java graphhopper/core/src/main/java/com/graphhopper/routing/RoutingAlgorithmFactorySimple.java +graphhopper/core/src/main/java/com/graphhopper/routing/subnetwork/PrepareRoutingSubnetworks.java +graphhopper/core/src/main/java/com/graphhopper/routing/subnetwork/TarjansSCCAlgorithm.java graphhopper/core/src/main/java/com/graphhopper/routing/template/AbstractRoutingTemplate.java graphhopper/core/src/main/java/com/graphhopper/routing/template/AlternativeRoutingTemplate.java graphhopper/core/src/main/java/com/graphhopper/routing/template/RoundTripRoutingTemplate.java graphhopper/core/src/main/java/com/graphhopper/routing/template/RoutingTemplate.java graphhopper/core/src/main/java/com/graphhopper/routing/template/ViaRoutingTemplate.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/AbstractAdjustedWeighting.java graphhopper/core/src/main/java/com/graphhopper/routing/util/AbstractAlgoPreparation.java graphhopper/core/src/main/java/com/graphhopper/routing/util/AbstractFlagEncoder.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/AbstractWeighting.java graphhopper/core/src/main/java/com/graphhopper/routing/util/AllCHEdgesIterator.java graphhopper/core/src/main/java/com/graphhopper/routing/util/AllEdgesIterator.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/AvoidEdgesWeighting.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/BeelineWeightApproximator.java graphhopper/core/src/main/java/com/graphhopper/routing/util/Bike2WeightFlagEncoder.java graphhopper/core/src/main/java/com/graphhopper/routing/util/BikeCommonFlagEncoder.java graphhopper/core/src/main/java/com/graphhopper/routing/util/BikeFlagEncoder.java +graphhopper/core/src/main/java/com/graphhopper/routing/util/Car4WDFlagEncoder.java graphhopper/core/src/main/java/com/graphhopper/routing/util/CarFlagEncoder.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/ConsistentWeightApproximator.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/CurvatureWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/util/DataFlagEncoder.java graphhopper/core/src/main/java/com/graphhopper/routing/util/DefaultEdgeFilter.java graphhopper/core/src/main/java/com/graphhopper/routing/util/DefaultFlagEncoderFactory.java graphhopper/core/src/main/java/com/graphhopper/routing/util/EdgeFilter.java graphhopper/core/src/main/java/com/graphhopper/routing/util/EncodedDoubleValue.java graphhopper/core/src/main/java/com/graphhopper/routing/util/EncodedValue.java graphhopper/core/src/main/java/com/graphhopper/routing/util/EncodingManager.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/FastestWeighting.java graphhopper/core/src/main/java/com/graphhopper/routing/util/FlagEncoder.java graphhopper/core/src/main/java/com/graphhopper/routing/util/FlagEncoderFactory.java graphhopper/core/src/main/java/com/graphhopper/routing/util/FootFlagEncoder.java @@ -95,23 +94,30 @@ graphhopper/core/src/main/java/com/graphhopper/routing/util/HintsMap.java graphhopper/core/src/main/java/com/graphhopper/routing/util/LevelEdgeFilter.java graphhopper/core/src/main/java/com/graphhopper/routing/util/MotorcycleFlagEncoder.java graphhopper/core/src/main/java/com/graphhopper/routing/util/MountainBikeFlagEncoder.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/PrepareRoutingSubnetworks.java graphhopper/core/src/main/java/com/graphhopper/routing/util/PriorityCode.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/PriorityWeighting.java graphhopper/core/src/main/java/com/graphhopper/routing/util/RacingBikeFlagEncoder.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/ShortestWeighting.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/TarjansSCCAlgorithm.java graphhopper/core/src/main/java/com/graphhopper/routing/util/TestAlgoCollector.java graphhopper/core/src/main/java/com/graphhopper/routing/util/tour/MultiPointTour.java graphhopper/core/src/main/java/com/graphhopper/routing/util/tour/SinglePointTour.java graphhopper/core/src/main/java/com/graphhopper/routing/util/tour/TourStrategy.java graphhopper/core/src/main/java/com/graphhopper/routing/util/TraversalMode.java graphhopper/core/src/main/java/com/graphhopper/routing/util/TurnCostEncoder.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/TurnWeighting.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/WeightApproximator.java -graphhopper/core/src/main/java/com/graphhopper/routing/util/Weighting.java graphhopper/core/src/main/java/com/graphhopper/routing/VirtualEdgeIterator.java graphhopper/core/src/main/java/com/graphhopper/routing/VirtualEdgeIteratorState.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/AbstractAdjustedWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/AbstractWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/AvoidEdgesWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/BeelineWeightApproximator.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/ConsistentWeightApproximator.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/CurvatureWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/FastestWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/GenericWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/PriorityWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/ShortestWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/ShortFastestWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/TurnWeighting.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/WeightApproximator.java +graphhopper/core/src/main/java/com/graphhopper/routing/weighting/Weighting.java graphhopper/core/src/main/java/com/graphhopper/search/Geocoding.java graphhopper/core/src/main/java/com/graphhopper/search/NameIndex.java graphhopper/core/src/main/java/com/graphhopper/search/ReverseGeocoding.java @@ -166,6 +172,7 @@ graphhopper/core/src/main/java/com/graphhopper/util/CHEdgeExplorer.java graphhopper/core/src/main/java/com/graphhopper/util/CHEdgeIterator.java graphhopper/core/src/main/java/com/graphhopper/util/CHEdgeIteratorState.java graphhopper/core/src/main/java/com/graphhopper/util/CmdArgs.java +graphhopper/core/src/main/java/com/graphhopper/util/ConfigMap.java graphhopper/core/src/main/java/com/graphhopper/util/Constants.java graphhopper/core/src/main/java/com/graphhopper/util/DepthFirstSearch.java graphhopper/core/src/main/java/com/graphhopper/util/DistanceCalc.java @@ -178,6 +185,12 @@ graphhopper/core/src/main/java/com/graphhopper/util/Downloader.java graphhopper/core/src/main/java/com/graphhopper/util/EdgeExplorer.java graphhopper/core/src/main/java/com/graphhopper/util/EdgeIterator.java graphhopper/core/src/main/java/com/graphhopper/util/EdgeIteratorState.java +graphhopper/core/src/main/java/com/graphhopper/util/exceptions/ConnectionNotFoundException.java +graphhopper/core/src/main/java/com/graphhopper/util/exceptions/DetailedIllegalArgumentException.java +graphhopper/core/src/main/java/com/graphhopper/util/exceptions/DetailedRuntimeException.java +graphhopper/core/src/main/java/com/graphhopper/util/exceptions/GHException.java +graphhopper/core/src/main/java/com/graphhopper/util/exceptions/PointNotFoundException.java +graphhopper/core/src/main/java/com/graphhopper/util/exceptions/PointOutOfBoundsException.java graphhopper/core/src/main/java/com/graphhopper/util/FinishInstruction.java graphhopper/core/src/main/java/com/graphhopper/util/GHUtility.java graphhopper/core/src/main/java/com/graphhopper/util/GPXEntry.java diff --git a/graphhopper b/graphhopper index e6e3d81..fe35872 160000 --- a/graphhopper +++ b/graphhopper @@ -1 +1 @@ -Subproject commit e6e3d8135724560b510ea1460616a27dc2393db9 +Subproject commit fe358725e7ae2526dae258bc3dc80a83d616055a diff --git a/graphhopper-ios-sample/graphhopper-ios-sample.xcodeproj/project.pbxproj b/graphhopper-ios-sample/graphhopper-ios-sample.xcodeproj/project.pbxproj index 486f7f3..b8af64d 100644 --- a/graphhopper-ios-sample/graphhopper-ios-sample.xcodeproj/project.pbxproj +++ b/graphhopper-ios-sample/graphhopper-ios-sample.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXBuildFile section */ 5B899A891C5A35900056E6AD /* fr_CH.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5B899A871C5A35900056E6AD /* fr_CH.txt */; }; 5B899A8A1C5A35900056E6AD /* fr_FR.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5B899A881C5A35900056E6AD /* fr_FR.txt */; }; + FA372D1C1DC721810098CEA3 /* ko.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA372D1B1DC721810098CEA3 /* ko.txt */; }; + FA372D1E1DC721A60098CEA3 /* zh_HK.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA372D1D1DC721A60098CEA3 /* zh_HK.txt */; }; FA4967201D0F1D1A00D9FBEC /* hr_HR.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA49671F1D0F1D1900D9FBEC /* hr_HR.txt */; }; FA59C1761AADB8AB0093F77B /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FA59C1751AADB8AB0093F77B /* libicucore.dylib */; }; FA59C1AD1AADD1950093F77B /* fi.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA59C1AC1AADD1950093F77B /* fi.txt */; }; @@ -88,6 +90,8 @@ /* Begin PBXFileReference section */ 5B899A871C5A35900056E6AD /* fr_CH.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fr_CH.txt; path = build/translations/fr_CH.txt; sourceTree = ""; }; 5B899A881C5A35900056E6AD /* fr_FR.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fr_FR.txt; path = build/translations/fr_FR.txt; sourceTree = ""; }; + FA372D1B1DC721810098CEA3 /* ko.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ko.txt; path = build/translations/ko.txt; sourceTree = ""; }; + FA372D1D1DC721A60098CEA3 /* zh_HK.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = zh_HK.txt; path = build/translations/zh_HK.txt; sourceTree = ""; }; FA49671F1D0F1D1900D9FBEC /* hr_HR.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = hr_HR.txt; path = build/translations/hr_HR.txt; sourceTree = ""; }; FA59C1751AADB8AB0093F77B /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; FA59C1AC1AADD1950093F77B /* fi.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fi.txt; path = build/translations/fi.txt; sourceTree = ""; }; @@ -319,6 +323,7 @@ FA8E47311BFE9DBE0037B46C /* hu_HU.txt */, FAFEF89A1A0BE988002C11A3 /* it.txt */, FAFEF89B1A0BE988002C11A3 /* ja.txt */, + FA372D1B1DC721810098CEA3 /* ko.txt */, FA8E47341BFE9DCB0037B46C /* lt_LT.txt */, FA59C1AE1AADD1B50093F77B /* ne.txt */, FAFEF89C1A0BE988002C11A3 /* nl.txt */, @@ -334,6 +339,7 @@ FAFEF8A51A0BE988002C11A3 /* uk.txt */, FA59C1B01AADD1D20093F77B /* vi_VI.txt */, FA59C1B11AADD1D20093F77B /* zh_CN.txt */, + FA372D1D1DC721A60098CEA3 /* zh_HK.txt */, ); name = Translations; path = ..; @@ -403,7 +409,7 @@ FABCD8C81A0A61430013FB88 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = "Calin Seciu"; TargetAttributes = { FABCD8CF1A0A61430013FB88 = { @@ -484,7 +490,9 @@ FAFEF8B41A0BE988002C11A3 /* pt_BR.txt in Resources */, FA8E47321BFE9DBE0037B46C /* hsb.txt in Resources */, FA8E47291BFE9D770037B46C /* ast.txt in Resources */, + FA372D1C1DC721810098CEA3 /* ko.txt in Resources */, FAFEF8A81A0BE988002C11A3 /* ca.txt in Resources */, + FA372D1E1DC721A60098CEA3 /* zh_HK.txt in Resources */, FABCD8E41A0A61430013FB88 /* LaunchScreen.xib in Resources */, 5B899A891C5A35900056E6AD /* fr_CH.txt in Resources */, FABCD8E11A0A61430013FB88 /* Images.xcassets in Resources */, @@ -587,15 +595,19 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -629,8 +641,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -638,6 +652,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -670,6 +685,7 @@ "$(PROJECT_DIR)/../build", ); OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = "com.graphhopper.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../j2objc/include $(PROJECT_DIR)/../src"; @@ -694,6 +710,7 @@ "$(PROJECT_DIR)/../build", ); OTHER_LDFLAGS = "-ObjC"; + PRODUCT_BUNDLE_IDENTIFIER = "com.graphhopper.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../j2objc/include $(PROJECT_DIR)/../src"; @@ -714,6 +731,7 @@ ); INFOPLIST_FILE = "graphhopper-ios-sampleTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.graphhopper.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/graphhopper-ios-sample.app/graphhopper-ios-sample"; }; @@ -729,6 +747,7 @@ ); INFOPLIST_FILE = "graphhopper-ios-sampleTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.graphhopper.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/graphhopper-ios-sample.app/graphhopper-ios-sample"; }; diff --git a/graphhopper-ios-sample/graphhopper-ios-sample/Info.plist b/graphhopper-ios-sample/graphhopper-ios-sample/Info.plist index 9162544..d831054 100644 --- a/graphhopper-ios-sample/graphhopper-ios-sample/Info.plist +++ b/graphhopper-ios-sample/graphhopper-ios-sample/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.graphhopper.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/graphhopper-ios-sample/graphhopper-ios-sampleTests/Info.plist b/graphhopper-ios-sample/graphhopper-ios-sampleTests/Info.plist index 648b226..ba72822 100644 --- a/graphhopper-ios-sample/graphhopper-ios-sampleTests/Info.plist +++ b/graphhopper-ios-sample/graphhopper-ios-sampleTests/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.graphhopper.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/graphhopper.xcodeproj/project.pbxproj b/graphhopper.xcodeproj/project.pbxproj index f9bdc45..bd7ea54 100644 --- a/graphhopper.xcodeproj/project.pbxproj +++ b/graphhopper.xcodeproj/project.pbxproj @@ -112,7 +112,7 @@ FABB63C61A04D67C0031AB97 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0800; TargetAttributes = { FAF57F741A04E10C00340FDB = { CreatedOnToolsVersion = 6.1; @@ -150,14 +150,18 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -190,14 +194,17 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES;