Skip to content

Commit e6d15b9

Browse files
committed
Minimizes number of Differentiator files.
1 parent 56ba73f commit e6d15b9

File tree

6 files changed

+34
-22
lines changed

6 files changed

+34
-22
lines changed

RxDataSources.xcodeproj/project.pbxproj

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,26 @@
1919
C8153A501CC6C2F40050C990 /* Example1_CustomizationUsingTableViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8153A4F1CC6C2F40050C990 /* Example1_CustomizationUsingTableViewDelegate.swift */; };
2020
C81905BA1DEA0BD700AE679C /* ChangeSet+TestExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81905B91DEA0BD700AE679C /* ChangeSet+TestExtensions.swift */; };
2121
C81905BE1DEA104400AE679C /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81905BD1DEA104400AE679C /* Array+Extensions.swift */; };
22+
C81FBF461F3B9CED0094061E /* Differentiator.podspec in Resources */ = {isa = PBXBuildFile; fileRef = C81FBF451F3B9CED0094061E /* Differentiator.podspec */; };
23+
C81FBF5E1F3B9D660094061E /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF5B1F3B9D4C0094061E /* Array+Extensions.swift */; };
24+
C81FBF601F3B9D8B0094061E /* FloatingPointType+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF5F1F3B9D8B0094061E /* FloatingPointType+IdentifiableType.swift */; };
25+
C81FBF631F3B9DC00094061E /* IntegerType+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF611F3B9DC00094061E /* IntegerType+IdentifiableType.swift */; };
26+
C81FBF641F3B9DC00094061E /* String+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF621F3B9DC00094061E /* String+IdentifiableType.swift */; };
27+
C81FBF661F3B9DF60094061E /* AnimationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF651F3B9DF60094061E /* AnimationConfiguration.swift */; };
2228
C82C3C5B1F3B937500309AE8 /* Differentiator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C82C3C541F3B937500309AE8 /* Differentiator.framework */; };
2329
C82C3C5C1F3B937500309AE8 /* Differentiator.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C82C3C541F3B937500309AE8 /* Differentiator.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2430
C82C3C871F3B939100309AE8 /* AnimatableSectionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C611F3B938C00309AE8 /* AnimatableSectionModel.swift */; };
2531
C82C3C881F3B939100309AE8 /* AnimatableSectionModelType+ItemPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C621F3B938C00309AE8 /* AnimatableSectionModelType+ItemPath.swift */; };
2632
C82C3C891F3B939100309AE8 /* AnimatableSectionModelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C631F3B938C00309AE8 /* AnimatableSectionModelType.swift */; };
27-
C82C3C8A1F3B939100309AE8 /* AnimationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C641F3B938C00309AE8 /* AnimationConfiguration.swift */; };
28-
C82C3C8B1F3B939100309AE8 /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C651F3B938C00309AE8 /* Array+Extensions.swift */; };
2933
C82C3C8C1F3B939100309AE8 /* Changeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C661F3B938C00309AE8 /* Changeset.swift */; };
3034
C82C3C8D1F3B939100309AE8 /* Diff.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C671F3B938C00309AE8 /* Diff.swift */; };
3135
C82C3C8E1F3B939100309AE8 /* Differentiator.h in Headers */ = {isa = PBXBuildFile; fileRef = C82C3C681F3B938C00309AE8 /* Differentiator.h */; settings = {ATTRIBUTES = (Public, ); }; };
32-
C82C3C8F1F3B939100309AE8 /* FloatingPointType+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C691F3B938C00309AE8 /* FloatingPointType+IdentifiableType.swift */; };
3336
C82C3C901F3B939100309AE8 /* IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C6A1F3B938C00309AE8 /* IdentifiableType.swift */; };
3437
C82C3C911F3B939100309AE8 /* IdentifiableValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C6B1F3B938C00309AE8 /* IdentifiableValue.swift */; };
35-
C82C3C931F3B939100309AE8 /* IntegerType+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C6D1F3B938C00309AE8 /* IntegerType+IdentifiableType.swift */; };
3638
C82C3C941F3B939100309AE8 /* ItemPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C6E1F3B938C00309AE8 /* ItemPath.swift */; };
3739
C82C3C951F3B939100309AE8 /* Optional+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C6F1F3B938C00309AE8 /* Optional+Extensions.swift */; };
3840
C82C3C961F3B939100309AE8 /* SectionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C701F3B938C00309AE8 /* SectionModel.swift */; };
3941
C82C3C971F3B939100309AE8 /* SectionModelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C711F3B938C00309AE8 /* SectionModelType.swift */; };
40-
C82C3C981F3B939100309AE8 /* String+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C721F3B938C00309AE8 /* String+IdentifiableType.swift */; };
4142
C82C3C991F3B939100309AE8 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C731F3B938C00309AE8 /* Utilities.swift */; };
4243
C8595DA91DEA3D4800FA20CD /* AlgorithmTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8595DA81DEA3D4800FA20CD /* AlgorithmTests.swift */; };
4344
C8595DAB1DEA3DB000FA20CD /* i.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8595DAA1DEA3DB000FA20CD /* i.swift */; };
@@ -314,26 +315,27 @@
314315
C81905B21DEA019100AE679C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
315316
C81905B91DEA0BD700AE679C /* ChangeSet+TestExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ChangeSet+TestExtensions.swift"; sourceTree = "<group>"; };
316317
C81905BD1DEA104400AE679C /* Array+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Extensions.swift"; sourceTree = "<group>"; };
318+
C81FBF451F3B9CED0094061E /* Differentiator.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Differentiator.podspec; sourceTree = "<group>"; };
319+
C81FBF5B1F3B9D4C0094061E /* Array+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Extensions.swift"; sourceTree = "<group>"; };
320+
C81FBF5F1F3B9D8B0094061E /* FloatingPointType+IdentifiableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FloatingPointType+IdentifiableType.swift"; sourceTree = "<group>"; };
321+
C81FBF611F3B9DC00094061E /* IntegerType+IdentifiableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IntegerType+IdentifiableType.swift"; sourceTree = "<group>"; };
322+
C81FBF621F3B9DC00094061E /* String+IdentifiableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+IdentifiableType.swift"; sourceTree = "<group>"; };
323+
C81FBF651F3B9DF60094061E /* AnimationConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationConfiguration.swift; sourceTree = "<group>"; };
317324
C82541851F363C76009F6C03 /* dependencies.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = dependencies.sh; sourceTree = "<group>"; };
318325
C82C3C541F3B937500309AE8 /* Differentiator.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Differentiator.framework; sourceTree = BUILT_PRODUCTS_DIR; };
319326
C82C3C611F3B938C00309AE8 /* AnimatableSectionModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimatableSectionModel.swift; sourceTree = "<group>"; };
320327
C82C3C621F3B938C00309AE8 /* AnimatableSectionModelType+ItemPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AnimatableSectionModelType+ItemPath.swift"; sourceTree = "<group>"; };
321328
C82C3C631F3B938C00309AE8 /* AnimatableSectionModelType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimatableSectionModelType.swift; sourceTree = "<group>"; };
322-
C82C3C641F3B938C00309AE8 /* AnimationConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationConfiguration.swift; sourceTree = "<group>"; };
323-
C82C3C651F3B938C00309AE8 /* Array+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Extensions.swift"; sourceTree = "<group>"; };
324329
C82C3C661F3B938C00309AE8 /* Changeset.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Changeset.swift; sourceTree = "<group>"; };
325330
C82C3C671F3B938C00309AE8 /* Diff.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Diff.swift; sourceTree = "<group>"; };
326331
C82C3C681F3B938C00309AE8 /* Differentiator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Differentiator.h; sourceTree = "<group>"; };
327-
C82C3C691F3B938C00309AE8 /* FloatingPointType+IdentifiableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FloatingPointType+IdentifiableType.swift"; sourceTree = "<group>"; };
328332
C82C3C6A1F3B938C00309AE8 /* IdentifiableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IdentifiableType.swift; sourceTree = "<group>"; };
329333
C82C3C6B1F3B938C00309AE8 /* IdentifiableValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IdentifiableValue.swift; sourceTree = "<group>"; };
330334
C82C3C6C1F3B938C00309AE8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
331-
C82C3C6D1F3B938C00309AE8 /* IntegerType+IdentifiableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IntegerType+IdentifiableType.swift"; sourceTree = "<group>"; };
332335
C82C3C6E1F3B938C00309AE8 /* ItemPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemPath.swift; sourceTree = "<group>"; };
333336
C82C3C6F1F3B938C00309AE8 /* Optional+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Optional+Extensions.swift"; sourceTree = "<group>"; };
334337
C82C3C701F3B938C00309AE8 /* SectionModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionModel.swift; sourceTree = "<group>"; };
335338
C82C3C711F3B938C00309AE8 /* SectionModelType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionModelType.swift; sourceTree = "<group>"; };
336-
C82C3C721F3B938C00309AE8 /* String+IdentifiableType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+IdentifiableType.swift"; sourceTree = "<group>"; };
337339
C82C3C731F3B938C00309AE8 /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = "<group>"; };
338340
C8595DA81DEA3D4800FA20CD /* AlgorithmTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AlgorithmTests.swift; sourceTree = "<group>"; };
339341
C8595DAA1DEA3DB000FA20CD /* i.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = i.swift; sourceTree = "<group>"; };
@@ -480,27 +482,31 @@
480482
path = Tests;
481483
sourceTree = "<group>";
482484
};
485+
C81FBF5A1F3B9CF10094061E /* Podspecs */ = {
486+
isa = PBXGroup;
487+
children = (
488+
C81FBF451F3B9CED0094061E /* Differentiator.podspec */,
489+
C861C0F01E153FC400BEDC46 /* RxDataSources.podspec */,
490+
);
491+
name = Podspecs;
492+
sourceTree = "<group>";
493+
};
483494
C82C3C601F3B938C00309AE8 /* Differentiator */ = {
484495
isa = PBXGroup;
485496
children = (
486497
C82C3C611F3B938C00309AE8 /* AnimatableSectionModel.swift */,
487498
C82C3C621F3B938C00309AE8 /* AnimatableSectionModelType+ItemPath.swift */,
488499
C82C3C631F3B938C00309AE8 /* AnimatableSectionModelType.swift */,
489-
C82C3C641F3B938C00309AE8 /* AnimationConfiguration.swift */,
490-
C82C3C651F3B938C00309AE8 /* Array+Extensions.swift */,
491500
C82C3C661F3B938C00309AE8 /* Changeset.swift */,
492501
C82C3C671F3B938C00309AE8 /* Diff.swift */,
493502
C82C3C681F3B938C00309AE8 /* Differentiator.h */,
494-
C82C3C691F3B938C00309AE8 /* FloatingPointType+IdentifiableType.swift */,
495503
C82C3C6A1F3B938C00309AE8 /* IdentifiableType.swift */,
496504
C82C3C6B1F3B938C00309AE8 /* IdentifiableValue.swift */,
497505
C82C3C6C1F3B938C00309AE8 /* Info.plist */,
498-
C82C3C6D1F3B938C00309AE8 /* IntegerType+IdentifiableType.swift */,
499506
C82C3C6E1F3B938C00309AE8 /* ItemPath.swift */,
500507
C82C3C6F1F3B938C00309AE8 /* Optional+Extensions.swift */,
501508
C82C3C701F3B938C00309AE8 /* SectionModel.swift */,
502509
C82C3C711F3B938C00309AE8 /* SectionModelType.swift */,
503-
C82C3C721F3B938C00309AE8 /* String+IdentifiableType.swift */,
504510
C82C3C731F3B938C00309AE8 /* Utilities.swift */,
505511
);
506512
path = Differentiator;
@@ -554,8 +560,8 @@
554560
C8984C501C36AF35001E4272 = {
555561
isa = PBXGroup;
556562
children = (
563+
C81FBF5A1F3B9CF10094061E /* Podspecs */,
557564
C82541851F363C76009F6C03 /* dependencies.sh */,
558-
C861C0F01E153FC400BEDC46 /* RxDataSources.podspec */,
559565
C87C34191F36346A00DB85FE /* Rx.xcodeproj */,
560566
C85EE5461C36F1FC0090614D /* Sources */,
561567
C8984C9C1C36B6FA001E4272 /* Example */,
@@ -609,6 +615,11 @@
609615
C8BBFBCB1F3B8F8D00A225F7 /* RxDataSources */ = {
610616
isa = PBXGroup;
611617
children = (
618+
C81FBF651F3B9DF60094061E /* AnimationConfiguration.swift */,
619+
C81FBF611F3B9DC00094061E /* IntegerType+IdentifiableType.swift */,
620+
C81FBF621F3B9DC00094061E /* String+IdentifiableType.swift */,
621+
C81FBF5F1F3B9D8B0094061E /* FloatingPointType+IdentifiableType.swift */,
622+
C81FBF5B1F3B9D4C0094061E /* Array+Extensions.swift */,
612623
C8BBFBCC1F3B8F8D00A225F7 /* CollectionViewSectionedDataSource.swift */,
613624
C8BBFBCD1F3B8F8D00A225F7 /* DataSources.swift */,
614625
C8BBFBCE1F3B8F8D00A225F7 /* Info.plist */,
@@ -994,6 +1005,7 @@
9941005
isa = PBXResourcesBuildPhase;
9951006
buildActionMask = 2147483647;
9961007
files = (
1008+
C81FBF461F3B9CED0094061E /* Differentiator.podspec in Resources */,
9971009
);
9981010
runOnlyForDeploymentPostprocessing = 0;
9991011
};
@@ -1053,38 +1065,38 @@
10531065
isa = PBXSourcesBuildPhase;
10541066
buildActionMask = 2147483647;
10551067
files = (
1056-
C82C3C8F1F3B939100309AE8 /* FloatingPointType+IdentifiableType.swift in Sources */,
10571068
C82C3C8D1F3B939100309AE8 /* Diff.swift in Sources */,
10581069
C82C3C891F3B939100309AE8 /* AnimatableSectionModelType.swift in Sources */,
10591070
C82C3C951F3B939100309AE8 /* Optional+Extensions.swift in Sources */,
10601071
C82C3C911F3B939100309AE8 /* IdentifiableValue.swift in Sources */,
10611072
C82C3C961F3B939100309AE8 /* SectionModel.swift in Sources */,
1062-
C82C3C931F3B939100309AE8 /* IntegerType+IdentifiableType.swift in Sources */,
10631073
C82C3C901F3B939100309AE8 /* IdentifiableType.swift in Sources */,
1064-
C82C3C8B1F3B939100309AE8 /* Array+Extensions.swift in Sources */,
10651074
C82C3C971F3B939100309AE8 /* SectionModelType.swift in Sources */,
10661075
C82C3C991F3B939100309AE8 /* Utilities.swift in Sources */,
10671076
C82C3C8C1F3B939100309AE8 /* Changeset.swift in Sources */,
10681077
C82C3C871F3B939100309AE8 /* AnimatableSectionModel.swift in Sources */,
1069-
C82C3C981F3B939100309AE8 /* String+IdentifiableType.swift in Sources */,
10701078
C82C3C941F3B939100309AE8 /* ItemPath.swift in Sources */,
10711079
C82C3C881F3B939100309AE8 /* AnimatableSectionModelType+ItemPath.swift in Sources */,
1072-
C82C3C8A1F3B939100309AE8 /* AnimationConfiguration.swift in Sources */,
10731080
);
10741081
runOnlyForDeploymentPostprocessing = 0;
10751082
};
10761083
C8984C551C36AF35001E4272 /* Sources */ = {
10771084
isa = PBXSourcesBuildPhase;
10781085
buildActionMask = 2147483647;
10791086
files = (
1087+
C81FBF641F3B9DC00094061E /* String+IdentifiableType.swift in Sources */,
10801088
C8BBFBDF1F3B8F8D00A225F7 /* RxTableViewSectionedReloadDataSource.swift in Sources */,
1089+
C81FBF5E1F3B9D660094061E /* Array+Extensions.swift in Sources */,
10811090
C8BBFBDE1F3B8F8D00A225F7 /* RxTableViewSectionedAnimatedDataSource.swift in Sources */,
1091+
C81FBF601F3B9D8B0094061E /* FloatingPointType+IdentifiableType.swift in Sources */,
1092+
C81FBF661F3B9DF60094061E /* AnimationConfiguration.swift in Sources */,
10821093
C8BBFBDA1F3B8F8D00A225F7 /* RxCollectionViewSectionedAnimatedDataSource.swift in Sources */,
10831094
C8BBFBD81F3B8F8D00A225F7 /* DataSources.swift in Sources */,
10841095
C8BBFBD71F3B8F8D00A225F7 /* CollectionViewSectionedDataSource.swift in Sources */,
10851096
C8BBFBE01F3B8F8D00A225F7 /* TableViewSectionedDataSource.swift in Sources */,
10861097
C8BBFBE11F3B8F8D00A225F7 /* UI+SectionedViewType.swift in Sources */,
10871098
C8BBFBDB1F3B8F8D00A225F7 /* RxCollectionViewSectionedReloadDataSource.swift in Sources */,
1099+
C81FBF631F3B9DC00094061E /* IntegerType+IdentifiableType.swift in Sources */,
10881100
C8BBFBDD1F3B8F8D00A225F7 /* RxPickerViewAdapter.swift in Sources */,
10891101
);
10901102
runOnlyForDeploymentPostprocessing = 0;

Sources/Differentiator/Array+Extensions.swift renamed to Sources/RxDataSources/Array+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import Foundation
1010

1111
extension Array where Element: SectionModelType {
12-
public mutating func moveFromSourceIndexPath(_ sourceIndexPath: IndexPath, destinationIndexPath: IndexPath) {
12+
mutating func moveFromSourceIndexPath(_ sourceIndexPath: IndexPath, destinationIndexPath: IndexPath) {
1313
let sourceSection = self[sourceIndexPath.section]
1414
var sourceItems = sourceSection.items
1515

0 commit comments

Comments
 (0)