DTPOMERSER-1389 Update OS to runner mac-15, install swiftlinter and address lint issues

grmeyer-hw-dev · grmeyer-hw-dev · commit 270459b43f27 · 2025-01-31T16:30:13.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,16 +15,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-12
+          - os: macos-15
             task_title: 'Unit Tests'
             fastlane_task: 'unit_tests'
-            xcode_version: 14.2
+            xcode_version: 16.2
             code_coverage: true
 
-          - os: macos-12
+          - os: macos-15
             task_title: 'UI Tests'
             fastlane_task: 'ui_tests'
-            xcode_version: 13.4
+            xcode_version: 16.4
             code_coverage: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -53,6 +53,10 @@ jobs:
       - name: Run ${{ matrix.task_title }}
         run: fastlane ${{ matrix.fastlane_task }}
 
+      - name: Install Lint
+        run:
+          brew install swiftlint
+
       - name: Lint validation
         if: matrix.code_coverage
         run:
diff --git a/Common/Sources/Insights/HyperwalletInsights.swift b/Common/Sources/Insights/HyperwalletInsights.swift
@@ -139,7 +139,7 @@ public class HyperwalletInsights: HyperwalletInsightsProtocol {
         }
     }
 
-    private func loadConfigurationAndInitializeInsights(completion: @escaping(Bool) -> Void) {
+    private func loadConfigurationAndInitializeInsights(completion: @escaping (Bool) -> Void) {
         loadConfiguration { configuration in
             if let configuration = configuration {
                 self.initializeInsights(configuration: configuration)
@@ -150,7 +150,7 @@ public class HyperwalletInsights: HyperwalletInsightsProtocol {
         }
     }
 
-    private func loadConfiguration(completion: @escaping(Configuration?) -> Void) {
+    private func loadConfiguration(completion: @escaping (Configuration?) -> Void) {
         // Fetch configuration again
         Hyperwallet.shared.getConfiguration { configuration, _ in
             if let configuration = configuration {
diff --git a/Common/Tests/Helper/AuthenticationProviderMock.swift b/Common/Tests/Helper/AuthenticationProviderMock.swift
@@ -19,7 +19,7 @@ class AuthenticationProviderMock: HyperwalletAuthenticationTokenProvider {
         error = nil
     }
 
-    func retrieveAuthenticationToken(completionHandler authenticationTokenHandler: @escaping
+    func retrieveAuthenticationToken(completionHandler authenticationTokenHandler: @escaping 
         AuthenticationProviderMock.CompletionHandler) {
         hasRequestedClientToken = true
         authenticationTokenHandler(authorizationData, error)
diff --git a/Demo/IntegratorAuthenticationProvider.swift b/Demo/IntegratorAuthenticationProvider.swift
@@ -30,7 +30,7 @@ public class IntegratorAuthenticationProvider: HyperwalletAuthenticationTokenPro
         self.session = IntegratorAuthenticationProvider.createUrlSession(username: user, password: password)
     }
 
-    public func retrieveAuthenticationToken(completionHandler: @escaping
+    public func retrieveAuthenticationToken(completionHandler: @escaping 
         HyperwalletAuthenticationTokenProvider.CompletionHandler) {
         var request = URLRequest(url: URL(string: url)!)
         request.httpMethod = "POST"
diff --git a/Transfer/Sources/ListTransferDestinationController.swift b/Transfer/Sources/ListTransferDestinationController.swift
@@ -179,7 +179,7 @@ extension ListTransferDestinationController {
 extension ListTransferDestinationController {
     /// The callback to refresh create transfer
     override public func didFlowComplete(with response: Any) {
-        if response as? HyperwalletTransferMethod != nil {
+        if response is HyperwalletTransferMethod {
             navigationController?.popViewController(animated: false)
             flowDelegate?.didFlowComplete(with: response)
         }
diff --git a/Transfer/Sources/ListTransferSourceController.swift b/Transfer/Sources/ListTransferSourceController.swift
@@ -104,7 +104,7 @@ extension ListTransferSourceController {
 extension ListTransferSourceController {
     /// The callback to refresh create transfer
     override public func didFlowComplete(with response: Any) {
-        if response as? HyperwalletTransferMethod != nil {
+        if response is HyperwalletTransferMethod {
             navigationController?.popViewController(animated: false)
             flowDelegate?.didFlowComplete(with: response)
         }
diff --git a/Transfer/Sources/ScheduleTransferSectionData.swift b/Transfer/Sources/ScheduleTransferSectionData.swift
@@ -39,12 +39,16 @@ extension ScheduleTransferSectionData {
         switch scheduleTransferSectionHeader.rawValue {
         case "source":
             return "mobileTransferFromLabel".localized()
+
         case "destination":
             return "mobileTransferToLabel".localized()
+
         case "notes":
             return "mobileNoteLabel".localized()
+
         case "summary":
             return "mobileSummaryLabel".localized()
+
         case "foreignExchange":
             return "mobileFXlabel".localized()
 
diff --git a/TransferMethod/Sources/AddTransferMethodSectionData.swift b/TransferMethod/Sources/AddTransferMethodSectionData.swift
@@ -35,8 +35,10 @@ final class AddTransferMethodSectionData {
             return String(format: format,
                           Locale.current.localizedString(forRegionCode: country ?? "") ?? "",
                           currency ?? "").uppercased()
+
         case "CREATE_BUTTON":
             return nil
+
         case "INFORMATION":
             return "mobileFeesAndProcessingTime".localized()
 
diff --git a/TransferMethod/Sources/ListTransferMethodController.swift b/TransferMethod/Sources/ListTransferMethodController.swift
@@ -233,7 +233,7 @@ extension ListTransferMethodController: ListTransferMethodView {
 extension ListTransferMethodController {
     /// The callback to refresh transfer method list
     override public func didFlowComplete(with response: Any) {
-        if response as? HyperwalletTransferMethod != nil {
+        if response is HyperwalletTransferMethod {
             coordinator?.navigateBackFromNextPage(with: response)
             // refresh transfer method list
             presenter.listTransferMethods()
diff --git a/TransferMethod/Sources/ListTransferMethodPresenter.swift b/TransferMethod/Sources/ListTransferMethodPresenter.swift
@@ -40,7 +40,7 @@ final class ListTransferMethodPresenter {
     private weak var view: ListTransferMethodView?
     private let pageGroup = "transfer-method"
     private let pageName = "transfer-method:add:list-transfer-method"
-    private (set) var sectionData = [HyperwalletTransferMethod]()
+    private(set) var sectionData = [HyperwalletTransferMethod]()
     private lazy var transferMethodRepository = {
         TransferMethodRepositoryFactory.shared.transferMethodRepository()
     }()
diff --git a/TransferMethod/Sources/SelectTransferMethodTypeController.swift b/TransferMethod/Sources/SelectTransferMethodTypeController.swift
@@ -268,7 +268,7 @@ extension CountryCurrencyTableView: UITableViewDelegate {
 extension SelectTransferMethodTypeController {
     /// This function will navigate back from next page and pass the control back to it's caller
     override public func didFlowComplete(with response: Any) {
-        if response as? HyperwalletTransferMethod != nil {
+        if response is HyperwalletTransferMethod {
             coordinator?.navigateBackFromNextPage(with: response)
             removeCoordinator()
             flowDelegate?.didFlowComplete(with: response)
diff --git a/TransferMethod/Sources/SelectTransferMethodTypePresenter.swift b/TransferMethod/Sources/SelectTransferMethodTypePresenter.swift
@@ -54,9 +54,9 @@ protocol SelectTransferMethodTypeView: AnyObject {
 final class SelectTransferMethodTypePresenter {
     // MARK: properties
     private weak var view: SelectTransferMethodTypeView?
-    private (set) var countryCurrencySectionData = [String]()
-    private (set) var selectedCountry = ""
-    private (set) var selectedCurrency = ""
+    private(set) var countryCurrencySectionData = [String]()
+    private(set) var selectedCountry = ""
+    private(set) var selectedCurrency = ""
     private let pageName = "transfer-method:add:select-transfer-method"
     private let pageGroup = "transfer-method"
     private let linkCountry = "select-country"
@@ -73,7 +73,7 @@ final class SelectTransferMethodTypePresenter {
         UserRepositoryFactory.shared.userRepository()
     }()
 
-    private (set) var sectionData = [HyperwalletTransferMethodType]()
+    private(set) var sectionData = [HyperwalletTransferMethodType]()
 
     /// Initialize SelectTransferMethodPresenter
     init(_ view: SelectTransferMethodTypeView,
diff --git a/TransferMethod/Sources/UpdateTransferMethodSectionData.swift b/TransferMethod/Sources/UpdateTransferMethodSectionData.swift
@@ -35,6 +35,7 @@ final class UpdateTransferMethodSectionData {
             return String(format: format,
                           Locale.current.localizedString(forRegionCode: country ?? "") ?? "",
                           currency ?? "").uppercased()
+
         case "UPDATE_BUTTON":
             return nil
 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -6,7 +6,7 @@ end
 lane :unit_tests do
   run_tests(
     project: "HyperwalletUISDK.xcodeproj",
-    devices: ['iPhone 14 Pro'],
+    devices: ['iPhone 15 Pro'],
     derived_data_path: './output',
     scheme: "HyperwalletUISDK",
     configuration: 'Debug',
@@ -18,7 +18,7 @@ end
 lane :ui_tests do
   run_tests(
     project: "HyperwalletUISDK.xcodeproj",
-    devices: ['iPhone 13 Pro Max'],
+    devices: ['iPhone 15 Pro Max'],
     scheme: "Demo",
     configuration: 'XCUITest',
     number_of_retries: 3,

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public class HyperwalletInsights: HyperwalletInsightsProtocol {`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
`142`		`- private func loadConfigurationAndInitializeInsights(completion: @escaping(Bool) -> Void) {`
	`142`	`+ private func loadConfigurationAndInitializeInsights(completion: @escaping (Bool) -> Void) {`
`143`	`143`	`loadConfiguration { configuration in`
`144`	`144`	`if let configuration = configuration {`
`145`	`145`	`self.initializeInsights(configuration: configuration)`
`@@ -150,7 +150,7 @@ public class HyperwalletInsights: HyperwalletInsightsProtocol {`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`153`		`- private func loadConfiguration(completion: @escaping(Configuration?) -> Void) {`
	`153`	`+ private func loadConfiguration(completion: @escaping (Configuration?) -> Void) {`
`154`	`154`	`// Fetch configuration again`
`155`	`155`	`Hyperwallet.shared.getConfiguration { configuration, _ in`
`156`	`156`	`if let configuration = configuration {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class AuthenticationProviderMock: HyperwalletAuthenticationTokenProvider {`
`19`	`19`	`error = nil`
`20`	`20`	`}`
`21`	`21`
`22`		`- func retrieveAuthenticationToken(completionHandler authenticationTokenHandler: @escaping`
	`22`	`+ func retrieveAuthenticationToken(completionHandler authenticationTokenHandler: @escaping`
`23`	`23`	`AuthenticationProviderMock.CompletionHandler) {`
`24`	`24`	`hasRequestedClientToken = true`
`25`	`25`	`authenticationTokenHandler(authorizationData, error)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class IntegratorAuthenticationProvider: HyperwalletAuthenticationTokenPro`
`30`	`30`	`self.session = IntegratorAuthenticationProvider.createUrlSession(username: user, password: password)`
`31`	`31`	`}`
`32`	`32`
`33`		`- public func retrieveAuthenticationToken(completionHandler: @escaping`
	`33`	`+ public func retrieveAuthenticationToken(completionHandler: @escaping`
`34`	`34`	`HyperwalletAuthenticationTokenProvider.CompletionHandler) {`
`35`	`35`	`var request = URLRequest(url: URL(string: url)!)`
`36`	`36`	`request.httpMethod = "POST"`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ extension ListTransferDestinationController {`
`179`	`179`	`extension ListTransferDestinationController {`
`180`	`180`	`/// The callback to refresh create transfer`
`181`	`181`	`override public func didFlowComplete(with response: Any) {`
`182`		`- if response as? HyperwalletTransferMethod != nil {`
	`182`	`+ if response is HyperwalletTransferMethod {`
`183`	`183`	`navigationController?.popViewController(animated: false)`
`184`	`184`	`flowDelegate?.didFlowComplete(with: response)`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ extension ListTransferSourceController {`
`104`	`104`	`extension ListTransferSourceController {`
`105`	`105`	`/// The callback to refresh create transfer`
`106`	`106`	`override public func didFlowComplete(with response: Any) {`
`107`		`- if response as? HyperwalletTransferMethod != nil {`
	`107`	`+ if response is HyperwalletTransferMethod {`
`108`	`108`	`navigationController?.popViewController(animated: false)`
`109`	`109`	`flowDelegate?.didFlowComplete(with: response)`
`110`	`110`	`}`