From 7ced7aebce5292e422ba5cc58461b447e115a9cb Mon Sep 17 00:00:00 2001 From: Franklin Byaruhanga Date: Tue, 10 Nov 2020 09:42:41 +0200 Subject: [PATCH 1/3] Fix the following SwiftLint warnings SnapshotHelper.swift:251:7: Inclusive Language Violation: Declaration hasWhiteListedIdentifier contains the term "whitelist" which is not considered inclusive. (inclusive_language) SnapshotHelper.swift:252:9: Inclusive Language Violation: Declaration whiteListedIdentifiers contains the term "whitelist" which is not considered inclusive. (inclusive_language) Constants.swift:49:20: Operator Usage Whitespace Violation: Operators should be surrounded by a single whitespace when they are being used. (operator_usage_whitespace) JSONAPIRelationship.swift:35:30: Operator Usage Whitespace Violation: Operators should be surrounded by a single whitespace when they are being used. (operator_usage_whitespace) JSONAPIDocument.swift:36:30: Operator Usage Whitespace Violation: Operators should be surrounded by a single whitespace when they are being used. (operator_usage_whitespace) Parameters.swift:209:12: Operator Usage Whitespace Violation: Operators should be surrounded by a single whitespace when they are being used. (operator_usage_whitespace) DownloadService.swift:558:54: Unused Closure Parameter Violation: Unused parameter "path" in a closure should be replaced with _. (unused_closure_parameter) --- Emitron/Emitron/Constants.swift | 2 +- Emitron/Emitron/Downloads/DownloadService.swift | 2 +- Emitron/Emitron/Networking/JSONAPI/JSONAPIDocument.swift | 2 +- .../Emitron/Networking/JSONAPI/JSONAPIRelationship.swift | 2 +- Emitron/Emitron/Networking/Requests/Parameters.swift | 2 +- Emitron/emitronScreenshots/SnapshotHelper.swift | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Emitron/Emitron/Constants.swift b/Emitron/Emitron/Constants.swift index d0f59aaf..ce933268 100644 --- a/Emitron/Emitron/Constants.swift +++ b/Emitron/Emitron/Constants.swift @@ -46,7 +46,7 @@ extension String { static let library = "Library" static let loading = "Loading…" static let myTutorials = "My Tutorials" - static let newest = "Newest" + static let newest = "Newest" static let popularity = "Popularity" static let resetFilters = "Reset Filters" static let search = "Search…" diff --git a/Emitron/Emitron/Downloads/DownloadService.swift b/Emitron/Emitron/Downloads/DownloadService.swift index 00503fbb..5804e607 100644 --- a/Emitron/Emitron/Downloads/DownloadService.swift +++ b/Emitron/Emitron/Downloads/DownloadService.swift @@ -555,7 +555,7 @@ extension DownloadService { extension DownloadService { private func configureWifiObservation() { // Track the network status - networkMonitor.pathUpdateHandler = { [weak self] path in + networkMonitor.pathUpdateHandler = { [weak self] _ in self?.checkQueueStatus() } networkMonitor.start(queue: DispatchQueue.global(qos: .utility)) diff --git a/Emitron/Emitron/Networking/JSONAPI/JSONAPIDocument.swift b/Emitron/Emitron/Networking/JSONAPI/JSONAPIDocument.swift index 2fc24bbf..f97629f4 100644 --- a/Emitron/Emitron/Networking/JSONAPI/JSONAPIDocument.swift +++ b/Emitron/Emitron/Networking/JSONAPI/JSONAPIDocument.swift @@ -33,7 +33,7 @@ class JSONAPIDocument { // MARK: - Properties var meta: [String: Any] = [:] var included: [JSONAPIResource] = [] - var data: [JSONAPIResource] = [] + var data: [JSONAPIResource] = [] var errors: [JSONAPIError] = [] var links: [String: URL] = [:] diff --git a/Emitron/Emitron/Networking/JSONAPI/JSONAPIRelationship.swift b/Emitron/Emitron/Networking/JSONAPI/JSONAPIRelationship.swift index 23a3fa8b..072acedb 100644 --- a/Emitron/Emitron/Networking/JSONAPI/JSONAPIRelationship.swift +++ b/Emitron/Emitron/Networking/JSONAPI/JSONAPIRelationship.swift @@ -32,7 +32,7 @@ import SwiftyJSON public class JSONAPIRelationship { // MARK: - Properties var meta: [String: Any] = [:] - var data: [JSONAPIResource] = [] + var data: [JSONAPIResource] = [] var links: [String: URL] = [:] var type: String = "" diff --git a/Emitron/Emitron/Networking/Requests/Parameters.swift b/Emitron/Emitron/Networking/Requests/Parameters.swift index f18081b6..e68c88ca 100644 --- a/Emitron/Emitron/Networking/Requests/Parameters.swift +++ b/Emitron/Emitron/Networking/Requests/Parameters.swift @@ -206,7 +206,7 @@ enum Param { static func sort(for value: ParameterSortValue, descending: Bool) -> Parameter { - let key = "sort" + let key = "sort" let value = "\(descending ? "-" : "")\(value.rawValue)" return Parameter(key: key, value: value, displayName: "Sort", sortOrdinal: 0) diff --git a/Emitron/emitronScreenshots/SnapshotHelper.swift b/Emitron/emitronScreenshots/SnapshotHelper.swift index baefa99d..0c253881 100644 --- a/Emitron/emitronScreenshots/SnapshotHelper.swift +++ b/Emitron/emitronScreenshots/SnapshotHelper.swift @@ -238,7 +238,7 @@ open class Snapshot: NSObject { private extension XCUIElementAttributes { var isNetworkLoadingIndicator: Bool { - if hasWhiteListedIdentifier { + if hasAllowedIdentifier { return false } @@ -248,10 +248,10 @@ private extension XCUIElementAttributes { return hasOldLoadingIndicatorSize || hasNewLoadingIndicatorSize } - var hasWhiteListedIdentifier: Bool { - let whiteListedIdentifiers = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"] + var hasAllowedIdentifier: Bool { + let allowedIdentifiers = ["GeofenceLocationTrackingOn", "StandardLocationTrackingOn"] - return whiteListedIdentifiers.contains(identifier) + return allowedIdentifiers.contains(identifier) } func isStatusBar(_ deviceWidth: CGFloat) -> Bool { From bd79db23666592a57f62a673076d7ce7ddc39524 Mon Sep 17 00:00:00 2001 From: Franklin Byaruhanga Date: Tue, 10 Nov 2020 10:15:28 +0200 Subject: [PATCH 2/3] Update swiftlint.yml --- .github/workflows/swiftlint.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swiftlint.yml b/.github/workflows/swiftlint.yml index b54caa63..6e848069 100644 --- a/.github/workflows/swiftlint.yml +++ b/.github/workflows/swiftlint.yml @@ -9,10 +9,13 @@ on: jobs: SwiftLint: - runs-on: ubuntu-latest + runs-on: macos-latest steps: - uses: actions/checkout@v1 - - name: GitHub Action for SwiftLint - uses: norio-nomura/action-swiftlint@3.1.0 + - name: Install Swiftlint + run: brew install swiftlint + + - name: Run Swiftlint + run: swiftlint with: args: --config Emitron/.swiftlint.yml From 23271554c46d987e3c11da1410bba35ba4a21084 Mon Sep 17 00:00:00 2001 From: Franklin Byaruhanga Date: Tue, 10 Nov 2020 10:36:41 +0200 Subject: [PATCH 3/3] Update swiftlint.yml --- .github/workflows/swiftlint.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/swiftlint.yml b/.github/workflows/swiftlint.yml index 6e848069..ba5023f4 100644 --- a/.github/workflows/swiftlint.yml +++ b/.github/workflows/swiftlint.yml @@ -16,6 +16,4 @@ jobs: run: brew install swiftlint - name: Run Swiftlint - run: swiftlint - with: - args: --config Emitron/.swiftlint.yml + run: swiftlint --config Emitron/.swiftlint.yml