square · kyleve · Sep 25, 2020 · Sep 24, 2020 · Sep 24, 2020 · Sep 25, 2020
diff --git a/BlueprintLists.podspec → BlueprintUILists.podspec b/BlueprintLists.podspec → BlueprintUILists.podspec
@@ -1,6 +1,6 @@
 
 Pod::Spec.new do |s|
-  s.name         = 'BlueprintLists'
+  s.name         = 'BlueprintUILists'
   s.version      = '0.9.0'
   s.summary      = 'Declarative list views for iOS apps that deploy back to iOS 11.0.'
   s.homepage     = 'https://github.com/kyleve/Listable'
@@ -12,14 +12,14 @@ Pod::Spec.new do |s|
 
   s.swift_versions = ['5.0']
 
-  s.dependency 'Listable'
+  s.dependency 'ListableUI'
   s.dependency 'BlueprintUI'
 
-  s.source_files = 'BlueprintLists/Sources/**/*.{swift}'
+  s.source_files = 'BlueprintUILists/Sources/**/*.{swift}'
 
   s.test_spec 'Tests' do |test_spec|
-    test_spec.source_files = 'BlueprintLists/Tests/**/*.{swift}'
-    test_spec.resources = 'BlueprintLists/Tests/Resources/**/*'
+    test_spec.source_files = 'BlueprintUILists/Tests/**/*.{swift}'
+    test_spec.ios.resource_bundle = { 'BlueprintUIListsResources' => 'BlueprintUILists/Tests/Resources/**/*.*' }
 
     test_spec.framework = 'XCTest'
 

diff --git a/BlueprintLists/Resources/.gitkeep → BlueprintUILists/Resources/.gitkeep b/BlueprintLists/Resources/.gitkeep → BlueprintUILists/Resources/.gitkeep
diff --git a/...ources/BlueprintHeaderFooterContent.swift → ...ources/BlueprintHeaderFooterContent.swift b/...ources/BlueprintHeaderFooterContent.swift → ...ources/BlueprintHeaderFooterContent.swift
@@ -1,12 +1,12 @@
 //
 //  BlueprintHeaderFooterContent.swift
-//  BlueprintLists
+//  BlueprintUILists
 //
 //  Created by Kyle Van Essen on 10/22/19.
 //
 
 import BlueprintUI
-import Listable
+import ListableUI
 
 
 /// Alias to allow less verbose creation of headers.

diff --git a/...tLists/Sources/BlueprintItemContent.swift → ...ILists/Sources/BlueprintItemContent.swift b/...tLists/Sources/BlueprintItemContent.swift → ...ILists/Sources/BlueprintItemContent.swift
@@ -1,12 +1,12 @@
 //
 //  BlueprintItemContent.swift
-//  BlueprintLists
+//  BlueprintUILists
 //
 //  Created by Kyle Van Essen on 10/22/19.
 //
 
 import BlueprintUI
-import Listable
+import ListableUI
 
 
 ///

diff --git a/BlueprintLists/Sources/Deprecations.swift → BlueprintUILists/Sources/Deprecations.swift b/BlueprintLists/Sources/Deprecations.swift → BlueprintUILists/Sources/Deprecations.swift
@@ -1,6 +1,6 @@
 //
 //  Deprecations.swift
-//  BlueprintLists
+//  BlueprintUILists
 //
 //  Created by Kyle Van Essen on 5/29/20.
 //

diff --git a/BlueprintLists/Sources/Exports.swift → BlueprintUILists/Sources/Exports.swift b/BlueprintLists/Sources/Exports.swift → BlueprintUILists/Sources/Exports.swift
@@ -10,4 +10,4 @@
 ///
 
 @_exported import BlueprintUI
-@_exported import Listable
+@_exported import ListableUI
diff --git a/BlueprintLists/Sources/List.swift → BlueprintUILists/Sources/List.swift b/BlueprintLists/Sources/List.swift → BlueprintUILists/Sources/List.swift
@@ -1,13 +1,13 @@
 //
 //  List.swift
-//  BlueprintLists
+//  BlueprintUILists
 //
 //  Created by Kyle Van Essen on 10/22/19.
 //
 
 import BlueprintUI
 
