diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index f97388373e..20570b0e75 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -523,7 +523,7 @@ 470015E62342509C00EBF03D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = maps.me; TargetAttributes = { 470015EE2342509C00EBF03D = { @@ -537,6 +537,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 470015E52342509C00EBF03D; productRefGroup = 470015F02342509C00EBF03D /* Products */; diff --git a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj index 54b9e9d1d3..a425bb9b4d 100644 --- a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj +++ b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj @@ -142,7 +142,7 @@ 47A13C5C24B4A86000027D4F /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = maps.me; TargetAttributes = { 47A13C6424B4A86000027D4F = { @@ -231,6 +231,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -293,6 +294,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -400,6 +402,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 2abfdc3f98..0b4583b960 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -3738,7 +3738,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = OMaps.app; TargetAttributes = { 6741A93D1BF340DE002C974C = { @@ -4599,6 +4599,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_IDENTIFIER = app.omaps.debug; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = ( @@ -4644,6 +4645,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; BUNDLE_IDENTIFIER = app.omaps.release; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; HEADER_SEARCH_PATHS = ( diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 1c1a5bce34..ddef4c938b 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -672,7 +672,7 @@ 6753416F1A3F57BF00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 1250; TargetAttributes = { 39FD27061CC65A7100AFF551 = { CreatedOnToolsVersion = 7.2.1; @@ -685,10 +685,9 @@ }; buildConfigurationList = 675341721A3F57BF00A0A8C3 /* Build configuration list for PBXProject "base" */; compatibilityVersion = "Xcode 12.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -813,6 +812,7 @@ 39FD271C1CC65A7100AFF551 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", @@ -826,6 +826,7 @@ 39FD271D1CC65A7100AFF551 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", @@ -841,6 +842,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34BA2D6A1DBE169E00FAB345 /* common-debug.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Debug; @@ -849,6 +851,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = Release; @@ -873,6 +876,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_PREFIX_HEADER = "$(OMIM_ROOT)/precompiled_headers.hpp"; }; name = "Production Full"; @@ -888,6 +892,7 @@ A8E5413F1F9FBD6300A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT=1", diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj index 0517287025..9db27a6122 100644 --- a/xcode/drape/drape.xcodeproj/project.pbxproj +++ b/xcode/drape/drape.xcodeproj/project.pbxproj @@ -624,11 +624,11 @@ }; buildConfigurationList = 6729A4EC1A691F6A007D5872 /* Build configuration list for PBXProject "drape" */; compatibilityVersion = "Xcode 12.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, + Base, ); mainGroup = 6729A4E81A691F6A007D5872; productRefGroup = 6729A4F21A691F6A007D5872 /* Products */; diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index b9f308927d..8bc4b39c98 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 3D0BBAE723F3EF2700A50354 /* libvulkan_wrapper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAE623F3EF2700A50354 /* libvulkan_wrapper.a */; }; 3D0BBAE923F3EF4B00A50354 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAE823F3EF4B00A50354 /* CoreLocation.framework */; }; 3D0BBAEB23F3EF9D00A50354 /* libdescriptions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAEA23F3EF9D00A50354 /* libdescriptions.a */; }; - 3D0BBAED23F3EFBC00A50354 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D0BBAEC23F3EFBC00A50354 /* Security.framework */; }; 3D47B2C71F20EF06000828D2 /* displayed_categories_modifiers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D47B2C51F20EF06000828D2 /* displayed_categories_modifiers.cpp */; }; 3D47B2C81F20EF06000828D2 /* displayed_categories_modifiers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D47B2C61F20EF06000828D2 /* displayed_categories_modifiers.hpp */; }; 3D4E99821FB462B60025B48C /* everywhere_search_params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4E99801FB462B60025B48C /* everywhere_search_params.hpp */; }; @@ -85,7 +84,7 @@ 45F6EE9E1FB1C77600019892 /* mwm_tree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45F6EE9B1FB1C77500019892 /* mwm_tree.hpp */; }; 45F6EE9F1FB1C77600019892 /* search_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45F6EE9C1FB1C77500019892 /* search_api.cpp */; }; 4740185423F5BE8A00A93C81 /* minizip.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4740185323F5BE8A00A93C81 /* minizip.framework */; }; - 4740185523F5BE8B00A93C81 /* minizip.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4740185323F5BE8A00A93C81 /* minizip.framework */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 4740185523F5BE8B00A93C81 /* minizip.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4740185323F5BE8A00A93C81 /* minizip.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 475BD61B211C5FDC00E298C6 /* libshaders.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 475BD61A211C5FDC00E298C6 /* libshaders.a */; }; 47A9D82220A19E9E00E4671B /* libopen_location_code.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A9D82120A19E9E00E4671B /* libopen_location_code.a */; }; 47A9D82420A19EC300E4671B /* libkml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A9D82320A19EC300E4671B /* libkml.a */; }; @@ -469,7 +468,6 @@ 56DAC37223992491000BC50D /* libweb_api.a in Frameworks */, 56DAC3702399248B000BC50D /* libdescriptions.a in Frameworks */, 56DAC36E23992467000BC50D /* libvulkan_wrapper.a in Frameworks */, - 3D0BBAED23F3EFBC00A50354 /* Security.framework in Frameworks */, 3D0BBAEB23F3EF9D00A50354 /* libdescriptions.a in Frameworks */, 3D0BBAE923F3EF4B00A50354 /* CoreLocation.framework in Frameworks */, 3D0BBAE723F3EF2700A50354 /* libvulkan_wrapper.a in Frameworks */, @@ -920,7 +918,7 @@ 675345B31A4054AD00A0A8C3 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0700; + LastUpgradeCheck = 1250; TargetAttributes = { 3DA571D720C1921D007BDE27 = { CreatedOnToolsVersion = 9.3.1; @@ -935,10 +933,9 @@ }; buildConfigurationList = 675345B61A4054AD00A0A8C3 /* Build configuration list for PBXProject "map" */; compatibilityVersion = "Xcode 12.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -1047,6 +1044,7 @@ 3DA571EB20C1921E007BDE27 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.map-integration-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1055,6 +1053,7 @@ 3DA571EC20C1921E007BDE27 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.map-integration-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1063,6 +1062,7 @@ 3DA571ED20C1921E007BDE27 /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; PRODUCT_BUNDLE_IDENTIFIER = "maps.me.map-integration-tests"; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1071,6 +1071,7 @@ 674A29E41B26FD1C001A525C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", @@ -1088,6 +1089,7 @@ 674A29E51B26FD1C001A525C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", @@ -1106,6 +1108,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34AF87E91DBE5AD000E5E7DC /* common-debug.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; EXCLUDED_SOURCE_FILE_NAMES = ""; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = "qgl_render_context.*"; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = "qgl_render_context.*"; @@ -1125,6 +1128,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34AF87EA1DBE5AD000E5E7DC /* common-release.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; EXCLUDED_SOURCE_FILE_NAMES = ""; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = "qgl_render_context.*"; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = "qgl_render_context.*"; @@ -1164,6 +1168,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34AF87EA1DBE5AD000E5E7DC /* common-release.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; EXCLUDED_SOURCE_FILE_NAMES = ""; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphoneos*]" = "qgl_render_context.*"; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = "qgl_render_context.*"; @@ -1192,6 +1197,7 @@ A8E5415B1F9FBDAC00A1B8FA /* Production Full */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "-"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP=1", diff --git a/xcode/minizip/minizip.xcodeproj/project.pbxproj b/xcode/minizip/minizip.xcodeproj/project.pbxproj index 9e3bf8a017..771bd0334d 100644 --- a/xcode/minizip/minizip.xcodeproj/project.pbxproj +++ b/xcode/minizip/minizip.xcodeproj/project.pbxproj @@ -144,11 +144,11 @@ }; buildConfigurationList = 671F59071B87568D0032311E /* Build configuration list for PBXProject "minizip" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, + Base, ); mainGroup = 671F59031B87568D0032311E; productRefGroup = 671F590D1B87568D0032311E /* Products */; diff --git a/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj b/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj index 50722e3a03..e711fd66fd 100644 --- a/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj +++ b/xcode/open_location_code/open_location_code.xcodeproj/project.pbxproj @@ -114,7 +114,7 @@ 1D5F8AA4207616D300CAADFC /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; TargetAttributes = { 1D5F8AAB207616D300CAADFC = { CreatedOnToolsVersion = 9.2; diff --git a/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj b/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj index 0f001c06e5..ab425cd725 100644 --- a/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj +++ b/xcode/sdf_image/sdf_image.xcodeproj/project.pbxproj @@ -95,7 +95,7 @@ 675D219C1BFB8D3F00717E4F /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 1250; TargetAttributes = { 675D21A31BFB8D3F00717E4F = { CreatedOnToolsVersion = 7.1.1; @@ -104,10 +104,11 @@ }; buildConfigurationList = 675D219F1BFB8D3F00717E4F /* Build configuration list for PBXProject "sdf_image" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 675D219B1BFB8D3F00717E4F; productRefGroup = 675D21A51BFB8D3F00717E4F /* Products */; @@ -135,6 +136,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F5586A1DBF48E500A4FC11 /* common-debug.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; name = Debug; @@ -143,6 +145,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F5586B1DBF48E500A4FC11 /* common-release.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; name = Release; @@ -167,6 +170,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 34F5586B1DBF48E500A4FC11 /* common-release.xcconfig */; buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; GCC_WARN_INHIBIT_ALL_WARNINGS = YES; }; name = "Production Full"; diff --git a/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj b/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj index 9c1f71b847..531f2f6bc2 100644 --- a/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj +++ b/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj @@ -203,11 +203,11 @@ }; buildConfigurationList = 453FEDD01F35E647005C1BB4 /* Build configuration list for PBXProject "software_renderer" */; compatibilityVersion = "Xcode 12.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, + Base, ); mainGroup = 453FEDCC1F35E647005C1BB4; productRefGroup = 453FEDD61F35E647005C1BB4 /* Products */; diff --git a/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj b/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj index ca41909bc5..4b3afec792 100644 --- a/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj +++ b/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj @@ -95,7 +95,7 @@ 4577B26521F2044300864FAC /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; TargetAttributes = { 4577B26C21F2044300864FAC = { CreatedOnToolsVersion = 10.1; diff --git a/xcode/web_api/web_api.xcodeproj/project.pbxproj b/xcode/web_api/web_api.xcodeproj/project.pbxproj index c8c0a907d6..5320ecbcdd 100644 --- a/xcode/web_api/web_api.xcodeproj/project.pbxproj +++ b/xcode/web_api/web_api.xcodeproj/project.pbxproj @@ -101,7 +101,7 @@ isa = PBXProject; attributes = { DefaultBuildSystemTypeForWorkspace = Latest; - LastUpgradeCheck = 1240; + LastUpgradeCheck = 1250; TargetAttributes = { 450B5C6D2355F3CF00E9019E = { CreatedOnToolsVersion = 11.0;