Remove NonEmpty since was breaking the compilation

pietrocaselani · May 19, 2019 · 263d9b6 · 263d9b6
1 parent 6d2acce
commit 263d9b6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 22 deletions.
diff --git a/CouchTrackerApp/Shows/Progress/ShowsProgressViewController.swift b/CouchTrackerApp/Shows/Progress/ShowsProgressViewController.swift
@@ -1,6 +1,5 @@
 import ActionSheetPicker_3_0
 import CouchTrackerCore
-import NonEmpty
 import RxCocoa
 import RxDataSources
 import RxSwift

diff --git a/CouchTrackerCore/Shows/Progress/ShowProgressViewState.swift b/CouchTrackerCore/Shows/Progress/ShowProgressViewState.swift
@@ -1,5 +1,3 @@
-import NonEmpty
-
 public struct ShowsProgressMenuOptions: Hashable {
   public let sort: [ShowProgressSort]
   public let filter: [ShowProgressFilter]
@@ -11,7 +9,7 @@ public enum ShowProgressViewState: Hashable {
   case notLogged
   case loading
   case empty
-  case shows(entities: NonEmptyArray<WatchedShowEntity>, menu: ShowsProgressMenuOptions)
+  case shows(entities: [WatchedShowEntity], menu: ShowsProgressMenuOptions)
   case filterEmpty
   case error(error: Error)
 

diff --git a/CouchTrackerCore/Shows/Progress/ShowsProgressDefaultPresenter.swift b/CouchTrackerCore/Shows/Progress/ShowsProgressDefaultPresenter.swift
@@ -1,4 +1,3 @@
-import NonEmpty
 import RxSwift
 
 public final class ShowsProgressDefaultPresenter: ShowsProgressPresenter {
@@ -78,14 +77,12 @@ private func createViewState(entities: [WatchedShowEntity],
     newEntities = newEntities.reversed()
   }
 
-  guard let headEntity = newEntities.first else { return .filterEmpty }
-
-  let nonEmptyEntities = NonEmptyArray<WatchedShowEntity>(headEntity, Array(newEntities.dropFirst()))
+    guard !newEntities.isEmpty else { return .filterEmpty }
 
   let menu = ShowsProgressMenuOptions(sort: ShowProgressSort.allValues(),
                                       filter: ShowProgressFilter.allValues(),
                                       currentFilter: listState.filter,
                                       currentSort: listState.sort)
 
-  return .shows(entities: nonEmptyEntities, menu: menu)
+  return .shows(entities: newEntities, menu: menu)
 }
diff --git a/CouchTrackerCoreTests/Shows/Progress/ShowsProgressPresenterTest.swift b/CouchTrackerCoreTests/Shows/Progress/ShowsProgressPresenterTest.swift
@@ -1,5 +1,4 @@
 @testable import CouchTrackerCore
-import NonEmpty
 import RxSwift
 import RxTest
 import XCTest
@@ -75,9 +74,7 @@ final class ShowsProgressDefaultPresenterTest: XCTestCase {
     _ = presenter.observeViewState().subscribe(viewStateObserver)
 
     // Then
-    let nonEmptyEntities = NonEmptyArray(entities.first!, Array(entities.dropFirst()))
-
-    let showViewState = ShowProgressViewState.shows(entities: nonEmptyEntities, menu: ShowsProgressMenuOptions.mock)
+    let showViewState = ShowProgressViewState.shows(entities: entities, menu: ShowsProgressMenuOptions.mock)
 
     let expectedViewState = [Recorded.next(0, showViewState)]
 
@@ -210,10 +207,9 @@ final class ShowsProgressDefaultPresenterTest: XCTestCase {
     _ = presenter.observeViewState().subscribe(viewStateObserver)
 
     // Then
-    let reversedList = entities.reversed()
-    let nonEmptyEntities = NonEmptyArray(reversedList.first!, Array(reversedList.dropFirst()))
+    let reversedEntities = Array(entities.reversed())
 
-    let showViewState = ShowProgressViewState.shows(entities: nonEmptyEntities, menu: ShowsProgressMenuOptions.mock)
+    let showViewState = ShowProgressViewState.shows(entities: reversedEntities, menu: ShowsProgressMenuOptions.mock)
 
     let expectedViewState = [Recorded.next(0, showViewState)]
 

diff --git a/Podfile b/Podfile
@@ -12,7 +12,6 @@ end
 
 def common_pods
   api_pods
-  pod 'NonEmpty', '0.2.0'
   pod 'RxSwift', git: 'https://github.com/ReactiveX/RxSwift.git', tag: RX_SWIFT_VERSION
 end
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -15,7 +15,6 @@ PODS:
     - Moya/Core
     - RxSwift (~> 5.0)
   - Nimble (8.0.1)
-  - NonEmpty (0.2.0)
   - Pageboy (3.2.2)
   - Realm (3.15.0):
     - Realm/Headers (= 3.15.0)
@@ -50,7 +49,6 @@ DEPENDENCIES:
   - Kingfisher (= 5.5.0)
   - Moya/RxSwift (from `https://github.com/Moya/Moya.git`, tag `14.0.0-alpha.1`)
   - Nimble (= 8.0.1)
-  - NonEmpty (= 0.2.0)
   - RealmSwift (= 3.15.0)
   - RxCocoa (from `https://github.com/ReactiveX/RxSwift.git`, tag `5.0.1`)
   - RxDataSources (= 4.0.1)
@@ -70,7 +68,6 @@ SPEC REPOS:
     - KIF
     - Kingfisher
     - Nimble
-    - NonEmpty
     - Pageboy
     - Realm
     - RealmSwift
@@ -119,7 +116,6 @@ SPEC CHECKSUMS:
   Kingfisher: 6fe5e67a90fd335e49b0f5c075ff55ac5ebedd94
   Moya: 65485239114b3b327a17dc2e839f6c8b7143aae9
   Nimble: 45f786ae66faa9a709624227fae502db55a8bdd0
-  NonEmpty: ffdc4086fbb2d7b977529a1b56bd6e7d4514ad76
   Pageboy: b6e8f5082c23ef2490ddf21339fb6e19673d1453
   Realm: 9b834e1be6062f544805252c812348872dc5d4ed
   RealmSwift: 8a41886f8ab6efef9eb8df97de2f2bb911561a79
@@ -133,6 +129,6 @@ SPEC CHECKSUMS:
   SnapKit: fd22d10eb9aff484d79a8724eab922c1ddf89bcf
   Tabman: 6e0888c9b9227d9da03e51a90f1f91f53454bfa1
 
-PODFILE CHECKSUM: 5085882daea35a2a7782645e59d794e832d26d6c
+PODFILE CHECKSUM: 2e9783e88b20386f48d44a2e0dddd970cddd2b34
 
 COCOAPODS: 1.5.3