diff --git a/platform/mwm_version.cpp b/platform/mwm_version.cpp index 5e0a59add1..bf713c0d2c 100644 --- a/platform/mwm_version.cpp +++ b/platform/mwm_version.cpp @@ -19,7 +19,7 @@ namespace version { namespace { -uint64_t VersionToSecondsSinceEpoch(uint32_t version) +uint64_t VersionToSecondsSinceEpoch(uint64_t version) { auto constexpr partsCount = 3; // From left to right YY MM DD. diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index c8fb8105d1..f8415c768e 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -473,7 +473,7 @@ 675343701A3F5CF500A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0720; ORGANIZATIONNAME = maps.me; TargetAttributes = { 675340E81C58C496002CF0D9 = { @@ -594,6 +594,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_TESTABILITY = YES; EXECUTABLE_PREFIX = lib; @@ -608,6 +609,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; @@ -637,6 +639,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; EXCLUDED_SOURCE_FILE_NAMES = ""; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = platform_mac.mm; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = platform_mac.mm; @@ -664,7 +667,6 @@ "$(OMIM_ROOT)/3party/jansson/src", "$(QT_PATH)/include", ); - MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -714,7 +716,6 @@ "$(OMIM_ROOT)/3party/jansson/src", "$(QT_PATH)/include", ); - MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos";