NO-JIRA Then 의존성을 제거해요

KarrotListKit.podspec

@@ -12,5 +12,4 @@ Pod::Spec.new do |spec|
   spec.source_files = 'Sources/**/*.{swift,h,m}'
 
   spec.dependency 'DifferenceKit', '~> 1.0'
-  spec.dependency 'Then', '~> 3.0'
 end

Package.resolved

@@ -9,15 +9,6 @@
           "revision": "073b9671ce2b9b5b96398611427a1f929927e428",
           "version": "1.3.0"
         }
-      },
-      {
-        "package": "Then",
-        "repositoryURL": "https://github.com/devxoul/Then.git",
-        "state": {
-          "branch": null,
-          "revision": "d41ef523faef0f911369f79c0b96815d9dbb6d7a",
-          "version": "3.0.0"
-        }
       }
     ]
   },

Package.swift

@@ -17,17 +17,12 @@ let package = Package(
       url: "https://github.com/ra1028/DifferenceKit.git",
       .upToNextMajor(from: "1.0.0")
     ),
-    .package(
-      url: "https://github.com/devxoul/Then.git",
-      .upToNextMajor(from: "3.0.0")
-    ),
   ],
   targets: [
     .target(
       name: "KarrotListKit",
       dependencies: [
         "DifferenceKit",
-        "Then",
       ]
     ),
     .testTarget(

Sources/KarrotListKit/Adapter/CollectionViewAdapter.swift

@@ -45,14 +45,16 @@ final public class CollectionViewAdapter: NSObject {
 
   var list: List?
 
-  private lazy var pullToRefreshControl = UIRefreshControl().then {
-    $0.tintColor = configuration.refreshControl.tintColor
-    $0.addTarget(
+  private lazy var pullToRefreshControl: UIRefreshControl = {
+    let refreshControl = UIRefreshControl()
+    refreshControl.tintColor = configuration.refreshControl.tintColor
+    refreshControl.addTarget(
       self,
       action: #selector(pullToRefresh),
       for: .valueChanged
     )
-  }
+    return refreshControl
+  }()
 
   // MARK: - Initializer
 

Sources/KarrotListKit/Layout/HorizontalLayout.swift

@@ -38,34 +38,37 @@ public struct HorizontalLayout: CompositionalLayoutSectionFactory {
           heightDimension: .estimated(context.environment.container.contentSize.height)
         ),
         subitems: layoutCellItems(cells: context.section.cells, sizeStorage: context.sizeStorage)
-      ).then {
-        $0.interItemSpacing = .fixed(spacing)
+      )
+      group.interItemSpacing = .fixed(spacing)
+
+
+      let section = NSCollectionLayoutSection(group: group)
+      if let sectionInsets {
+        section.contentInsets = sectionInsets
       }
 
-      return NSCollectionLayoutSection(group: group).then {
-        if let sectionInsets = sectionInsets {
-          $0.contentInsets = sectionInsets
-        }
-
-        if let visibleItemsInvalidationHandler {
-          $0.visibleItemsInvalidationHandler = visibleItemsInvalidationHandler
-        }
-
-        $0.orthogonalScrollingBehavior = scrollingBehavior
-
-        $0.boundarySupplementaryItems = [
-          layoutHeaderItem(section: context.section, sizeStorage: context.sizeStorage)?.then {
-            if let headerPinToVisibleBounds {
-              $0.pinToVisibleBounds = headerPinToVisibleBounds
-            }
-          },
-          layoutFooterItem(section: context.section, sizeStorage: context.sizeStorage)?.then {
-            if let footerPinToVisibleBounds {
-              $0.pinToVisibleBounds = footerPinToVisibleBounds
-            }
-          },
-        ].compactMap { $0 }
+      if let visibleItemsInvalidationHandler {
+        section.visibleItemsInvalidationHandler = visibleItemsInvalidationHandler
+      }
+
+      section.orthogonalScrollingBehavior = scrollingBehavior
+
+      let headerItem = layoutHeaderItem(section: context.section, sizeStorage: context.sizeStorage)
+      if let headerPinToVisibleBounds {
+        headerItem?.pinToVisibleBounds = headerPinToVisibleBounds
       }
+
+      let footerItem = layoutFooterItem(section: context.section, sizeStorage: context.sizeStorage)
+      if let footerPinToVisibleBounds {
+        footerItem?.pinToVisibleBounds = footerPinToVisibleBounds
+      }
+
+      section.boundarySupplementaryItems = [
+        headerItem,
+        footerItem,
+      ].compactMap { $0 }
+
+      return section
     }
   }
 

Sources/KarrotListKit/Layout/VerticalGridLayout.swift

@@ -45,7 +45,7 @@ public struct VerticalGridLayout: CompositionalLayoutSectionFactory {
 
         verticalGroupHeight += horizontalGroupHeight.dimension
 
-        return NSCollectionLayoutGroup.horizontal(
+        let layoutGroup = NSCollectionLayoutGroup.horizontal(
           layoutSize: .init(
             widthDimension: .fractionalWidth(1.0),
             heightDimension: horizontalGroupHeight
@@ -57,9 +57,10 @@ public struct VerticalGridLayout: CompositionalLayoutSectionFactory {
             )
           ),
           count: numberOfItemsInRow
-        ).then {
-          $0.interItemSpacing = .fixed(itemSpacing)
-        }
+        )
+        layoutGroup.interItemSpacing = .fixed(itemSpacing)
+
+        return layoutGroup
       }
 
       let group = NSCollectionLayoutGroup.vertical(
@@ -68,32 +69,34 @@ public struct VerticalGridLayout: CompositionalLayoutSectionFactory {
           heightDimension: .estimated(verticalGroupHeight)
         ),
         subitems: horizontalGroups
-      ).then {
-        $0.interItemSpacing = .fixed(lineSpacing)
+      )
+      group.interItemSpacing = .fixed(lineSpacing)
+
+      let section = NSCollectionLayoutSection(group: group)
+      if let sectionInsets {
+        section.contentInsets = sectionInsets
+      }
+
+      if let visibleItemsInvalidationHandler {
+        section.visibleItemsInvalidationHandler = visibleItemsInvalidationHandler
       }
 
-      return NSCollectionLayoutSection(group: group).then {
-        if let sectionInsets = sectionInsets {
-          $0.contentInsets = sectionInsets
-        }
-
-        if let visibleItemsInvalidationHandler {
-          $0.visibleItemsInvalidationHandler = visibleItemsInvalidationHandler
-        }
-
-        $0.boundarySupplementaryItems = [
-          layoutHeaderItem(section: context.section, sizeStorage: context.sizeStorage)?.then {
-            if let headerPinToVisibleBounds {
-              $0.pinToVisibleBounds = headerPinToVisibleBounds
-            }
-          },
-          layoutFooterItem(section: context.section, sizeStorage: context.sizeStorage)?.then {
-            if let footerPinToVisibleBounds {
-              $0.pinToVisibleBounds = footerPinToVisibleBounds
-            }
-          },
-        ].compactMap { $0 }
+      let headerItem = layoutHeaderItem(section: context.section, sizeStorage: context.sizeStorage)
+      if let headerPinToVisibleBounds {
+        headerItem?.pinToVisibleBounds = headerPinToVisibleBounds
       }
+
+      let footerItem = layoutFooterItem(section: context.section, sizeStorage: context.sizeStorage)
+      if let footerPinToVisibleBounds {
+        footerItem?.pinToVisibleBounds = footerPinToVisibleBounds
+      }
+
+      section.boundarySupplementaryItems = [
+        headerItem,
+        footerItem,
+      ].compactMap { $0 }
+
+      return section
     }
   }
 

Sources/KarrotListKit/Layout/VerticalLayout.swift

@@ -31,32 +31,34 @@ public struct VerticalLayout: CompositionalLayoutSectionFactory {
           heightDimension: .estimated(context.environment.container.contentSize.height)
         ),
         subitems: layoutCellItems(cells: context.section.cells, sizeStorage: context.sizeStorage)
-      ).then {
-        $0.interItemSpacing = .fixed(spacing)
+      )
+      group.interItemSpacing = .fixed(spacing)
+
+      let section = NSCollectionLayoutSection(group: group)
+      if let sectionInsets {
+        section.contentInsets = sectionInsets
       }
 
