From ffe1eed6b6693842115d0c9f023837b14d6f061f Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Thu, 28 Apr 2022 12:38:36 -0700 Subject: [PATCH] remove extra combine imports --- .../OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift | 1 - .../OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift | 1 - apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift | 1 - apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift | 1 - .../Sources/App/Views/RootView/RootViewModel.swift | 1 - .../Sources/App/Views/WebReader/WebReaderContainer.swift | 1 - .../Sources/App/Views/WebReader/WebReaderCoordinator.swift | 1 - .../Services/DataService/Mutations/CreateLabelPublisher.swift | 1 - .../DataService/Mutations/CreateNewsletterEmailMutation.swift | 1 - .../Services/DataService/Mutations/CreateReminder.swift | 1 - .../Sources/Services/DataService/Mutations/DeviceToken.swift | 1 - .../Services/DataService/Mutations/RemoveLabelPublisher.swift | 1 - .../Networking/ServerResources/CreateGoogleToken.swift | 1 - .../Services/DataService/Queries/LabelsPublisher.swift | 1 - .../Sources/Services/DataService/Queries/ViewerFetcher.swift | 1 - apple/OmnivoreKit/Sources/Utils/ImageCache.swift | 4 +--- apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift | 1 - apple/Sources/AppDelegate.swift | 3 --- 18 files changed, 1 insertion(+), 22 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index 9e31848d7..5d2256514 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -1,4 +1,3 @@ -import Combine import Models import Services import SwiftUI diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift index 7c354f05c..6f7113865 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift @@ -1,4 +1,3 @@ -import Combine import Models import Services import SwiftUI diff --git a/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift b/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift index 8841ba98b..c91ba2484 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift @@ -1,4 +1,3 @@ -import Combine import Models import Services import SwiftUI diff --git a/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift b/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift index 68071010a..721680f70 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift @@ -1,4 +1,3 @@ -import Combine import Models import Services import SwiftUI diff --git a/apple/OmnivoreKit/Sources/App/Views/RootView/RootViewModel.swift b/apple/OmnivoreKit/Sources/App/Views/RootView/RootViewModel.swift index 3ed6b0654..bcbf989d9 100644 --- a/apple/OmnivoreKit/Sources/App/Views/RootView/RootViewModel.swift +++ b/apple/OmnivoreKit/Sources/App/Views/RootView/RootViewModel.swift @@ -1,4 +1,3 @@ -import Combine import Foundation import Models import Services diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift index 7307a3aac..ff5434e1f 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift @@ -1,4 +1,3 @@ -import Combine import Models import Services import SwiftUI diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift index 54f7edb5b..30743cb71 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderCoordinator.swift @@ -1,4 +1,3 @@ -import Combine import Models import Services import SwiftUI diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateLabelPublisher.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateLabelPublisher.swift index 7c46fcddd..27e5785d0 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateLabelPublisher.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateLabelPublisher.swift @@ -1,4 +1,3 @@ -import Combine import CoreData import Foundation import Models diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateNewsletterEmailMutation.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateNewsletterEmailMutation.swift index 454a76c46..8537f135b 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateNewsletterEmailMutation.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateNewsletterEmailMutation.swift @@ -1,4 +1,3 @@ -import Combine import CoreData import Foundation import Models diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateReminder.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateReminder.swift index ee86cfd78..6277dd9be 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateReminder.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/CreateReminder.swift @@ -1,4 +1,3 @@ -import Combine import Foundation import Models import SwiftGraphQL diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/DeviceToken.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/DeviceToken.swift index dcc50beba..50c4485f0 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/DeviceToken.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/DeviceToken.swift @@ -1,4 +1,3 @@ -import Combine import Foundation import Models import SwiftGraphQL diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLabelPublisher.swift b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLabelPublisher.swift index 8b76b609b..7877fa133 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLabelPublisher.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Mutations/RemoveLabelPublisher.swift @@ -1,4 +1,3 @@ -import Combine import Foundation import Models import SwiftGraphQL diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreateGoogleToken.swift b/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreateGoogleToken.swift index e189cb9be..df241e3a7 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreateGoogleToken.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Networking/ServerResources/CreateGoogleToken.swift @@ -1,4 +1,3 @@ -import Combine import Foundation import Models diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/LabelsPublisher.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/LabelsPublisher.swift index fbf1160bf..639c5a9e3 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/LabelsPublisher.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/LabelsPublisher.swift @@ -1,4 +1,3 @@ -import Combine import CoreData import Foundation import Models diff --git a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ViewerFetcher.swift b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ViewerFetcher.swift index 45215938f..28f8668d2 100644 --- a/apple/OmnivoreKit/Sources/Services/DataService/Queries/ViewerFetcher.swift +++ b/apple/OmnivoreKit/Sources/Services/DataService/Queries/ViewerFetcher.swift @@ -1,4 +1,3 @@ -import Combine import CoreData import Foundation import Models diff --git a/apple/OmnivoreKit/Sources/Utils/ImageCache.swift b/apple/OmnivoreKit/Sources/Utils/ImageCache.swift index 0065e6f55..1e8e4416b 100644 --- a/apple/OmnivoreKit/Sources/Utils/ImageCache.swift +++ b/apple/OmnivoreKit/Sources/Utils/ImageCache.swift @@ -1,12 +1,10 @@ -import Combine - #if os(iOS) import UIKit public typealias PlatformImage = UIImage #elseif os(macOS) - import AppKit + public typealias PlatformImage = NSImage #endif diff --git a/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift b/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift index 337e4472a..7f8cfed25 100644 --- a/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift +++ b/apple/OmnivoreKit/Sources/Views/ShareExtensionView.swift @@ -1,4 +1,3 @@ -import Combine import Models import SwiftUI import Utils diff --git a/apple/Sources/AppDelegate.swift b/apple/Sources/AppDelegate.swift index 452343e2c..65779dba9 100644 --- a/apple/Sources/AppDelegate.swift +++ b/apple/Sources/AppDelegate.swift @@ -1,7 +1,6 @@ #if os(macOS) import AppKit #elseif os(iOS) - import Combine import Intercom import UIKit import Utils @@ -21,8 +20,6 @@ #elseif os(iOS) class AppDelegate: NSObject, UIApplicationDelegate { - var subscriptions = Set() - // override init() { // super.init() // UIColor.classInit