From 09f5e1d395632c1f1bd40e0352119049bd7d9fcc Mon Sep 17 00:00:00 2001 From: Victor Sarda Date: Tue, 27 Apr 2021 20:19:24 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A7=20Updated=20app=20links=20to?= =?UTF-8?q?=20include=20Firebase=20ones=20(+=20debug)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ViteMaDose.xcodeproj/project.pbxproj | 6 ++++-- ViteMaDose/ViteMaDose.entitlements | 1 + ViteMaDose/ViteMaDoseDebug.entitlements | 12 ++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 ViteMaDose/ViteMaDoseDebug.entitlements diff --git a/ViteMaDose.xcodeproj/project.pbxproj b/ViteMaDose.xcodeproj/project.pbxproj index b955c587..dc7d7290 100644 --- a/ViteMaDose.xcodeproj/project.pbxproj +++ b/ViteMaDose.xcodeproj/project.pbxproj @@ -113,6 +113,7 @@ /* Begin PBXFileReference section */ 5702B5D6263595FF00C51F47 /* HomeViewModelDelegateSpy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewModelDelegateSpy.swift; sourceTree = ""; }; 5702B5DA2635965C00C51F47 /* APIServiceMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIServiceMock.swift; sourceTree = ""; }; + 570E4273263893E5004A47F9 /* ViteMaDoseDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ViteMaDoseDebug.entitlements; sourceTree = ""; }; 57471428262B6BA300535DF1 /* CountyCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountyCell.swift; sourceTree = ""; }; 57471429262B6BA300535DF1 /* CountyCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CountyCell.xib; sourceTree = ""; }; 575CC223262AECA7008D1869 /* HomeTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTitleCell.swift; sourceTree = ""; }; @@ -263,7 +264,6 @@ 576738BE261E329C004A700D /* ViteMaDose */ = { isa = PBXGroup; children = ( - 6A28354B262DC06C00FA6456 /* ViteMaDose.entitlements */, 57673986261E5AF3004A700D /* Application */, 5767392A261E3B99004A700D /* Views */, 5767393C261E3BFD004A700D /* ViewModels */, @@ -400,6 +400,8 @@ 57673986261E5AF3004A700D /* Application */ = { isa = PBXGroup; children = ( + 570E4273263893E5004A47F9 /* ViteMaDoseDebug.entitlements */, + 6A28354B262DC06C00FA6456 /* ViteMaDose.entitlements */, 579D713126373A030021CB56 /* GoogleService-Info-debug.plist */, 577A7F6B262CA3D000B1D03C /* GoogleService-Info-prod.plist */, 576738BF261E329C004A700D /* AppDelegate.swift */, @@ -1020,7 +1022,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = ViteMaDose/ViteMaDose.entitlements; + CODE_SIGN_ENTITLEMENTS = ViteMaDose/ViteMaDoseDebug.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 841539; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; diff --git a/ViteMaDose/ViteMaDose.entitlements b/ViteMaDose/ViteMaDose.entitlements index 7dd1529f..5c41fd98 100644 --- a/ViteMaDose/ViteMaDose.entitlements +++ b/ViteMaDose/ViteMaDose.entitlements @@ -6,6 +6,7 @@ applinks:vitemadose.covidtracker.fr applinks:vitemadose.app + applinks:vitemadose.page.link diff --git a/ViteMaDose/ViteMaDoseDebug.entitlements b/ViteMaDose/ViteMaDoseDebug.entitlements new file mode 100644 index 00000000..113af87c --- /dev/null +++ b/ViteMaDose/ViteMaDoseDebug.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.developer.associated-domains + + applinks:vitemadose.covidtracker.fr + applinks:vitemadose.app + applinks:vitemadosedev.page.link + + + From a8fa4731a7440ef1898c9f69c1a765d166962547 Mon Sep 17 00:00:00 2001 From: Yannick Heinrich Date: Tue, 27 Apr 2021 22:00:33 +0200 Subject: [PATCH 2/2] Use `AnyObject` instead of deprecated `class` for protocol --- ViteMaDose/Helpers/Extensions/Storyboard+Common.swift | 2 +- ViteMaDose/Helpers/Protocols/ErrorDisplayable.swift | 2 +- ViteMaDose/ViewModels/CentresList/CentresListViewModel.swift | 2 +- .../ViewModels/CountySelection/CountySelectionViewModel.swift | 2 +- ViteMaDose/ViewModels/Home/HomeViewModel.swift | 2 +- .../Views/CountySelection/CountySelectionViewController.swift | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ViteMaDose/Helpers/Extensions/Storyboard+Common.swift b/ViteMaDose/Helpers/Extensions/Storyboard+Common.swift index 74dffd75..21791f87 100644 --- a/ViteMaDose/Helpers/Extensions/Storyboard+Common.swift +++ b/ViteMaDose/Helpers/Extensions/Storyboard+Common.swift @@ -7,7 +7,7 @@ import UIKit -protocol Storyboarded: class { +protocol Storyboarded: AnyObject { static var storyboard: UIStoryboard { get } } diff --git a/ViteMaDose/Helpers/Protocols/ErrorDisplayable.swift b/ViteMaDose/Helpers/Protocols/ErrorDisplayable.swift index 89c90325..010af865 100644 --- a/ViteMaDose/Helpers/Protocols/ErrorDisplayable.swift +++ b/ViteMaDose/Helpers/Protocols/ErrorDisplayable.swift @@ -7,7 +7,7 @@ import UIKit -protocol ErrorDisplayable: class { +protocol ErrorDisplayable: AnyObject { func presentRetryableAndCancellableError( error: Error, retryHandler: @escaping (_: UIAlertAction) -> Void, diff --git a/ViteMaDose/ViewModels/CentresList/CentresListViewModel.swift b/ViteMaDose/ViewModels/CentresList/CentresListViewModel.swift index 9e5f8a7f..c9036cc1 100644 --- a/ViteMaDose/ViewModels/CentresList/CentresListViewModel.swift +++ b/ViteMaDose/ViewModels/CentresList/CentresListViewModel.swift @@ -31,7 +31,7 @@ protocol CentresListViewModelProvider { func bookingLink(at indexPath: IndexPath) -> URL? } -protocol CentresListViewModelDelegate: class { +protocol CentresListViewModelDelegate: AnyObject { func updateLoadingState(isLoading: Bool, isEmpty: Bool) func presentLoadError(_ error: Error) diff --git a/ViteMaDose/ViewModels/CountySelection/CountySelectionViewModel.swift b/ViteMaDose/ViewModels/CountySelection/CountySelectionViewModel.swift index 45562eea..3a372e8b 100644 --- a/ViteMaDose/ViewModels/CountySelection/CountySelectionViewModel.swift +++ b/ViteMaDose/ViewModels/CountySelection/CountySelectionViewModel.swift @@ -13,7 +13,7 @@ protocol CountySelectionViewModelProvider { func didSelectCell(at indexPath: IndexPath) } -protocol CountySelectionViewModelDelegate: class { +protocol CountySelectionViewModelDelegate: AnyObject { func reloadTableView(with counties: Counties) func dismissViewController(with county: County) } diff --git a/ViteMaDose/ViewModels/Home/HomeViewModel.swift b/ViteMaDose/ViewModels/Home/HomeViewModel.swift index 0fd535a8..e0faac35 100644 --- a/ViteMaDose/ViewModels/Home/HomeViewModel.swift +++ b/ViteMaDose/ViewModels/Home/HomeViewModel.swift @@ -35,7 +35,7 @@ protocol HomeViewModelProvider { var stats: Stats? { get } } -protocol HomeViewModelDelegate: class { +protocol HomeViewModelDelegate: AnyObject { func updateLoadingState(isLoading: Bool, isEmpty: Bool) func presentVaccinationCentres(for county: County) diff --git a/ViteMaDose/Views/CountySelection/CountySelectionViewController.swift b/ViteMaDose/Views/CountySelection/CountySelectionViewController.swift index 0f88e623..83c4d620 100644 --- a/ViteMaDose/Views/CountySelection/CountySelectionViewController.swift +++ b/ViteMaDose/Views/CountySelection/CountySelectionViewController.swift @@ -9,7 +9,7 @@ import Foundation import UIKit import Haptica -protocol CountySelectionViewControllerDelegate: class { +protocol CountySelectionViewControllerDelegate: AnyObject { func didSelect(county: County) }