-      return NSCollectionLayoutSection(group: group).then {
-        if let sectionInsets = sectionInsets {
-          $0.contentInsets = sectionInsets
-        }
+      if let visibleItemsInvalidationHandler {
+        section.visibleItemsInvalidationHandler = visibleItemsInvalidationHandler
+      }
 
-        if let visibleItemsInvalidationHandler {
-          $0.visibleItemsInvalidationHandler = visibleItemsInvalidationHandler
-        }
+      let headerItem = layoutHeaderItem(section: context.section, sizeStorage: context.sizeStorage)
+      if let headerPinToVisibleBounds {
+        headerItem?.pinToVisibleBounds = headerPinToVisibleBounds
+      }
 
-        $0.boundarySupplementaryItems = [
-          layoutHeaderItem(section: context.section, sizeStorage: context.sizeStorage)?.then {
-            if let headerPinToVisibleBounds {
-              $0.pinToVisibleBounds = headerPinToVisibleBounds
-            }
-          },
-          layoutFooterItem(section: context.section, sizeStorage: context.sizeStorage)?.then {
-            if let footerPinToVisibleBounds {
-              $0.pinToVisibleBounds = footerPinToVisibleBounds
-            }
-          },
-        ].compactMap { $0 }
+      let footerItem = layoutFooterItem(section: context.section, sizeStorage: context.sizeStorage)
+      if let footerPinToVisibleBounds {
+        footerItem?.pinToVisibleBounds = footerPinToVisibleBounds
       }
+
+      section.boundarySupplementaryItems = [
+        headerItem,
+        footerItem,
+      ].compactMap { $0 }
+
+      return section
     }
   }
 

Sources/KarrotListKit/Section.swift

@@ -5,7 +5,6 @@
 import UIKit
 
 import DifferenceKit
-import Then
 
 /// The `Section` that representing a UICollectionView Section.
 ///
@@ -14,7 +13,7 @@ import Then
 ///
 /// - Note: The layout depends on NSCollectionLayoutSection and
 /// you must set the layout through the withSectionLayout modifier.
-public struct Section: Identifiable, ListingViewEventHandler, Then {
+public struct Section: Identifiable, ListingViewEventHandler {
 
   /// The identifier for `Section`
   public let id: AnyHashable

Sources/KarrotListKit/View/UICollectionComponentReusableView.swift

@@ -44,8 +44,8 @@ final class UICollectionComponentReusableView: UICollectionReusableView, Compone
       onSizeChanged?(size)
     }
 
-    return attributes.with {
-      $0.frame.size = size
-    }
+    attributes.frame.size = size
+
+    return attributes
   }
 }

Sources/KarrotListKit/View/UICollectionViewComponentCell.swift

@@ -58,8 +58,8 @@ public final class UICollectionViewComponentCell: UICollectionViewCell, Componen
       onSizeChanged?(size)
     }
 
-    return attributes.with {
-      $0.frame.size = size
-    }
+    attributes.frame.size = size
+
+    return attributes
   }
 }