From 70720b3c264dae40e9a4ff962e5dc4f9c8ba1327 Mon Sep 17 00:00:00 2001 From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com> Date: Fri, 4 Sep 2020 19:31:43 -0700 Subject: [PATCH] Sort imports --- .swiftlint.yml | 2 ++ DB/Sources/DB/Content/AccountResult.swift | 1 - DB/Sources/DB/Content/ContentDatabase.swift | 2 +- DB/Sources/DB/Content/StatusResult.swift | 1 - DB/Sources/DB/Identity/IdentityDatabase.swift | 2 +- DB/Tests/DBTests/DBTests.swift | 2 +- Extensions/KingfisherOptionsInfo+Extensions.swift | 10 +++++----- Extensions/NSMutableAttributedString+Extensions.swift | 2 +- HTTP/Sources/HTTP/Client.swift | 4 ++-- HTTP/Sources/HTTP/Target.swift | 2 +- HTTP/Tests/HTTPTests/HTTPTests.swift | 2 +- Keychain/Tests/KeychainTests/KeychainTests.swift | 2 +- Mastodon/Sources/Mastodon/Constants.swift | 2 ++ Mastodon/Tests/MastodonTests/MastodonTests.swift | 2 +- .../Sources/MastodonAPI/MastodonAPIClient.swift | 2 +- .../Tests/MastodonAPITests/MastodonAPITests.swift | 2 +- .../NotificationService.swift | 2 +- Secrets/Tests/SecretsTests/SecretsTests.swift | 2 +- .../ServiceLayer/Services/AllIdentitiesService.swift | 2 +- .../ServiceLayer/Services/AuthenticationService.swift | 2 +- .../ServiceLayer/Services/IdentityService.swift | 2 +- .../Sources/ServiceLayer/Services/StatusService.swift | 2 +- .../Services/UserNotificationService.swift | 2 +- .../ServiceLayer/Utilities/WebAuthSession.swift | 2 +- .../ServiceLayerTests/AuthenticationServiceTests.swift | 2 +- System/AppDelegate.swift | 2 +- View Controllers/StatusListViewController.swift | 2 +- .../Sources/PreviewViewModels/ViewModelMocks.swift | 2 +- .../Sources/ViewModels/AddIdentityViewModel.swift | 2 +- .../Sources/ViewModels/EditFilterViewModel.swift | 2 +- .../ViewModels/Extensions/Publisher+Extensions.swift | 2 +- ViewModels/Sources/ViewModels/FiltersViewModel.swift | 2 +- ViewModels/Sources/ViewModels/ListsViewModel.swift | 2 +- .../NotificationTypesPreferencesViewModel.swift | 2 +- .../PostingReadingPreferencesViewModel.swift | 2 +- ViewModels/Sources/ViewModels/RootViewModel.swift | 2 +- .../Sources/ViewModels/StatusListViewModel.swift | 2 +- ViewModels/Sources/ViewModels/StatusViewModel.swift | 2 +- .../Sources/ViewModels/TabNavigationViewModel.swift | 2 +- .../ViewModelsTests/AddIdentityViewModelTests.swift | 2 +- .../Tests/ViewModelsTests/RootViewModelTests.swift | 2 +- Views/Attachments/AttachmentView.swift | 2 +- Views/IdentitiesView.swift | 2 +- Views/SecondaryNavigationView.swift | 2 +- Views/TabNavigationView.swift | 2 +- 45 files changed, 50 insertions(+), 48 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index e590428..901eec4 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -3,3 +3,5 @@ disabled_rules: # Swift 5.3 - multiple_closures_with_trailing_closure - no_space_in_method_call +opt_in_rules: + - sorted_imports diff --git a/DB/Sources/DB/Content/AccountResult.swift b/DB/Sources/DB/Content/AccountResult.swift index 565abdc..69dd51c 100644 --- a/DB/Sources/DB/Content/AccountResult.swift +++ b/DB/Sources/DB/Content/AccountResult.swift @@ -2,7 +2,6 @@ import Foundation import GRDB -import Mastodon struct AccountResult: Codable, Hashable, FetchableRecord { let account: AccountRecord diff --git a/DB/Sources/DB/Content/ContentDatabase.swift b/DB/Sources/DB/Content/ContentDatabase.swift index 3d90f1f..e41b7bb 100644 --- a/DB/Sources/DB/Content/ContentDatabase.swift +++ b/DB/Sources/DB/Content/ContentDatabase.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import GRDB import Keychain import Mastodon diff --git a/DB/Sources/DB/Content/StatusResult.swift b/DB/Sources/DB/Content/StatusResult.swift index f55c4f2..73b6d08 100644 --- a/DB/Sources/DB/Content/StatusResult.swift +++ b/DB/Sources/DB/Content/StatusResult.swift @@ -2,7 +2,6 @@ import Foundation import GRDB -import Mastodon struct StatusResult: Codable, Hashable, FetchableRecord { let account: AccountRecord diff --git a/DB/Sources/DB/Identity/IdentityDatabase.swift b/DB/Sources/DB/Identity/IdentityDatabase.swift index ded6bc4..0d4d10d 100644 --- a/DB/Sources/DB/Identity/IdentityDatabase.swift +++ b/DB/Sources/DB/Identity/IdentityDatabase.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import GRDB import Keychain import Mastodon diff --git a/DB/Tests/DBTests/DBTests.swift b/DB/Tests/DBTests/DBTests.swift index 7394c0f..a24c1cb 100644 --- a/DB/Tests/DBTests/DBTests.swift +++ b/DB/Tests/DBTests/DBTests.swift @@ -1,5 +1,5 @@ -import XCTest @testable import DB +import XCTest final class DBTests: XCTestCase { func testExample() { diff --git a/Extensions/KingfisherOptionsInfo+Extensions.swift b/Extensions/KingfisherOptionsInfo+Extensions.swift index 204fb59..03482c6 100644 --- a/Extensions/KingfisherOptionsInfo+Extensions.swift +++ b/Extensions/KingfisherOptionsInfo+Extensions.swift @@ -1,12 +1,12 @@ // Copyright © 2020 Metabolist. All rights reserved. -import SwiftUI -import KingfisherSwiftUI -import struct Kingfisher.KingfisherOptionsInfo -import protocol Kingfisher.ImageProcessor import struct Kingfisher.DownsamplingImageProcessor -import struct Kingfisher.RoundCornerImageProcessor import struct Kingfisher.FormatIndicatedCacheSerializer +import protocol Kingfisher.ImageProcessor +import struct Kingfisher.KingfisherOptionsInfo +import struct Kingfisher.RoundCornerImageProcessor +import KingfisherSwiftUI +import SwiftUI extension KingfisherOptionsInfo { static func downsampled(size: CGSize, scaleFactor: CGFloat, rounded: Bool = true) -> Self { diff --git a/Extensions/NSMutableAttributedString+Extensions.swift b/Extensions/NSMutableAttributedString+Extensions.swift index 89c134b..3aae809 100644 --- a/Extensions/NSMutableAttributedString+Extensions.swift +++ b/Extensions/NSMutableAttributedString+Extensions.swift @@ -1,8 +1,8 @@ // Copyright © 2020 Metabolist. All rights reserved. -import UIKit import Kingfisher import Mastodon +import UIKit extension NSMutableAttributedString { func insert(emoji: [Emoji], view: UIView) { diff --git a/HTTP/Sources/HTTP/Client.swift b/HTTP/Sources/HTTP/Client.swift index df60f40..2ee741c 100644 --- a/HTTP/Sources/HTTP/Client.swift +++ b/HTTP/Sources/HTTP/Client.swift @@ -1,8 +1,8 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation -import Combine import Alamofire +import Combine +import Foundation public typealias Session = Alamofire.Session diff --git a/HTTP/Sources/HTTP/Target.swift b/HTTP/Sources/HTTP/Target.swift index 1a335c9..47dd6de 100644 --- a/HTTP/Sources/HTTP/Target.swift +++ b/HTTP/Sources/HTTP/Target.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Alamofire +import Foundation public typealias HTTPMethod = Alamofire.HTTPMethod public typealias HTTPHeaders = Alamofire.HTTPHeaders diff --git a/HTTP/Tests/HTTPTests/HTTPTests.swift b/HTTP/Tests/HTTPTests/HTTPTests.swift index 6049cda..71c92d1 100644 --- a/HTTP/Tests/HTTPTests/HTTPTests.swift +++ b/HTTP/Tests/HTTPTests/HTTPTests.swift @@ -1,5 +1,5 @@ -import XCTest @testable import HTTP +import XCTest final class HTTPTests: XCTestCase { func testExample() { diff --git a/Keychain/Tests/KeychainTests/KeychainTests.swift b/Keychain/Tests/KeychainTests/KeychainTests.swift index ddb8d72..60637e2 100644 --- a/Keychain/Tests/KeychainTests/KeychainTests.swift +++ b/Keychain/Tests/KeychainTests/KeychainTests.swift @@ -1,5 +1,5 @@ -import XCTest @testable import Keychain +import XCTest final class KeychainTests: XCTestCase { func testExample() { diff --git a/Mastodon/Sources/Mastodon/Constants.swift b/Mastodon/Sources/Mastodon/Constants.swift index 15d4594..7123cb0 100644 --- a/Mastodon/Sources/Mastodon/Constants.swift +++ b/Mastodon/Sources/Mastodon/Constants.swift @@ -1,3 +1,5 @@ +// Copyright © 2020 Metabolist. All rights reserved. + import Foundation public enum Constants { diff --git a/Mastodon/Tests/MastodonTests/MastodonTests.swift b/Mastodon/Tests/MastodonTests/MastodonTests.swift index 1ed1f53..030669d 100644 --- a/Mastodon/Tests/MastodonTests/MastodonTests.swift +++ b/Mastodon/Tests/MastodonTests/MastodonTests.swift @@ -1,5 +1,5 @@ -import XCTest @testable import Mastodon +import XCTest final class MastodonTests: XCTestCase { func testExample() { diff --git a/MastodonAPI/Sources/MastodonAPI/MastodonAPIClient.swift b/MastodonAPI/Sources/MastodonAPI/MastodonAPIClient.swift index d50942d..c330612 100644 --- a/MastodonAPI/Sources/MastodonAPI/MastodonAPIClient.swift +++ b/MastodonAPI/Sources/MastodonAPI/MastodonAPIClient.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import HTTP import Mastodon diff --git a/MastodonAPI/Tests/MastodonAPITests/MastodonAPITests.swift b/MastodonAPI/Tests/MastodonAPITests/MastodonAPITests.swift index bb31e5e..09db677 100644 --- a/MastodonAPI/Tests/MastodonAPITests/MastodonAPITests.swift +++ b/MastodonAPI/Tests/MastodonAPITests/MastodonAPITests.swift @@ -1,5 +1,5 @@ -import XCTest @testable import MastodonAPI +import XCTest final class MastodonAPITests: XCTestCase { func testExample() { diff --git a/Notification Service Extension/NotificationService.swift b/Notification Service Extension/NotificationService.swift index c88195a..371a005 100644 --- a/Notification Service Extension/NotificationService.swift +++ b/Notification Service Extension/NotificationService.swift @@ -1,10 +1,10 @@ // Copyright © 2020 Metabolist. All rights reserved. -import UserNotifications import CryptoKit import Keychain import Mastodon import Secrets +import UserNotifications class NotificationService: UNNotificationServiceExtension { diff --git a/Secrets/Tests/SecretsTests/SecretsTests.swift b/Secrets/Tests/SecretsTests/SecretsTests.swift index 77d3bf6..d98191a 100644 --- a/Secrets/Tests/SecretsTests/SecretsTests.swift +++ b/Secrets/Tests/SecretsTests/SecretsTests.swift @@ -1,5 +1,5 @@ -import XCTest @testable import Secrets +import XCTest final class SecretsTests: XCTestCase { func testExample() { diff --git a/ServiceLayer/Sources/ServiceLayer/Services/AllIdentitiesService.swift b/ServiceLayer/Sources/ServiceLayer/Services/AllIdentitiesService.swift index 976dc87..f182aec 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/AllIdentitiesService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/AllIdentitiesService.swift @@ -1,8 +1,8 @@ // Copyright © 2020 Metabolist. All rights reserved. +import Combine import DB import Foundation -import Combine import Mastodon import MastodonAPI import Secrets diff --git a/ServiceLayer/Sources/ServiceLayer/Services/AuthenticationService.swift b/ServiceLayer/Sources/ServiceLayer/Services/AuthenticationService.swift index 53e9285..a87a7c3 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/AuthenticationService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/AuthenticationService.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import Mastodon import MastodonAPI diff --git a/ServiceLayer/Sources/ServiceLayer/Services/IdentityService.swift b/ServiceLayer/Sources/ServiceLayer/Services/IdentityService.swift index 36e5939..a7eec3f 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/IdentityService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/IdentityService.swift @@ -1,8 +1,8 @@ // Copyright © 2020 Metabolist. All rights reserved. +import Combine import DB import Foundation -import Combine import Mastodon import MastodonAPI import Secrets diff --git a/ServiceLayer/Sources/ServiceLayer/Services/StatusService.swift b/ServiceLayer/Sources/ServiceLayer/Services/StatusService.swift index 3601feb..e6d461c 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/StatusService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/StatusService.swift @@ -1,8 +1,8 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine import DB +import Foundation import Mastodon import MastodonAPI diff --git a/ServiceLayer/Sources/ServiceLayer/Services/UserNotificationService.swift b/ServiceLayer/Sources/ServiceLayer/Services/UserNotificationService.swift index 1d1da8b..402a893 100644 --- a/ServiceLayer/Sources/ServiceLayer/Services/UserNotificationService.swift +++ b/ServiceLayer/Sources/ServiceLayer/Services/UserNotificationService.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import UserNotifications public struct UserNotificationService { diff --git a/ServiceLayer/Sources/ServiceLayer/Utilities/WebAuthSession.swift b/ServiceLayer/Sources/ServiceLayer/Utilities/WebAuthSession.swift index da10636..5db626a 100644 --- a/ServiceLayer/Sources/ServiceLayer/Utilities/WebAuthSession.swift +++ b/ServiceLayer/Sources/ServiceLayer/Utilities/WebAuthSession.swift @@ -1,8 +1,8 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import AuthenticationServices import Combine +import Foundation public protocol WebAuthSession: AnyObject { init(url URL: URL, diff --git a/ServiceLayer/Tests/ServiceLayerTests/AuthenticationServiceTests.swift b/ServiceLayer/Tests/ServiceLayerTests/AuthenticationServiceTests.swift index 8d34992..bf5824b 100644 --- a/ServiceLayer/Tests/ServiceLayerTests/AuthenticationServiceTests.swift +++ b/ServiceLayer/Tests/ServiceLayerTests/AuthenticationServiceTests.swift @@ -1,10 +1,10 @@ // Copyright © 2020 Metabolist. All rights reserved. -import XCTest import Combine import CombineExpectations @testable import ServiceLayer @testable import ServiceLayerMocks +import XCTest class AuthenticationServiceTests: XCTestCase { func testAuthentication() throws { diff --git a/System/AppDelegate.swift b/System/AppDelegate.swift index e61674d..72d6639 100644 --- a/System/AppDelegate.swift +++ b/System/AppDelegate.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import UIKit import Combine +import UIKit class AppDelegate: NSObject { @Published private var application: UIApplication? diff --git a/View Controllers/StatusListViewController.swift b/View Controllers/StatusListViewController.swift index 919443e..2994bcb 100644 --- a/View Controllers/StatusListViewController.swift +++ b/View Controllers/StatusListViewController.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import SwiftUI import Combine +import SwiftUI import ViewModels class StatusListViewController: UITableViewController { diff --git a/ViewModels/Sources/PreviewViewModels/ViewModelMocks.swift b/ViewModels/Sources/PreviewViewModels/ViewModelMocks.swift index bbeaab2..7cfa236 100644 --- a/ViewModels/Sources/PreviewViewModels/ViewModelMocks.swift +++ b/ViewModels/Sources/PreviewViewModels/ViewModelMocks.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import HTTP import Mastodon import MastodonAPI diff --git a/ViewModels/Sources/ViewModels/AddIdentityViewModel.swift b/ViewModels/Sources/ViewModels/AddIdentityViewModel.swift index 80752c4..217a8df 100644 --- a/ViewModels/Sources/ViewModels/AddIdentityViewModel.swift +++ b/ViewModels/Sources/ViewModels/AddIdentityViewModel.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import ServiceLayer public class AddIdentityViewModel: ObservableObject { diff --git a/ViewModels/Sources/ViewModels/EditFilterViewModel.swift b/ViewModels/Sources/ViewModels/EditFilterViewModel.swift index 7b4f6b3..477178d 100644 --- a/ViewModels/Sources/ViewModels/EditFilterViewModel.swift +++ b/ViewModels/Sources/ViewModels/EditFilterViewModel.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import Mastodon import ServiceLayer diff --git a/ViewModels/Sources/ViewModels/Extensions/Publisher+Extensions.swift b/ViewModels/Sources/ViewModels/Extensions/Publisher+Extensions.swift index 7a35c60..7b01be4 100644 --- a/ViewModels/Sources/ViewModels/Extensions/Publisher+Extensions.swift +++ b/ViewModels/Sources/ViewModels/Extensions/Publisher+Extensions.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation extension Publisher { func assignErrorsToAlertItem( diff --git a/ViewModels/Sources/ViewModels/FiltersViewModel.swift b/ViewModels/Sources/ViewModels/FiltersViewModel.swift index ea34550..065bfe7 100644 --- a/ViewModels/Sources/ViewModels/FiltersViewModel.swift +++ b/ViewModels/Sources/ViewModels/FiltersViewModel.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import Mastodon import ServiceLayer diff --git a/ViewModels/Sources/ViewModels/ListsViewModel.swift b/ViewModels/Sources/ViewModels/ListsViewModel.swift index fcc2f3f..9a8a350 100644 --- a/ViewModels/Sources/ViewModels/ListsViewModel.swift +++ b/ViewModels/Sources/ViewModels/ListsViewModel.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import Mastodon import ServiceLayer diff --git a/ViewModels/Sources/ViewModels/NotificationTypesPreferencesViewModel.swift b/ViewModels/Sources/ViewModels/NotificationTypesPreferencesViewModel.swift index a246a02..c5118bc 100644 --- a/ViewModels/Sources/ViewModels/NotificationTypesPreferencesViewModel.swift +++ b/ViewModels/Sources/ViewModels/NotificationTypesPreferencesViewModel.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import Mastodon import ServiceLayer diff --git a/ViewModels/Sources/ViewModels/PostingReadingPreferencesViewModel.swift b/ViewModels/Sources/ViewModels/PostingReadingPreferencesViewModel.swift index e80a17e..0544153 100644 --- a/ViewModels/Sources/ViewModels/PostingReadingPreferencesViewModel.swift +++ b/ViewModels/Sources/ViewModels/PostingReadingPreferencesViewModel.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import ServiceLayer public class PostingReadingPreferencesViewModel: ObservableObject { diff --git a/ViewModels/Sources/ViewModels/RootViewModel.swift b/ViewModels/Sources/ViewModels/RootViewModel.swift index 967827d..bcddfc5 100644 --- a/ViewModels/Sources/ViewModels/RootViewModel.swift +++ b/ViewModels/Sources/ViewModels/RootViewModel.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import ServiceLayer public final class RootViewModel: ObservableObject { diff --git a/ViewModels/Sources/ViewModels/StatusListViewModel.swift b/ViewModels/Sources/ViewModels/StatusListViewModel.swift index 467b7c8..22f3d37 100644 --- a/ViewModels/Sources/ViewModels/StatusListViewModel.swift +++ b/ViewModels/Sources/ViewModels/StatusListViewModel.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import Mastodon import ServiceLayer diff --git a/ViewModels/Sources/ViewModels/StatusViewModel.swift b/ViewModels/Sources/ViewModels/StatusViewModel.swift index cb9a612..bdf9706 100644 --- a/ViewModels/Sources/ViewModels/StatusViewModel.swift +++ b/ViewModels/Sources/ViewModels/StatusViewModel.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import Mastodon import ServiceLayer diff --git a/ViewModels/Sources/ViewModels/TabNavigationViewModel.swift b/ViewModels/Sources/ViewModels/TabNavigationViewModel.swift index c123eb8..98fa00c 100644 --- a/ViewModels/Sources/ViewModels/TabNavigationViewModel.swift +++ b/ViewModels/Sources/ViewModels/TabNavigationViewModel.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import Foundation import Combine +import Foundation import Mastodon import ServiceLayer diff --git a/ViewModels/Tests/ViewModelsTests/AddIdentityViewModelTests.swift b/ViewModels/Tests/ViewModelsTests/AddIdentityViewModelTests.swift index 4d56831..70b5195 100644 --- a/ViewModels/Tests/ViewModelsTests/AddIdentityViewModelTests.swift +++ b/ViewModels/Tests/ViewModelsTests/AddIdentityViewModelTests.swift @@ -1,6 +1,5 @@ // Copyright © 2020 Metabolist. All rights reserved. -import XCTest import Combine import CombineExpectations import HTTP @@ -9,6 +8,7 @@ import MockKeychain import ServiceLayer import ServiceLayerMocks @testable import ViewModels +import XCTest class AddIdentityViewModelTests: XCTestCase { func testAddIdentity() throws { diff --git a/ViewModels/Tests/ViewModelsTests/RootViewModelTests.swift b/ViewModels/Tests/ViewModelsTests/RootViewModelTests.swift index 3a8a182..caa94fa 100644 --- a/ViewModels/Tests/ViewModelsTests/RootViewModelTests.swift +++ b/ViewModels/Tests/ViewModelsTests/RootViewModelTests.swift @@ -1,11 +1,11 @@ // Copyright © 2020 Metabolist. All rights reserved. -import XCTest import Combine import CombineExpectations import ServiceLayer import ServiceLayerMocks @testable import ViewModels +import XCTest class RootViewModelTests: XCTestCase { var cancellables = Set() diff --git a/Views/Attachments/AttachmentView.swift b/Views/Attachments/AttachmentView.swift index ef6d7b2..42083d2 100644 --- a/Views/Attachments/AttachmentView.swift +++ b/Views/Attachments/AttachmentView.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import UIKit import Kingfisher +import UIKit import ViewModels class AttachmentView: UIView { diff --git a/Views/IdentitiesView.swift b/Views/IdentitiesView.swift index 28a4142..58e47f4 100644 --- a/Views/IdentitiesView.swift +++ b/Views/IdentitiesView.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import SwiftUI import KingfisherSwiftUI +import SwiftUI import ViewModels struct IdentitiesView: View { diff --git a/Views/SecondaryNavigationView.swift b/Views/SecondaryNavigationView.swift index faae71a..9935594 100644 --- a/Views/SecondaryNavigationView.swift +++ b/Views/SecondaryNavigationView.swift @@ -1,7 +1,7 @@ // Copyright © 2020 Metabolist. All rights reserved. -import SwiftUI import KingfisherSwiftUI +import SwiftUI import ViewModels struct SecondaryNavigationView: View { diff --git a/Views/TabNavigationView.swift b/Views/TabNavigationView.swift index 97496d1..bddce3b 100644 --- a/Views/TabNavigationView.swift +++ b/Views/TabNavigationView.swift @@ -1,8 +1,8 @@ // Copyright © 2020 Metabolist. All rights reserved. -import SwiftUI import KingfisherSwiftUI import enum Mastodon.Timeline +import SwiftUI import ViewModels struct TabNavigationView: View {