-import Listable
+import ListableUI
 
 
 ///

diff --git a/...intLists/Sources/ListReorderGesture.swift → ...tUILists/Sources/ListReorderGesture.swift b/...intLists/Sources/ListReorderGesture.swift → ...tUILists/Sources/ListReorderGesture.swift
@@ -1,12 +1,12 @@
 //
 //  ListReorderGesture.swift
-//  BlueprintLists
+//  BlueprintUILists
 //
 //  Created by Kyle Van Essen on 11/14/19.
 //
 
 import BlueprintUI
-import Listable
+import ListableUI
 
 
 ///

diff --git a/BlueprintLists/Tests/Tests.swift → BlueprintUILists/Tests/Tests.swift b/BlueprintLists/Tests/Tests.swift → BlueprintUILists/Tests/Tests.swift
@@ -1,6 +1,6 @@
 //
 //  Tests.swift
-//  Listable
+//  ListableUI
 //
 //  Created by Kyle Van Essen on 6/17/19.
 //

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,8 @@
 
 - [`isEmpty` on `Content` and `Section` have been replaced with `contains(any:)`](https://github.com/kyleve/Listable/pull/197), which allows more granular comparison of the content in the whole list and in individual sections, respectively. This allows you to check if the list or sections contain headers, footers, items, all, or some combination of them.
 
+- Listable has been [renamed to ListableUI](https://github.com/kyleve/Listable/pull/211/), and BlueprintLists is now named BlueprintUILists. This is done to be more consistent with other Square UI libraries, and to avoid a conflict with an existing published Cocoapod, also named Listable.
+
 ### Misc
 
 # Past Releases

diff --git a/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme b/Demo/Demo.xcodeproj/xcshareddata/xcschemes/Demo.xcscheme
@@ -70,19 +70,19 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FEDB08DE1F9CE90D4A66BB17EA1E00F3"
-               BuildableName = "BlueprintLists-Unit-Tests.xctest"
-               BlueprintName = "BlueprintLists-Unit-Tests"
+               BlueprintIdentifier = "2574E40016CF80218A67E4254FA74D9A"
+               BuildableName = "BlueprintUILists-Unit-Tests.xctest"
+               BlueprintName = "BlueprintUILists-Unit-Tests"
                ReferencedContainer = "container:../Pods/Pods.xcodeproj">
             </BuildableReference>
          </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "04099BB01E02215D58299914B20C8D1B"
-               BuildableName = "Listable-Unit-Tests.xctest"
-               BlueprintName = "Listable-Unit-Tests"
+               BlueprintIdentifier = "FE995140B25147403F401CCAA5BEB178"
+               BuildableName = "ListableUI-Unit-Tests.xctest"
+               BlueprintName = "ListableUI-Unit-Tests"
                ReferencedContainer = "container:../Pods/Pods.xcodeproj">
             </BuildableReference>
          </TestableReference>

diff --git a/Demo/Sources/Demos/Demo Screens/AccordionViewController.swift b/Demo/Sources/Demos/Demo Screens/AccordionViewController.swift
@@ -7,7 +7,7 @@
 //
 
 
-import BlueprintLists
+import BlueprintUILists
 import BlueprintUICommonControls
 
 

diff --git a/Demo/Sources/Demos/Demo Screens/AutoScrollingViewController.swift b/Demo/Sources/Demos/Demo Screens/AutoScrollingViewController.swift
@@ -8,8 +8,8 @@
 
 import UIKit
 
-import Listable
-import BlueprintLists
+import ListableUI
+import BlueprintUILists
 import BlueprintUI
 import BlueprintUICommonControls
 

diff --git a/Demo/Sources/Demos/Demo Screens/BlueprintListDemoViewController.swift b/Demo/Sources/Demos/Demo Screens/BlueprintListDemoViewController.swift
@@ -6,8 +6,8 @@
 //  Copyright © 2019 Kyle Van Essen. All rights reserved.
 //
 
-import Listable
-import BlueprintLists
+import ListableUI
+import BlueprintUILists
 import BlueprintUI
 import BlueprintUICommonControls
 

diff --git a/Demo/Sources/Demos/Demo Screens/CollectionViewAppearance.swift b/Demo/Sources/Demos/Demo Screens/CollectionViewAppearance.swift
@@ -6,8 +6,8 @@
 //  Copyright © 2019 Kyle Van Essen. All rights reserved.
 //
 
-import Listable
-import BlueprintLists
+import ListableUI
+import BlueprintUILists
 import BlueprintUI
 import BlueprintUICommonControls
 

diff --git a/Demo/Sources/Demos/Demo Screens/CollectionViewBasicDemoViewController.swift b/Demo/Sources/Demos/Demo Screens/CollectionViewBasicDemoViewController.swift
@@ -1,14 +1,14 @@
 //
 //  CollectionViewBasicDemoViewController.swift
-//  Listable-DemoApp
+//  ListableUI-DemoApp
 //
 //  Created by Kyle Van Essen on 7/9/19.
 //
 
 import UIKit
 
-import Listable
-import BlueprintLists
+import ListableUI
+import BlueprintUILists
 
 
 final class CollectionViewBasicDemoViewController : UIViewController

diff --git a/Demo/Sources/Demos/Demo Screens/CollectionViewDictionaryDemoViewController.swift b/Demo/Sources/Demos/Demo Screens/CollectionViewDictionaryDemoViewController.swift
@@ -6,8 +6,8 @@
 //
 
 import UIKit
-import Listable
-import BlueprintLists
+import ListableUI
+import BlueprintUILists
 import BlueprintUI
 import BlueprintUICommonControls
 import EnglishDictionary

diff --git a/Demo/Sources/Demos/Demo Screens/CoordinatorViewController.swift b/Demo/Sources/Demos/Demo Screens/CoordinatorViewController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Kyle Van Essen. All rights reserved.
 //
 
-import BlueprintLists
+import BlueprintUILists
 import BlueprintUICommonControls
 
 

diff --git a/Demo/Sources/Demos/Demo Screens/CustomLayoutsViewController.swift b/Demo/Sources/Demos/Demo Screens/CustomLayoutsViewController.swift
@@ -8,8 +8,8 @@
 
 import UIKit
 
-import Listable
-import BlueprintLists
+import ListableUI
+import BlueprintUILists
 import BlueprintUI
 import BlueprintUICommonControls
 

diff --git a/Demo/Sources/Demos/Demo Screens/HorizontalLayoutViewController.swift b/Demo/Sources/Demos/Demo Screens/HorizontalLayoutViewController.swift
@@ -7,10 +7,10 @@
 //
 
 import UIKit
-import Listable
+import ListableUI
 import BlueprintUI
 import BlueprintUICommonControls
-import BlueprintLists
+import BlueprintUILists
 
 
 final class HorizontalLayoutViewController : UIViewController

diff --git a/Demo/Sources/Demos/Demo Screens/InvoicesPaymentScheduleDemoViewController.swift b/Demo/Sources/Demos/Demo Screens/InvoicesPaymentScheduleDemoViewController.swift
@@ -7,8 +7,8 @@
 //
 
 import UIKit
-import Listable
-import BlueprintLists
+import ListableUI
+import BlueprintUILists
 import BlueprintUI
 import BlueprintUICommonControls
 

diff --git a/Demo/Sources/Demos/Demo Screens/ItemInsertAndRemoveAnimationsViewController.swift b/Demo/Sources/Demos/Demo Screens/ItemInsertAndRemoveAnimationsViewController.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import BlueprintLists
+import BlueprintUILists
 
 
 final class ItemInsertAndRemoveAnimationsViewController : ListViewController

diff --git a/Demo/Sources/Demos/Demo Screens/ItemizationEditorViewController.swift b/Demo/Sources/Demos/Demo Screens/ItemizationEditorViewController.swift
@@ -6,11 +6,11 @@
 //  Copyright © 2019 Kyle Van Essen. All rights reserved.
 //
 
-import BlueprintLists
+import BlueprintUILists
 import BlueprintUI
 import BlueprintUICommonControls
 
-import Listable
+import ListableUI
 
 
 final class ItemizationEditorViewController : UIViewController

diff --git a/Demo/Sources/Demos/Demo Screens/KeyboardTestingViewController.swift b/Demo/Sources/Demos/Demo Screens/KeyboardTestingViewController.swift
@@ -7,8 +7,8 @@
 //
 
 import UIKit
-import Listable
-import BlueprintLists
+import ListableUI
+import BlueprintUILists
 import BlueprintUI
 import BlueprintUICommonControls
 

diff --git a/Demo/Sources/Demos/Demo Screens/ListAppearsAfterKeyboardViewController.swift b/Demo/Sources/Demos/Demo Screens/ListAppearsAfterKeyboardViewController.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import BlueprintLists
+import BlueprintUILists
 import BlueprintUICommonControls
 
 

diff --git a/Demo/Sources/Demos/Demo Screens/ListStateViewController.swift b/Demo/Sources/Demos/Demo Screens/ListStateViewController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Kyle Van Essen. All rights reserved.
 //
 
-import BlueprintLists
+import BlueprintUILists
 import BlueprintUICommonControls
 import Combine
 

diff --git a/Demo/Sources/Demos/Demo Screens/ManualSelectionManagementViewController.swift b/Demo/Sources/Demos/Demo Screens/ManualSelectionManagementViewController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Kyle Van Essen. All rights reserved.
 //
 
-import Listable
+import ListableUI
 import UIKit
 
 

diff --git a/Demo/Sources/Demos/Demo Screens/PagedViewController.swift b/Demo/Sources/Demos/Demo Screens/PagedViewController.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Kyle Van Essen. All rights reserved.
 //
 
-import BlueprintLists
+import BlueprintUILists
 import BlueprintUICommonControls
 
 

diff --git a/Demo/Sources/Demos/Demo Screens/ReorderingViewController.swift b/Demo/Sources/Demos/Demo Screens/ReorderingViewController.swift
@@ -8,8 +8,8 @@
 
 import UIKit
 
-import Listable
-import BlueprintLists
+import ListableUI
+import BlueprintUILists
 import BlueprintUI
 import BlueprintUICommonControls
 

diff --git a/Demo/Sources/Demos/Demo Screens/ScrollViewEdgesPlaygroundViewController.swift b/Demo/Sources/Demos/Demo Screens/ScrollViewEdgesPlaygroundViewController.swift
@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import Listable
+import ListableUI
 
 
 final class ScrollViewEdgesPlaygroundViewController : UIViewController, UIScrollViewDelegate

diff --git a/Demo/Sources/Demos/Demo Screens/SpacingCustomizationViewController.swift b/Demo/Sources/Demos/Demo Screens/SpacingCustomizationViewController.swift
@@ -8,10 +8,10 @@
 
 
 import UIKit
-import Listable
+import ListableUI
 import BlueprintUI
 import BlueprintUICommonControls
-import BlueprintLists
+import BlueprintUILists
 
 
 final class SpacingCustomizationViewController : UIViewController

diff --git a/Demo/Sources/Demos/Demo Screens/SwipeActionsViewController.swift b/Demo/Sources/Demos/Demo Screens/SwipeActionsViewController.swift
@@ -5,8 +5,8 @@
 //  Created by Kyle Van Essen on 3/24/20.
 //  Copyright © 2020 Kyle Van Essen. All rights reserved.
 //
-import Listable
-import BlueprintLists
+import ListableUI
+import BlueprintUILists
 import BlueprintUI
 import BlueprintUICommonControls
 import UIKit

diff --git a/Demo/Sources/Demos/Demo Screens/WidthCustomizationViewController.swift b/Demo/Sources/Demos/Demo Screens/WidthCustomizationViewController.swift
@@ -8,10 +8,10 @@
 
 
 import UIKit
-import Listable
+import ListableUI
 import BlueprintUI
 import BlueprintUICommonControls
-import BlueprintLists
+import BlueprintUILists
 
 
 final class WidthCustomizationViewController : UIViewController

diff --git a/Demo/Sources/Demos/DemosRootViewController.swift b/Demo/Sources/Demos/DemosRootViewController.swift
@@ -6,7 +6,7 @@
 //
 
 import UIKit
-import Listable
+import ListableUI
 
 
 public final class DemosRootViewController : ListViewController
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     //
-    import BlueprintLists
+    import BlueprintUILists
     import BlueprintUICommonControls
@@ Expand Down @@