Merge pull request #8 from cellular/feature/Xcode13.3_RenameType

Feature/xcode13.3 rename type
cellular · Apr 7, 2022 · 0f09db3 · 0f09db3
2 parents 94e8e81 + 2b71ed3
commit 0f09db3
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 24 deletions.
diff --git a/Sources/ModelDataSource/Collection/ModelCollection+Deprecated.swift b/Sources/ModelDataSource/Collection/ModelCollection+Deprecated.swift
@@ -25,7 +25,7 @@ extension ModelCollection {
     public mutating func appendSection<M, D: ModelDataSourceViewDisplayable>(_ model: M,
                                                                              view: D.Type,
                                                                              ofKind kind: DataSourceView.DecorativeKind)
-        -> Int where D.Model == M, D.Size == DataSourceView.Dimension {
+        -> Int where D.Model == M, D.ModelDataSourceViewDisplayableDimension == DataSourceView.Dimension {
             return append(section: .init(decorative: .init(model: model, view: view), ofKind: kind))
     }
 
@@ -35,15 +35,15 @@ extension ModelCollection {
                                                                       view: D.Type,
                                                                       ofKind: DataSourceView.DecorativeKind,
                                                                       inSection: Index? = nil)
-        -> Index where D.Model == M, D.Size == DataSourceView.Dimension {
+        -> Index where D.Model == M, D.ModelDataSourceViewDisplayableDimension == DataSourceView.Dimension {
 
          return append(decorative: .init(model: model, view: view), ofKind: ofKind)
     }
 
     @available(*, deprecated, renamed: "append(item:inSection:)")
     @discardableResult
     public mutating func append<M, C: ModelDataSourceViewDisplayable>(_ model: M, cell: C.Type, inSection: Index? = nil)
-        -> IndexPath where C.Model == M, C.Size == DataSourceView.Dimension {
+        -> IndexPath where C.Model == M, C.ModelDataSourceViewDisplayableDimension == DataSourceView.Dimension {
 
             return append(item: .init(model: model, cell: cell), inSection: inSection)
     }
@@ -53,14 +53,14 @@ extension ModelCollection {
     public mutating func appendContentsOf<M, C: ModelDataSourceViewDisplayable>(_ models: [M],
                                                                                 cell: C.Type,
                                                                                 inSection: Index? = nil) -> [IndexPath]
-                                                                                where C.Model == M, C.Size == DataSourceView.Dimension {
+                                                                                where C.Model == M, C.ModelDataSourceViewDisplayableDimension == DataSourceView.Dimension {
 
             return append(contentsOf: models, cell: cell, inSection: inSection)
     }
 
     @available(*, deprecated, renamed: "insert(item:index:)")
     public mutating func insert<M, C: ModelDataSourceViewDisplayable>(_ model: M, cell: C.Type, index: IndexPath) where C.Model == M,
-        C.Size == DataSourceView.Dimension {
+        C.ModelDataSourceViewDisplayableDimension == DataSourceView.Dimension {
 
         insert(item: .init(model: model, cell: cell), indexPath: index)
     }

diff --git a/Sources/ModelDataSource/Collection/ModelCollection.swift b/Sources/ModelDataSource/Collection/ModelCollection.swift
@@ -166,7 +166,7 @@ extension ModelCollection {
     public mutating func append<M, C: ModelDataSourceViewDisplayable>(contentsOf models: [M],
                                                                       cell: C.Type,
                                                                       inSection: Index? = nil)
-        -> [IndexPath] where C.Model == M, C.Size == DataSourceView.Dimension {
+        -> [IndexPath] where C.Model == M, C.ModelDataSourceViewDisplayableDimension == DataSourceView.Dimension {
 
         return models.map { append(item: .init(model: $0, cell: cell), inSection: inSection) }
     }

diff --git a/Sources/ModelDataSource/Collection/ModelDecorative.swift b/Sources/ModelDataSource/Collection/ModelDecorative.swift
@@ -17,7 +17,7 @@ public struct ModelDecorative<V: ModelDataSourceView> {
     /// Assigns the model to the given decorative. Returns true if the model was assigned successfully.
     public let assignModel: (V.DecorativeView) -> Bool
 
-    public init<M, D: ModelDataSourceViewDisplayable>(model: M, view: D.Type) where D.Model == M, D.Size == V.Dimension {
+    public init<M, D: ModelDataSourceViewDisplayable>(model: M, view: D.Type) where D.Model == M, D.ModelDataSourceViewDisplayableDimension == V.Dimension {
         self.model = model
         self.view = view
         self.reuseIdentifier = view.reuseIdentifier

diff --git a/Sources/ModelDataSource/Collection/ModelItem.swift b/Sources/ModelDataSource/Collection/ModelItem.swift
@@ -17,7 +17,7 @@ public struct ModelItem<V: ModelDataSourceView> {
     /// Assigns the model to the given decorative. Returns true if the model was assigned successfully.
     public let assignModel: (V.Cell) -> Bool
 
-    public init<M, C: ModelDataSourceViewDisplayable>(model: M, cell: C.Type) where C.Model == M, C.Size == V.Dimension {
+    public init<M, C: ModelDataSourceViewDisplayable>(model: M, cell: C.Type) where C.Model == M, C.ModelDataSourceViewDisplayableDimension == V.Dimension {
         self.model = model
         self.cell = cell
         self.reuseIdentifier = cell.reuseIdentifier

diff --git a/Sources/ModelDataSource/UIKit/CollectionView+ModelDataSourceView.swift b/Sources/ModelDataSource/UIKit/CollectionView+ModelDataSourceView.swift
@@ -86,25 +86,25 @@ extension UICollectionView: ModelDataSourceView {
 /// https://stackoverflow.com/questions/71563154/how-to-implement-static-variables-of-associated-types-in-protocol-extensions-in
 
 extension UICollectionViewCell {
-    public typealias Size = CGSize
+    public typealias ModelDataSourceViewDisplayableDimension = CGSize
 }
 
 extension UICollectionReusableView {
-    public typealias Size = CGSize
+    public typealias ModelDataSourceViewDisplayableDimension = CGSize
 }
 
 extension ModelDataSourceViewDisplayable where Self: UICollectionViewCell {
 
     /// Optional fixed size definition to override dynamic height calculations.
-    public static var staticSize: Size? {
+    public static var staticSize: ModelDataSourceViewDisplayableDimension? {
         return nil
     }
 }
 
 extension ModelDataSourceViewDisplayable where Self: UICollectionReusableView {
 
     /// Optional fixed size definition to override dynamic height calculations.
-    public static var staticSize: Size? {
+    public static var staticSize: ModelDataSourceViewDisplayableDimension? {
         return nil
     }
 }
diff --git a/Sources/ModelDataSource/UIKit/TableView+ModelDataSourceView.swift b/Sources/ModelDataSource/UIKit/TableView+ModelDataSourceView.swift
@@ -55,25 +55,25 @@ extension UITableView: ModelDataSourceView {
 /// https://stackoverflow.com/questions/71563154/how-to-implement-static-variables-of-associated-types-in-protocol-extensions-in
 
 extension UITableViewCell {
-    public typealias Size = CGFloat
+    public typealias ModelDataSourceViewDisplayableDimension = CGFloat
 }
 
 extension UITableViewHeaderFooterView {
-    public typealias Size = CGFloat
+    public typealias ModelDataSourceViewDisplayableDimension = CGFloat
 }
 
 extension ModelDataSourceViewDisplayable where Self: UITableViewCell {
 
     /// Optional fixed size definition to override dynamic height calculations.
-    public static var staticSize: Size? {
+    public static var staticSize: ModelDataSourceViewDisplayableDimension? {
         return nil
     }
 }
 
 extension ModelDataSourceViewDisplayable where Self: UITableViewHeaderFooterView {
 
     /// Optional fixed size definition to override dynamic height calculations.
-    public static var staticSize: Size? {
+    public static var staticSize: ModelDataSourceViewDisplayableDimension? {
         return nil
     }
 }
diff --git a/Sources/ModelDataSource/View/ModelDataSourceViewDisplayable.swift b/Sources/ModelDataSource/View/ModelDataSourceViewDisplayable.swift
@@ -6,7 +6,7 @@ public protocol ModelDataSourceViewDisplayable: class {
     associatedtype Model
 
     /// The variable/dynamic dimension of the cell for sizing calculations.
-    associatedtype Size
+    associatedtype ModelDataSourceViewDisplayableDimension
 
     /// The source file of the decorative view. Used to register/dequeue & calculate size of the receiver.
     static var source: Source<Self> { get }
@@ -15,7 +15,7 @@ public protocol ModelDataSourceViewDisplayable: class {
     static var reuseIdentifier: String { get }
 
     /// Optional fixed size definition to override dynamic height calculations.
-    static var staticSize: Size? { get }
+    static var staticSize: ModelDataSourceViewDisplayableDimension? { get }
 
     /// Model that was associated with the cell on initialization or reuse.
     var model: Model? { get set }

diff --git a/Tests/ModelDataSourceTests/ModelCollectionDeprecatedTests.swift b/Tests/ModelDataSourceTests/ModelCollectionDeprecatedTests.swift
@@ -141,7 +141,7 @@ private class ModelCollectionDeprecatedTesting<C: ModelCollection> {
     }
 
     func testAppendSectionWithDecorative<M, D: ModelDataSourceViewDisplayable>(_ model: M, view: D.Type)
-        where M == D.Model, D.Size == C.DataSourceView.Dimension {
+        where M == D.Model, D.ModelDataSourceViewDisplayableDimension == C.DataSourceView.Dimension {
 
         guard let decorativeKind = decorativeKinds?().first,  let modelDecorative = createDecorative?("Decorative") else {
             return XCTFail("\(collectionName) failed to create decoratives.")
@@ -162,7 +162,7 @@ private class ModelCollectionDeprecatedTesting<C: ModelCollection> {
         XCTAssertNotNil(deprecatedCollection.first?[decorativeKind], "Deprecated \(collectionName) failed to create decorative.")
     }
 
-    func testAppendDecorative<M, D: ModelDataSourceViewDisplayable>(_ model: M, view: D.Type) where M == D.Model, D.Size == C.DataSourceView.Dimension {
+    func testAppendDecorative<M, D: ModelDataSourceViewDisplayable>(_ model: M, view: D.Type) where M == D.Model, D.ModelDataSourceViewDisplayableDimension == C.DataSourceView.Dimension {
 
         guard let decorativeKind = decorativeKinds?().first,  let modelDecorative = createDecorative?("Decorative") else {
             return XCTFail("\(collectionName) failed to create decoratives.")
@@ -199,7 +199,7 @@ private class ModelCollectionDeprecatedTesting<C: ModelCollection> {
     }
 
     func testAppendItem<M, Cell: ModelDataSourceViewDisplayable>(_ model: M, cell: Cell.Type)
-        where Cell.Model == M, Cell.Size == C.DataSourceView.Dimension {
+        where Cell.Model == M, Cell.ModelDataSourceViewDisplayableDimension == C.DataSourceView.Dimension {
 
         guard let modelItem = createItem?("Item") else {
             return XCTFail("\(collectionName) failed to create item.")
@@ -236,7 +236,7 @@ private class ModelCollectionDeprecatedTesting<C: ModelCollection> {
     }
 
     func testAppendContentsOfItems<M, Cell: ModelDataSourceViewDisplayable>(_ models: [M], cell: Cell.Type)
-        where Cell.Model == M, Cell.Size == C.DataSourceView.Dimension {
+        where Cell.Model == M, Cell.ModelDataSourceViewDisplayableDimension == C.DataSourceView.Dimension {
 
         var collection: C = .init()
         var deprecatedCollection: C = .init()
@@ -269,7 +269,7 @@ private class ModelCollectionDeprecatedTesting<C: ModelCollection> {
     }
 
     func testInsertItemAtIndexPath<M, Cell: ModelDataSourceViewDisplayable>(_ model: M, insertCell: Cell.Type)
-        where Cell.Model == M, Cell.Size == C.DataSourceView.Dimension {
+        where Cell.Model == M, Cell.ModelDataSourceViewDisplayableDimension == C.DataSourceView.Dimension {
 
         guard let modelItem = createItem?("Item"), let searchItem = createSearchItem?("searchItem"),
             let searchClass = searchItemClass else {

diff --git a/Tests/ModelDataSourceTests/ModelCollectionTests.swift b/Tests/ModelDataSourceTests/ModelCollectionTests.swift
@@ -430,7 +430,7 @@ private class ModelCollectionTesting<C: ModelCollection> {
         }
     }
 
-    func testAppendItemList<Cell: TestModelDataSourceViewDisplayable>(cell: Cell.Type) where Cell.Size == C.DataSourceView.Dimension {
+    func testAppendItemList<Cell: TestModelDataSourceViewDisplayable>(cell: Cell.Type) where Cell.ModelDataSourceViewDisplayableDimension == C.DataSourceView.Dimension {
         var collection: C = .init()
         let modelCount = 5
         let models: [Cell.Model] = .init(repeating: Cell.testModel, count: modelCount)