Update [email protected] (#195)

FluidGroup · Mar 22, 2023 · 34b1a45 · 34b1a45
1 parent c15741d
commit 34b1a45
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 16 deletions.
diff --git a/Dev/Tests/BrightroomEngineTests/LoadingTests.swift b/Dev/Tests/BrightroomEngineTests/LoadingTests.swift
@@ -26,7 +26,7 @@ import Verge
 
 final class LoadingTests: XCTestCase {
 
-  var subs = Set<VergeAnyCancellable>()
+  var subs = Set<AnyCancellable>()
 
   func testOrientation() throws {
 

diff --git a/Package.resolved b/Package.resolved
@@ -19,6 +19,15 @@
           "version": "1.0.3"
         }
       },
+      {
+        "package": "swift-collections",
+        "repositoryURL": "https://github.com/apple/swift-collections",
+        "state": {
+          "branch": null,
+          "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2",
+          "version": "1.0.4"
+        }
+      },
       {
         "package": "TransitionPatch",
         "repositoryURL": "https://github.com/FluidGroup/TransitionPatch.git",
@@ -33,8 +42,8 @@
         "repositoryURL": "https://github.com/VergeGroup/Verge.git",
         "state": {
           "branch": null,
-          "revision": "2e26db99700c0a4268c0ab00b656209ae8ad8d6b",
-          "version": "11.0.0-beta.4"
+          "revision": "b380ac6505b6b58e4181b7ae5cf9b65948790bf8",
+          "version": "11.0.0-beta.5"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
     .library(name: "BrightroomUI", targets: ["BrightroomUI"]),
   ],
   dependencies: [
-    .package(name: "Verge", url: "https://github.com/VergeGroup/Verge.git", from: "11.0.0-beta.4"),
+    .package(name: "Verge", url: "https://github.com/VergeGroup/Verge.git", from: "11.0.0-beta.5"),
     .package(url: "https://github.com/FluidGroup/TransitionPatch.git", from: "1.0.3")
   ],
   targets: [

diff --git a/Sources/BrightroomEngine/Core/EditingStack.swift b/Sources/BrightroomEngine/Core/EditingStack.swift
@@ -241,8 +241,8 @@ open class EditingStack: Hashable, StoreComponentType {
 
   private let filterPresets: [FilterPreset]
 
-  private var subscriptions = Set<VergeAnyCancellable>()
-  private var imageProviderSubscription: VergeAnyCancellable?
+  private var subscriptions = Set<AnyCancellable>()
+  private var imageProviderSubscription: StoreSubscription?
 
   public var cropModifier: CropModifier
 

diff --git a/Sources/BrightroomUI/Built-in UI/ClassicImageEdit/ClassicImageEditViewController.swift b/Sources/BrightroomUI/Built-in UI/ClassicImageEdit/ClassicImageEditViewController.swift
@@ -114,7 +114,7 @@ public final class ClassicImageEditViewController: UIViewController {
     action: #selector(didTapCancelButton)
   )
 
-  private var subscriptions: Set<VergeAnyCancellable> = .init()
+  private var subscriptions: Set<AnyCancellable> = .init()
 
   private lazy var loadingView = LoadingBlurryOverlayView(
     effect: UIBlurEffect(style: .dark),

diff --git a/Sources/BrightroomUI/Built-in UI/ClassicImageEdit/ClassicImageEditViewModel.swift b/Sources/BrightroomUI/Built-in UI/ClassicImageEdit/ClassicImageEditViewModel.swift
@@ -56,7 +56,7 @@ public final class ClassicImageEditViewModel: Equatable, StoreComponentType {
 
   public let editingStack: EditingStack
 
-  private var subscriptions: Set<VergeAnyCancellable> = .init()
+  private var subscriptions: Set<AnyCancellable> = .init()
 
   public let localizedStrings: ClassicImageEditViewController.LocalizedStrings
 

diff --git a/...rightroomUI/Built-in UI/ClassicImageEdit/Components/ClassicImageEditControlViewBase.swift b/...rightroomUI/Built-in UI/ClassicImageEdit/Components/ClassicImageEditControlViewBase.swift
@@ -34,7 +34,7 @@ open class ClassicImageEditControlBase : UIView, ClassicImageEditControlChildVie
 
   public let viewModel: ClassicImageEditViewModel
 
-  private var subscriptions: Set<VergeAnyCancellable> = .init()
+  private var subscriptions: Set<AnyCancellable> = .init()
 
   public init(viewModel: ClassicImageEditViewModel) {
     self.viewModel = viewModel

diff --git a/...ghtroomUI/Built-in UI/ClassicImageEdit/Components/ClassicImageEditPresetListControl.swift b/...ghtroomUI/Built-in UI/ClassicImageEdit/Components/ClassicImageEditPresetListControl.swift
@@ -63,7 +63,7 @@ open class ClassicImageEditPresetListControl: ClassicImageEditPresetListControlB
 
   private let store: Store<State, Never>
 
-  private var subscriptions: Set<VergeAnyCancellable> = .init()
+  private var subscriptions: Set<AnyCancellable> = .init()
 
   // MARK: - Functions
 

diff --git a/Sources/BrightroomUI/Built-in UI/PhotosCrop/PhotosCropAspectRatioControl.swift b/Sources/BrightroomUI/Built-in UI/PhotosCrop/PhotosCropAspectRatioControl.swift
@@ -122,7 +122,7 @@ final class PhotosCropAspectRatioControl: PixelEditorCodeBasedView {
   private let aspectSquareButton = AspectRatioButton()
 
   private let store: UIStateStore<State, Never>
-  private var subscriptions = Set<VergeAnyCancellable>()
+  private var subscriptions = Set<AnyCancellable>()
 
   private var isSupressingHandlers = false
   private let localizedStrings: PhotosCropViewController.LocalizedStrings

diff --git a/Sources/BrightroomUI/Built-in UI/PhotosCrop/PhotosCropViewController.swift b/Sources/BrightroomUI/Built-in UI/PhotosCrop/PhotosCropViewController.swift
@@ -88,7 +88,7 @@ public final class PhotosCropViewController: UIViewController {
 
   private let aspectRatioControlLayoutGuide = UILayoutGuide()
 
-  private var subscriptions = Set<VergeAnyCancellable>()
+  private var subscriptions = Set<AnyCancellable>()
   private var hasSetupLoadedUICompleted = false
 
   public var localizedStrings: LocalizedStrings

diff --git a/Sources/BrightroomUI/Shared/Components/Crop/CropView.swift b/Sources/BrightroomUI/Shared/Components/Crop/CropView.swift
@@ -110,7 +110,7 @@ public final class CropView: UIView, UIScrollViewDelegate {
     insetOfGuideFlexibility: contentInset
   )
 
-  private var subscriptions = Set<VergeAnyCancellable>()
+  private var subscriptions = Set<AnyCancellable>()
 
   /// A throttling timer to apply guide changed event.
   ///

diff --git a/Sources/BrightroomUI/Shared/Components/Drawing/BlurryMaskingView.swift b/Sources/BrightroomUI/Shared/Components/Drawing/BlurryMaskingView.swift
@@ -124,7 +124,7 @@ public final class BlurryMaskingView: PixelEditorCodeBasedView, UIScrollViewDele
 
   private let canvasView = CanvasView()
 
-  private var subscriptions = Set<VergeAnyCancellable>()
+  private var subscriptions = Set<AnyCancellable>()
 
   private let editingStack: EditingStack
 

diff --git a/Sources/BrightroomUI/Shared/Components/Drawing/CanvasView.swift b/Sources/BrightroomUI/Shared/Components/Drawing/CanvasView.swift
@@ -46,7 +46,7 @@ public final class CanvasView: PixelEditorCodeBasedView {
   }
 
   private let store = UIStateStore<State, Never>(initialState: .init())
-  private var subscriptions: Set<VergeAnyCancellable> = .init()
+  private var subscriptions: Set<AnyCancellable> = .init()
 
   private var resolvedShapeLayers: [CAShapeLayer] = []
   private var previewShapeLayer: CAShapeLayer?

diff --git a/Sources/BrightroomUI/Shared/Components/ImageViews/ImagePreviewView.swift b/Sources/BrightroomUI/Shared/Components/ImageViews/ImagePreviewView.swift
@@ -40,7 +40,7 @@ public final class ImagePreviewView: PixelEditorCodeBasedView {
   #endif
 
   private let editingStack: EditingStack
-  private var subscriptions = Set<VergeAnyCancellable>()
+  private var subscriptions = Set<AnyCancellable>()
 
   private var loadingOverlayFactory: (() -> UIView)?
   private weak var currentLoadingOverlay: UIView?