From 80d630439b3a4164fd7c2c705c8f62088334528f Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Mon, 1 Mar 2021 21:24:25 +0100 Subject: [PATCH] [ios] Changed min iOS version from 11.0 to 12.0 Signed-off-by: Alexander Borsuk --- drape/metal/metal_base_context.mm | 33 ++++------ drape/metal/metal_states.mm | 11 +--- iphone/Chart/Chart.xcodeproj/project.pbxproj | 9 +-- .../CoreApi/CoreApi.xcodeproj/project.pbxproj | 6 +- .../DatePicker.xcodeproj/project.pbxproj | 6 +- .../Catalog/CatalogWebViewController.swift | 6 +- .../DownloadedBookmarksViewController.swift | 2 - .../Tags/SharingTagsViewController.swift | 4 +- .../Maps/Categories/UITableView+Updates.swift | 23 ++----- .../Maps/Classes/CarPlay/CarPlayRouter.swift | 4 -- .../Maps/Classes/CarPlay/CarPlayService.swift | 9 --- .../ListTemplateBuilder.swift | 1 - .../MapTemplateBuilder.swift | 1 - .../SearchTemplateBuilder.swift | 1 - .../SettingsTemplateBuilder.swift | 1 - .../CarPlay/Templates Data/ListItemInfo.swift | 2 - .../CarPlay/Templates Data/MapInfo.swift | 1 - .../Views/NavigationControlView.swift | 10 ++- .../BaseRoutePreviewStatus.swift | 10 ++- .../TransportRoutePreviewStatus.swift | 10 ++- iphone/Maps/Classes/EAGLView.mm | 11 ++-- iphone/Maps/Classes/MapViewController.mm | 6 +- .../Classes/Widgets/MWMMapDownloadDialog.mm | 8 +-- iphone/Maps/Classes/Widgets/MWMMapWidgets.mm | 16 ++--- iphone/Maps/Common/WebViewController.m | 12 ++-- iphone/Maps/Core/Settings/MWMSettings.mm | 14 ++--- .../Maps/Core/TextToSpeech/MWMTextToSpeech.mm | 6 +- iphone/Maps/Maps.xcodeproj/project.pbxproj | 14 ++--- iphone/Maps/Podfile | 2 +- iphone/Maps/Podfile.lock | 62 +++++++++---------- .../Maps/TipsAndTricks/TutorialBlurView.swift | 6 -- .../Maps/UI/AvailableArea/AvailableArea.swift | 2 +- .../Maps/UI/AvailableArea/VisibleArea.swift | 6 +- .../UI/Discovery/MWMDiscoveryTableManager.mm | 3 +- .../Cells/MWMMapDownloaderCellHeader.m | 3 +- .../MWMSearchHotelsFilterViewController.mm | 4 +- shaders/metal_program_pool.mm | 3 +- xcode/common.xcconfig | 2 +- .../minizip/minizip.xcodeproj/project.pbxproj | 3 - .../project.pbxproj | 2 - 40 files changed, 113 insertions(+), 222 deletions(-) diff --git a/drape/metal/metal_base_context.mm b/drape/metal/metal_base_context.mm index a73503e4c6..47f659fe71 100644 --- a/drape/metal/metal_base_context.mm +++ b/drape/metal/metal_base_context.mm @@ -77,27 +77,18 @@ std::string MetalBaseContext::GetRendererVersion() const features.emplace_back(MTLFeatureSet_iOS_GPUFamily1_v2, "iOS_GPUFamily1_v2"); features.emplace_back(MTLFeatureSet_iOS_GPUFamily2_v2, "iOS_GPUFamily2_v2"); features.emplace_back(MTLFeatureSet_iOS_GPUFamily3_v1, "iOS_GPUFamily3_v1"); - if (@available(iOS 10.0, *)) - { - features.emplace_back(MTLFeatureSet_iOS_GPUFamily1_v3, "iOS_GPUFamily1_v3"); - features.emplace_back(MTLFeatureSet_iOS_GPUFamily2_v3, "iOS_GPUFamily2_v3"); - features.emplace_back(MTLFeatureSet_iOS_GPUFamily3_v2, "iOS_GPUFamily3_v2"); - } - if (@available(iOS 11.0, *)) - { - features.emplace_back(MTLFeatureSet_iOS_GPUFamily1_v4, "iOS_GPUFamily1_v4"); - features.emplace_back(MTLFeatureSet_iOS_GPUFamily2_v4, "iOS_GPUFamily2_v4"); - features.emplace_back(MTLFeatureSet_iOS_GPUFamily3_v3, "iOS_GPUFamily3_v3"); - features.emplace_back(MTLFeatureSet_iOS_GPUFamily4_v1, "iOS_GPUFamily4_v1"); - } - if (@available(iOS 12.0, *)) - { - features.emplace_back(MTLFeatureSet_iOS_GPUFamily1_v5, "iOS_GPUFamily1_v5"); - features.emplace_back(MTLFeatureSet_iOS_GPUFamily2_v5, "iOS_GPUFamily2_v5"); - features.emplace_back(MTLFeatureSet_iOS_GPUFamily3_v4, "iOS_GPUFamily3_v4"); - features.emplace_back(MTLFeatureSet_iOS_GPUFamily4_v2, "iOS_GPUFamily4_v2"); - features.emplace_back(MTLFeatureSet_iOS_GPUFamily5_v1, "iOS_GPUFamily5_v1"); - } + features.emplace_back(MTLFeatureSet_iOS_GPUFamily1_v3, "iOS_GPUFamily1_v3"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily2_v3, "iOS_GPUFamily2_v3"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily3_v2, "iOS_GPUFamily3_v2"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily1_v4, "iOS_GPUFamily1_v4"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily2_v4, "iOS_GPUFamily2_v4"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily3_v3, "iOS_GPUFamily3_v3"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily4_v1, "iOS_GPUFamily4_v1"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily1_v5, "iOS_GPUFamily1_v5"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily2_v5, "iOS_GPUFamily2_v5"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily3_v4, "iOS_GPUFamily3_v4"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily4_v2, "iOS_GPUFamily4_v2"); + features.emplace_back(MTLFeatureSet_iOS_GPUFamily5_v1, "iOS_GPUFamily5_v1"); std::sort(features.begin(), features.end(), [](auto const & s1, auto const & s2) { return s1.first > s2.first; diff --git a/drape/metal/metal_states.mm b/drape/metal/metal_states.mm index b57f7269cc..08b818492f 100644 --- a/drape/metal/metal_states.mm +++ b/drape/metal/metal_states.mm @@ -283,15 +283,8 @@ bool MetalStates::PipelineKey::operator<(PipelineKey const & rhs) const MTLRenderPipelineDescriptor * MetalStates::PipelineKey::BuildDescriptor() const { MTLRenderPipelineDescriptor * desc = [[MTLRenderPipelineDescriptor alloc] init]; - if (@available(iOS 11.0, *)) - { - desc.rasterSampleCount = 1; - desc.vertexBuffers[0].mutability = MTLMutabilityImmutable; // The first VB is always immutable. - } - else - { - desc.sampleCount = 1; - } + desc.rasterSampleCount = 1; + desc.vertexBuffers[0].mutability = MTLMutabilityImmutable; // The first VB is always immutable. ref_ptr metalProgram = m_program; desc.vertexFunction = metalProgram->GetVertexShader(); desc.fragmentFunction = metalProgram->GetFragmentShader(); diff --git a/iphone/Chart/Chart.xcodeproj/project.pbxproj b/iphone/Chart/Chart.xcodeproj/project.pbxproj index 9f9320a430..dae4753d08 100644 --- a/iphone/Chart/Chart.xcodeproj/project.pbxproj +++ b/iphone/Chart/Chart.xcodeproj/project.pbxproj @@ -357,7 +357,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -415,7 +415,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -439,7 +439,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Chart/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -465,7 +464,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Chart/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -525,7 +523,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -549,7 +547,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Chart/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index 623ce0afd4..17bf19f3f4 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -1021,6 +1021,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1075,6 +1076,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -1105,7 +1107,6 @@ ); INFOPLIST_FILE = CoreApi/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1142,7 +1143,6 @@ ); INFOPLIST_FILE = CoreApi/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1202,6 +1202,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -1233,7 +1234,6 @@ ); INFOPLIST_FILE = CoreApi/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj index fad20ce3bf..0989115b3b 100644 --- a/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj +++ b/iphone/DatePicker/DatePicker.xcodeproj/project.pbxproj @@ -257,6 +257,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -313,6 +314,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -336,7 +338,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = DatePicker/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -363,7 +364,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = DatePicker/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -422,6 +422,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -445,7 +446,6 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = DatePicker/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift index f9b631ff06..f16b110cbd 100644 --- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift @@ -122,11 +122,7 @@ final class CatalogWebViewController: WebViewController { noInternetView.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true noInternetView.centerYAnchor.constraint(equalTo: view.centerYAnchor, constant: -20.0).isActive = true - if #available(iOS 11, *) { - progressBgView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor, constant: 8).isActive = true - } else { - progressBgView.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 8).isActive = true - } + progressBgView.leftAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leftAnchor, constant: 8).isActive = true progressView.styleName = "MWMWhite" view.styleName = "Background" diff --git a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift index b826ac5e24..4da87bd50b 100644 --- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift @@ -43,8 +43,6 @@ class DownloadedBookmarksViewController: MWMViewController { self?.reloadData() } } - if #available(iOS 11, *) { return } // workaround for https://jira.mail.ru/browse/MAPSME-8101 - reloadData() } override func viewWillAppear(_ animated: Bool) { diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/SharingTagsViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/SharingTagsViewController.swift index 71b7c1e16c..3f8ba3e34e 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/SharingTagsViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/SharingTagsViewController.swift @@ -98,9 +98,7 @@ final class SharingTagsViewController: MWMViewController { enabled: cell.isSelected || isSelectionAvailable) //we need to do this because of bug - ios 12 doesnt apply layout to cells until scrolling - if #available(iOS 12.0, *) { - cell.layoutIfNeeded() - } + cell.layoutIfNeeded() return cell } diff --git a/iphone/Maps/Categories/UITableView+Updates.swift b/iphone/Maps/Categories/UITableView+Updates.swift index 39d2d2541d..b22c991bb3 100644 --- a/iphone/Maps/Categories/UITableView+Updates.swift +++ b/iphone/Maps/Categories/UITableView+Updates.swift @@ -3,28 +3,13 @@ extension UITableView { typealias Completion = () -> Void @objc func update(_ updates: Updates) { - if #available(iOS 11.0, *) { - performBatchUpdates(updates, completion: nil) - } else { - beginUpdates() - updates() - endUpdates() - } + performBatchUpdates(updates, completion: nil) } @objc func update(_ updates: Updates, completion: @escaping Completion) { - if #available(iOS 11.0, *) { - performBatchUpdates(updates, completion: { _ in - completion() - }) - } else { - CATransaction.begin() - beginUpdates() - CATransaction.setCompletionBlock(completion) - updates() - endUpdates() - CATransaction.commit() - } + performBatchUpdates(updates, completion: { _ in + completion() + }) } @objc func refresh() { diff --git a/iphone/Maps/Classes/CarPlay/CarPlayRouter.swift b/iphone/Maps/Classes/CarPlay/CarPlayRouter.swift index a4fed73953..b417f75671 100644 --- a/iphone/Maps/Classes/CarPlay/CarPlayRouter.swift +++ b/iphone/Maps/Classes/CarPlay/CarPlayRouter.swift @@ -1,7 +1,6 @@ import CarPlay import Contacts -@available(iOS 12.0, *) protocol CarPlayRouterListener: class { func didCreateRoute(routeInfo: RouteInfo, trip: CPTrip) @@ -11,7 +10,6 @@ protocol CarPlayRouterListener: class { } -@available(iOS 12.0, *) @objc(MWMCarPlayRouter) final class CarPlayRouter: NSObject { private let listenerContainer: ListenerContainer @@ -205,7 +203,6 @@ final class CarPlayRouter: NSObject { } // MARK: - Navigation session management -@available(iOS 12.0, *) extension CarPlayRouter { func startNavigationSession(forTrip trip: CPTrip, template: CPMapTemplate) { routeSession = template.startNavigationSession(for: trip) @@ -311,7 +308,6 @@ extension CarPlayRouter { } // MARK: - RoutingManagerListener implementation -@available(iOS 12.0, *) extension CarPlayRouter: RoutingManagerListener { func updateCameraInfo(isCameraOnRoute: Bool, speedLimit limit: String?) { CarPlayService.shared.updateCameraUI(isCameraOnRoute: isCameraOnRoute, speedLimit: limit) diff --git a/iphone/Maps/Classes/CarPlay/CarPlayService.swift b/iphone/Maps/Classes/CarPlay/CarPlayService.swift index 6ec49827ca..5be0ac23f5 100644 --- a/iphone/Maps/Classes/CarPlay/CarPlayService.swift +++ b/iphone/Maps/Classes/CarPlay/CarPlayService.swift @@ -1,7 +1,6 @@ import CarPlay import Contacts -@available(iOS 12.0, *) @objc(MWMCarPlayService) final class CarPlayService: NSObject { @objc static let shared = CarPlayService() @@ -240,7 +239,6 @@ final class CarPlayService: NSObject { } // MARK: - CPInterfaceControllerDelegate implementation -@available(iOS 12.0, *) extension CarPlayService: CPInterfaceControllerDelegate { func templateWillAppear(_ aTemplate: CPTemplate, animated: Bool) { guard let info = aTemplate.userInfo as? MapInfo else { @@ -299,7 +297,6 @@ extension CarPlayService: CPInterfaceControllerDelegate { } // MARK: - CPSessionConfigurationDelegate implementation -@available(iOS 12.0, *) extension CarPlayService: CPSessionConfigurationDelegate { func sessionConfiguration(_ sessionConfiguration: CPSessionConfiguration, limitedUserInterfacesChanged limitedUserInterfaces: CPLimitableUserInterface) { @@ -308,7 +305,6 @@ extension CarPlayService: CPSessionConfigurationDelegate { } // MARK: - CPMapTemplateDelegate implementation -@available(iOS 12.0, *) extension CarPlayService: CPMapTemplateDelegate { public func mapTemplateDidShowPanningInterface(_ mapTemplate: CPMapTemplate) { isUserPanMap = false @@ -414,7 +410,6 @@ extension CarPlayService: CPMapTemplateDelegate { // MARK: - CPListTemplateDelegate implementation -@available(iOS 12.0, *) extension CarPlayService: CPListTemplateDelegate { func listTemplate(_ listTemplate: CPListTemplate, didSelect item: CPListItem, completionHandler: @escaping () -> Void) { if let userInfo = item.userInfo as? ListItemInfo { @@ -465,7 +460,6 @@ extension CarPlayService: CPListTemplateDelegate { } // MARK: - CPSearchTemplateDelegate implementation -@available(iOS 12.0, *) extension CarPlayService: CPSearchTemplateDelegate { func searchTemplate(_ searchTemplate: CPSearchTemplate, updatedSearchText searchText: String, completionHandler: @escaping ([CPListItem]) -> Void) { let locale = window?.textInputMode?.primaryLanguage ?? "en" @@ -497,7 +491,6 @@ extension CarPlayService: CPSearchTemplateDelegate { } // MARK: - CarPlayRouterListener implementation -@available(iOS 12.0, *) extension CarPlayService: CarPlayRouterListener { func didCreateRoute(routeInfo: RouteInfo, trip: CPTrip) { guard let currentTemplate = interfaceController?.topTemplate as? CPMapTemplate, @@ -542,7 +535,6 @@ extension CarPlayService: CarPlayRouterListener { } // MARK: - LocationModeListener implementation -@available(iOS 12.0, *) extension CarPlayService: LocationModeListener { func processMyPositionStateModeEvent(_ mode: MWMMyPositionMode) { currentPositionMode = mode @@ -570,7 +562,6 @@ extension CarPlayService: LocationModeListener { } // MARK: - Alerts and Trip Previews -@available(iOS 12.0, *) extension CarPlayService { func preparePreviewForSearchResults(selectedRow row: Int) { var results = searchService?.lastResults ?? [] diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift index 12f2f4add1..bb1790f18a 100644 --- a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift +++ b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift @@ -1,6 +1,5 @@ import CarPlay -@available(iOS 12.0, *) final class ListTemplateBuilder { enum ListTemplateType { case history diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift index a5c1591ad1..bf32c21fb7 100644 --- a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift +++ b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift @@ -1,6 +1,5 @@ import CarPlay -@available(iOS 12.0, *) final class MapTemplateBuilder { enum MapButtonType { case startPanning diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/SearchTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/SearchTemplateBuilder.swift index 7554896a10..48625a2fc3 100644 --- a/iphone/Maps/Classes/CarPlay/Template Builders/SearchTemplateBuilder.swift +++ b/iphone/Maps/Classes/CarPlay/Template Builders/SearchTemplateBuilder.swift @@ -1,6 +1,5 @@ import CarPlay -@available(iOS 12.0, *) final class SearchTemplateBuilder { // MARK: - CPSearchTemplate builder class func buildSearchTemplate() -> CPSearchTemplate { diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift index f97f322ef6..5dc8a84665 100644 --- a/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift +++ b/iphone/Maps/Classes/CarPlay/Template Builders/SettingsTemplateBuilder.swift @@ -1,6 +1,5 @@ import CarPlay -@available(iOS 12.0, *) final class SettingsTemplateBuilder { // MARK: - CPGridTemplate builder class func buildGridTemplate() -> CPGridTemplate { diff --git a/iphone/Maps/Classes/CarPlay/Templates Data/ListItemInfo.swift b/iphone/Maps/Classes/CarPlay/Templates Data/ListItemInfo.swift index 60f1513212..9b034abea2 100644 --- a/iphone/Maps/Classes/CarPlay/Templates Data/ListItemInfo.swift +++ b/iphone/Maps/Classes/CarPlay/Templates Data/ListItemInfo.swift @@ -1,7 +1,5 @@ -@available(iOS 12.0, *) protocol InfoMetadata {} -@available(iOS 12.0, *) struct ListItemInfo { let type: String let metadata: InfoMetadata? diff --git a/iphone/Maps/Classes/CarPlay/Templates Data/MapInfo.swift b/iphone/Maps/Classes/CarPlay/Templates Data/MapInfo.swift index 2940a09d14..a2388ae21a 100644 --- a/iphone/Maps/Classes/CarPlay/Templates Data/MapInfo.swift +++ b/iphone/Maps/Classes/CarPlay/Templates Data/MapInfo.swift @@ -1,4 +1,3 @@ -@available(iOS 12.0, *) struct MapInfo { let type: String let trips: [CPTrip]? diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift index dd78d9dc51..8baeb6c0ee 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/NavigationControlView.swift @@ -91,12 +91,10 @@ final class NavigationControlView: SolidTouchView, MWMTextToSpeechObserver, MapO var lAnchor = ownerView.leadingAnchor var tAnchor = ownerView.trailingAnchor var bAnchor = ownerView.bottomAnchor - if #available(iOS 11.0, *) { - let layoutGuide = ownerView.safeAreaLayoutGuide - lAnchor = layoutGuide.leadingAnchor - tAnchor = layoutGuide.trailingAnchor - bAnchor = layoutGuide.bottomAnchor - } + let layoutGuide = ownerView.safeAreaLayoutGuide + lAnchor = layoutGuide.leadingAnchor + tAnchor = layoutGuide.trailingAnchor + bAnchor = layoutGuide.bottomAnchor leadingAnchor.constraint(equalTo: lAnchor).isActive = true trailingAnchor.constraint(equalTo: tAnchor).isActive = true diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift index 207c751182..fba4dc6d6c 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/BaseRoutePreviewStatus.swift @@ -78,12 +78,10 @@ final class BaseRoutePreviewStatus: SolidTouchView { var lAnchor = ownerView.leadingAnchor var tAnchor = ownerView.trailingAnchor var bAnchor = ownerView.bottomAnchor - if #available(iOS 11.0, *) { - let layoutGuide = ownerView.safeAreaLayoutGuide - lAnchor = layoutGuide.leadingAnchor - tAnchor = layoutGuide.trailingAnchor - bAnchor = layoutGuide.bottomAnchor - } + let layoutGuide = ownerView.safeAreaLayoutGuide + lAnchor = layoutGuide.leadingAnchor + tAnchor = layoutGuide.trailingAnchor + bAnchor = layoutGuide.bottomAnchor leadingAnchor.constraint(equalTo: lAnchor).isActive = true trailingAnchor.constraint(equalTo: tAnchor).isActive = true diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift index ca84a6a045..7c79191560 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/RoutePreviewStatus/TransportRoutePreviewStatus.swift @@ -39,12 +39,10 @@ final class TransportRoutePreviewStatus: SolidTouchView { var lAnchor = ownerView.leadingAnchor var tAnchor = ownerView.trailingAnchor var bAnchor = ownerView.bottomAnchor - if #available(iOS 11.0, *) { - let layoutGuide = ownerView.safeAreaLayoutGuide - lAnchor = layoutGuide.leadingAnchor - tAnchor = layoutGuide.trailingAnchor - bAnchor = layoutGuide.bottomAnchor - } + let layoutGuide = ownerView.safeAreaLayoutGuide + lAnchor = layoutGuide.leadingAnchor + tAnchor = layoutGuide.trailingAnchor + bAnchor = layoutGuide.bottomAnchor leadingAnchor.constraint(equalTo: lAnchor).isActive = true trailingAnchor.constraint(equalTo: tAnchor).isActive = true diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index afc6bd5287..c68cd02430 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -68,14 +68,11 @@ double getExactDPI(double contentScaleFactor) return apiVersion; #ifdef OMIM_METAL_AVAILABLE - if (@available(iOS 10.0, *)) + if (GetFramework().LoadPreferredGraphicsAPI() == dp::ApiVersion::Metal) { - if (GetFramework().LoadPreferredGraphicsAPI() == dp::ApiVersion::Metal) - { - id tempDevice = MTLCreateSystemDefaultDevice(); - if (tempDevice) - apiVersion = dp::ApiVersion::Metal; - } + id tempDevice = MTLCreateSystemDefaultDevice(); + if (tempDevice) + apiVersion = dp::ApiVersion::Metal; } #endif diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index ec49d50680..638938b7d2 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -292,10 +292,8 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; } - (void)sendTouchType:(df::TouchEvent::ETouchType)type withTouches:(NSSet *)touches andEvent:(UIEvent *)event { - if (@available(iOS 12.0, *)) { - if ([MWMCarPlayService shared].isCarplayActivated) { - return; - } + if ([MWMCarPlayService shared].isCarplayActivated) { + return; } NSArray *allTouches = [[event allTouches] allObjects]; if ([allTouches count] < 1) diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm index 7579ff0012..d2dcc137d9 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm @@ -141,9 +141,7 @@ using namespace storage; m_autoDownloadCountryId = kInvalidCountryId; [self showDownloadRequest]; } - if (@available(iOS 12.0, *)) { - [[MWMCarPlayService shared] showNoMapAlert]; - } + [[MWMCarPlayService shared] showNoMapAlert]; break; } case NodeStatus::Downloading: @@ -185,9 +183,7 @@ using namespace storage; } - (void)removeFromSuperview { - if (@available(iOS 12.0, *)) { - [[MWMCarPlayService shared] hideNoMapAlert]; - } + [[MWMCarPlayService shared] hideNoMapAlert]; self.progress.state = MWMCircularProgressStateNormal; [[MWMStorage sharedStorage] removeObserver:self]; [super removeFromSuperview]; diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm b/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm index b2684fc938..05008d96f3 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapWidgets.mm @@ -35,12 +35,10 @@ if (m_skin != nullptr) m_skin->Resize(size.width, size.height); dispatch_async(dispatch_get_main_queue(), ^{ - if (@available(iOS 12.0, *)) { - if ([MWMCarPlayService shared].isCarplayActivated) { - CGRect bounds = [MapViewController sharedController].mapView.bounds; - [self updateLayout: bounds]; - return; - } + if ([MWMCarPlayService shared].isCarplayActivated) { + CGRect bounds = [MapViewController sharedController].mapView.bounds; + [self updateLayout: bounds]; + return; } [self updateLayoutForAvailableArea]; }); @@ -51,10 +49,8 @@ if (CGRectEqualToRect(self.availableArea, frame)) return; self.availableArea = frame; - if (@available(iOS 12.0, *)) { - if ([MWMCarPlayService shared].isCarplayActivated) { - return; - } + if ([MWMCarPlayService shared].isCarplayActivated) { + return; } [self updateLayout:frame]; } diff --git a/iphone/Maps/Common/WebViewController.m b/iphone/Maps/Common/WebViewController.m index 56617e0bc2..926c385305 100644 --- a/iphone/Maps/Common/WebViewController.m +++ b/iphone/Maps/Common/WebViewController.m @@ -69,13 +69,11 @@ NSLayoutYAxisAnchor *bottomAnchor = view.bottomAnchor; NSLayoutXAxisAnchor *leadingAnchor = view.leadingAnchor; NSLayoutXAxisAnchor *trailingAnchor = view.trailingAnchor; - if (@available(iOS 11.0, *)) { - UILayoutGuide *safeAreaLayoutGuide = view.safeAreaLayoutGuide; - topAnchor = safeAreaLayoutGuide.topAnchor; - bottomAnchor = safeAreaLayoutGuide.bottomAnchor; - leadingAnchor = safeAreaLayoutGuide.leadingAnchor; - trailingAnchor = safeAreaLayoutGuide.trailingAnchor; - } + UILayoutGuide *safeAreaLayoutGuide = view.safeAreaLayoutGuide; + topAnchor = safeAreaLayoutGuide.topAnchor; + bottomAnchor = safeAreaLayoutGuide.bottomAnchor; + leadingAnchor = safeAreaLayoutGuide.leadingAnchor; + trailingAnchor = safeAreaLayoutGuide.trailingAnchor; [self.webView.topAnchor constraintEqualToAnchor:topAnchor].active = YES; [self.webView.bottomAnchor constraintEqualToAnchor:bottomAnchor].active = YES; diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm index 0a7c74a7e8..8657c16ed8 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.mm +++ b/iphone/Maps/Core/Settings/MWMSettings.mm @@ -111,14 +111,12 @@ NSString * const kCrashReportingDisabled = @"CrashReportingDisabled"; + (MWMTheme)theme { - if (@available(iOS 12.0, *)) { - if ([MWMCarPlayService shared].isCarplayActivated) { - UIUserInterfaceStyle style = [[MWMCarPlayService shared] interfaceStyle]; - switch (style) { - case UIUserInterfaceStyleLight: return MWMThemeDay; - case UIUserInterfaceStyleDark: return MWMThemeNight; - case UIUserInterfaceStyleUnspecified: break; - } + if ([MWMCarPlayService shared].isCarplayActivated) { + UIUserInterfaceStyle style = [[MWMCarPlayService shared] interfaceStyle]; + switch (style) { + case UIUserInterfaceStyleLight: return MWMThemeDay; + case UIUserInterfaceStyleDark: return MWMThemeNight; + case UIUserInterfaceStyleUnspecified: break; } } auto ud = NSUserDefaults.standardUserDefaults; diff --git a/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm b/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm index a896e8403b..6fd7a37aa2 100644 --- a/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm +++ b/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm @@ -234,10 +234,8 @@ using Observers = NSHashTable; return; } else { AVAudioSessionMode mode = AVAudioSessionModeDefault; - if (@available(iOS 12.0, *)) { - if ([MWMCarPlayService shared].isCarplayActivated) { - mode = AVAudioSessionModeVoicePrompt; - } + if ([MWMCarPlayService shared].isCarplayActivated) { + mode = AVAudioSessionModeVoicePrompt; } if (![[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback mode:mode diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 4862303a5b..69e8371641 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -6070,9 +6070,7 @@ DEVELOPMENT_TEAM = W55CJ2SCF7; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = MetalContextFactory.mm; "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = MetalContextFactory.mm; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_SWIFT_FLAGS = "$(inherited)"; }; @@ -6089,9 +6087,7 @@ DEVELOPMENT_TEAM = W55CJ2SCF7; "EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*]" = MetalContextFactory.mm; "EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*]" = MetalContextFactory.mm; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_SWIFT_FLAGS = "$(inherited)"; }; @@ -6119,9 +6115,8 @@ "$(OMIM_ROOT)/3party/jansson/src", ); INFOPLIST_FILE = OMaps.plist; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - ); + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -6169,6 +6164,7 @@ "$(OMIM_ROOT)/3party/jansson/src", ); INFOPLIST_FILE = OMaps.plist; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_CFLAGS = ( "$(inherited)", diff --git a/iphone/Maps/Podfile b/iphone/Maps/Podfile index 11e210d26b..aaa011af50 100644 --- a/iphone/Maps/Podfile +++ b/iphone/Maps/Podfile @@ -1,5 +1,5 @@ # Uncomment the next line to define a global platform for your project -platform :ios, '11.0' +platform :ios, '12.0' workspace './../../xcode/omim.xcworkspace' diff --git a/iphone/Maps/Podfile.lock b/iphone/Maps/Podfile.lock index 649cb6fd7f..382e781996 100644 --- a/iphone/Maps/Podfile.lock +++ b/iphone/Maps/Podfile.lock @@ -1,44 +1,44 @@ PODS: - - Firebase/Analytics (7.4.0): + - Firebase/Analytics (7.7.0): - Firebase/Core - - Firebase/Core (7.4.0): + - Firebase/Core (7.7.0): - Firebase/CoreOnly - - FirebaseAnalytics (= 7.4.0) - - Firebase/CoreOnly (7.4.0): - - FirebaseCore (= 7.4.0) - - Firebase/Crashlytics (7.4.0): + - FirebaseAnalytics (= 7.7.0) + - Firebase/CoreOnly (7.7.0): + - FirebaseCore (= 7.7.0) + - Firebase/Crashlytics (7.7.0): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 7.4.0) - - FirebaseAnalytics (7.4.0): + - FirebaseCrashlytics (~> 7.7.0) + - FirebaseAnalytics (7.7.0): - FirebaseCore (~> 7.0) - FirebaseInstallations (~> 7.0) - - GoogleAppMeasurement (= 7.4.0) + - GoogleAppMeasurement (= 7.7.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - GoogleUtilities/MethodSwizzler (~> 7.0) - GoogleUtilities/Network (~> 7.0) - "GoogleUtilities/NSData+zlib (~> 7.0)" - nanopb (~> 2.30907.0) - - FirebaseCore (7.4.0): + - FirebaseCore (7.7.0): - FirebaseCoreDiagnostics (~> 7.4) - GoogleUtilities/Environment (~> 7.0) - GoogleUtilities/Logger (~> 7.0) - - FirebaseCoreDiagnostics (7.4.0): + - FirebaseCoreDiagnostics (7.7.0): - GoogleDataTransport (~> 8.0) - GoogleUtilities/Environment (~> 7.0) - GoogleUtilities/Logger (~> 7.0) - nanopb (~> 2.30907.0) - - FirebaseCrashlytics (7.4.0): + - FirebaseCrashlytics (7.7.0): - FirebaseCore (~> 7.0) - FirebaseInstallations (~> 7.0) - GoogleDataTransport (~> 8.0) - nanopb (~> 2.30907.0) - PromisesObjC (~> 1.2) - - FirebaseInstallations (7.4.0): + - FirebaseInstallations (7.7.0): - FirebaseCore (~> 7.0) - GoogleUtilities/Environment (~> 7.0) - GoogleUtilities/UserDefaults (~> 7.0) - PromisesObjC (~> 1.2) - - GoogleAppMeasurement (7.4.0): + - GoogleAppMeasurement (7.7.0): - GoogleUtilities/AppDelegateSwizzler (~> 7.0) - GoogleUtilities/MethodSwizzler (~> 7.0) - GoogleUtilities/Network (~> 7.0) @@ -46,24 +46,24 @@ PODS: - nanopb (~> 2.30907.0) - GoogleDataTransport (8.2.0): - nanopb (~> 2.30907.0) - - GoogleUtilities/AppDelegateSwizzler (7.2.0): + - GoogleUtilities/AppDelegateSwizzler (7.2.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.2.0): + - GoogleUtilities/Environment (7.2.2): - PromisesObjC (~> 1.2) - - GoogleUtilities/Logger (7.2.0): + - GoogleUtilities/Logger (7.2.2): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.2.0): + - GoogleUtilities/MethodSwizzler (7.2.2): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.2.0): + - GoogleUtilities/Network (7.2.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.2.0)" - - GoogleUtilities/Reachability (7.2.0): + - "GoogleUtilities/NSData+zlib (7.2.2)" + - GoogleUtilities/Reachability (7.2.2): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.2.0): + - GoogleUtilities/UserDefaults (7.2.2): - GoogleUtilities/Logger - nanopb (2.30907.0): - nanopb/decode (= 2.30907.0) @@ -91,18 +91,18 @@ SPEC REPOS: - PromisesObjC SPEC CHECKSUMS: - Firebase: 09fb40287b6dfc8ee65f726fa0b788719d3f2a07 - FirebaseAnalytics: adb3c8f02f83d00661cdaac6dbb4d54e9720d1b6 - FirebaseCore: 99c06e5a1e8d6952e75cb1f0a6d0b23c0f5ccdcf - FirebaseCoreDiagnostics: 3770093ac4f2be4590fa03cfa1d3a6e5602d4557 - FirebaseCrashlytics: ef6b0947ab6819b5cb335f8c0a7677cd57d544c5 - FirebaseInstallations: 30646fc9a61c6f4ee3cd7a8b7231721842b40c95 - GoogleAppMeasurement: 688d7f00e2894d9e13823ed9a028b13b993bc277 + Firebase: cd2ab85eec8170dc260186159f21072ecb679ad5 + FirebaseAnalytics: f3f8f75de34fe04141a69bb1c4bd7e24a80178e1 + FirebaseCore: ac35d680a0bf32319a59966a1478e0741536b97b + FirebaseCoreDiagnostics: 179bf3831213451c8addd036aca7fcf5492ec154 + FirebaseCrashlytics: 47af228115805e190b566db12c028263531b8ce0 + FirebaseInstallations: 42c86e7b02ff75b7f27f85833bf5dcb5f38a9774 + GoogleAppMeasurement: 0c3b134b2c0a90c4c24833873894bfe0e42a0384 GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4 - GoogleUtilities: d866834472f1324d080496bc67ab3ce5d0d46027 + GoogleUtilities: 31c5b01f978a70c6cff2afc6272b3f1921614b43 nanopb: 59221d7f958fb711001e6a449489542d92ae113e PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 -PODFILE CHECKSUM: 916b31f2d26cbd5c2fe0a48c8fbf2ad19a179e0e +PODFILE CHECKSUM: 618bf912c2cc62124083b7fea445d26ce9b50ae6 COCOAPODS: 1.10.1 diff --git a/iphone/Maps/TipsAndTricks/TutorialBlurView.swift b/iphone/Maps/TipsAndTricks/TutorialBlurView.swift index 924cd3b2f4..faf036fb35 100644 --- a/iphone/Maps/TipsAndTricks/TutorialBlurView.swift +++ b/iphone/Maps/TipsAndTricks/TutorialBlurView.swift @@ -36,12 +36,6 @@ class TutorialBlurView: UIVisualEffectView { if superview != nil { targetView?.centerXAnchor.constraint(equalTo: layoutView.centerXAnchor).isActive = true targetView?.centerYAnchor.constraint(equalTo: layoutView.centerYAnchor).isActive = true - guard #available(iOS 11.0, *) else { - DispatchQueue.main.async { - self.setNeedsLayout() - } - return - } } } diff --git a/iphone/Maps/UI/AvailableArea/AvailableArea.swift b/iphone/Maps/UI/AvailableArea/AvailableArea.swift index 67ab3a5a1b..3e17cd5318 100644 --- a/iphone/Maps/UI/AvailableArea/AvailableArea.swift +++ b/iphone/Maps/UI/AvailableArea/AvailableArea.swift @@ -12,7 +12,7 @@ class AvailableArea: UIView { } var shouldUpdateAreaFrame: Bool { - if #available(iOS 11.0, *), let insets = UIApplication.shared.delegate?.window??.safeAreaInsets { + if let insets = UIApplication.shared.delegate?.window??.safeAreaInsets { return insets.left > 0 || insets.right > 0 } else { return false diff --git a/iphone/Maps/UI/AvailableArea/VisibleArea.swift b/iphone/Maps/UI/AvailableArea/VisibleArea.swift index 4e3b1e00a2..d9bc2f8977 100644 --- a/iphone/Maps/UI/AvailableArea/VisibleArea.swift +++ b/iphone/Maps/UI/AvailableArea/VisibleArea.swift @@ -10,10 +10,8 @@ final class VisibleArea: AvailableArea { } override func notifyObserver() { - if #available(iOS 12.0, *) { - if CarPlayService.shared.isCarplayActivated { - return - } + if CarPlayService.shared.isCarplayActivated { + return } FrameworkHelper.setVisibleViewport(areaFrame, scaleFactor: MapViewController.shared()?.mapView.contentScaleFactor ?? 1) } diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm b/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm index 243c37f890..3ce9dd37ba 100644 --- a/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm +++ b/iphone/Maps/UI/Discovery/MWMDiscoveryTableManager.mm @@ -64,8 +64,7 @@ using namespace discovery; tableView.dataSource = self; tableView.rowHeight = UITableViewAutomaticDimension; tableView.estimatedRowHeight = 218; - if (@available(iOS 11.0, *)) - tableView.insetsContentViewsToSafeArea = NO; + tableView.insetsContentViewsToSafeArea = NO; [self registerCells]; } return self; diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m index 0b560154cd..74758218ae 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m @@ -16,8 +16,7 @@ - (void)drawTextInRect:(CGRect)rect { rect = UIEdgeInsetsInsetRect(rect, UIEdgeInsetsMake(0, 16, 0, 0)); - if (@available(iOS 11.0, *)) - rect = UIEdgeInsetsInsetRect(rect, self.safeAreaInsets); + rect = UIEdgeInsetsInsetRect(rect, self.safeAreaInsets); [super drawTextInRect:rect]; } diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm index 8767436fb2..e5f646e59f 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm @@ -306,9 +306,7 @@ void configButton(UIButton *button, NSString *primaryText, NSString *secondaryTe cell.tagName.text = L(str); // we need to do this because of bug - ios 12 doesnt apply layout to cells until scrolling - if (@available(iOS 12.0, *)) { - [cell layoutIfNeeded]; - } + [cell layoutIfNeeded]; auto const selected = m_selectedTypes.find(type) != m_selectedTypes.end(); cell.selected = selected; diff --git a/shaders/metal_program_pool.mm b/shaders/metal_program_pool.mm index 1385f4d41f..3f2017a7a2 100644 --- a/shaders/metal_program_pool.mm +++ b/shaders/metal_program_pool.mm @@ -299,8 +299,7 @@ id MetalProgramPool::GetFunction(std::string const & name) { id f = [m_library newFunctionWithName:@(name.c_str())]; CHECK(f != nil, ()); - if (@available(iOS 10.0, *)) - f.label = [@"Function " stringByAppendingString:@(name.c_str())]; + f.label = [@"Function " stringByAppendingString:@(name.c_str())]; m_functions.insert(std::make_pair(name, f)); return f; } diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index 9e1c5d9281..d5166f4a98 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -9,7 +9,7 @@ HEADER_SEARCH_PATHS = $(inherited) $(OMIM_ROOT) $(BOOST_ROOT) FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(QT_PATH)/lib // Deployment target -IPHONEOS_DEPLOYMENT_TARGET = 11.0 +IPHONEOS_DEPLOYMENT_TARGET = 12.0 MACOSX_DEPLOYMENT_TARGET = 10.12 // Supported platforms diff --git a/xcode/minizip/minizip.xcodeproj/project.pbxproj b/xcode/minizip/minizip.xcodeproj/project.pbxproj index c7684dab07..fb8c16b9ee 100644 --- a/xcode/minizip/minizip.xcodeproj/project.pbxproj +++ b/xcode/minizip/minizip.xcodeproj/project.pbxproj @@ -242,7 +242,6 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = minizip_framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -308,7 +307,6 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = minizip_framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -374,7 +372,6 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = minizip_framework/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; diff --git a/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj b/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj index 314becbcd6..19c52ff3f6 100644 --- a/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj +++ b/xcode/software_renderer/software_renderer.xcodeproj/project.pbxproj @@ -281,7 +281,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -322,7 +321,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; };