Skip to content

Commit c58f7ff

Browse files
andersioandersio
committed
Collection diffing.
1 parent ce2830c commit c58f7ff

File tree

7 files changed

+1440
-30
lines changed

7 files changed

+1440
-30
lines changed

‎FlexibleDiff.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
9A4CCB5D1F95E22100ACF758 /* Nimble.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9A4CCB5B1F95E21700ACF758 /* Nimble.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1414
9A4CCB5E1F95E22100ACF758 /* Quick.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9A4CCB5C1F95E21700ACF758 /* Quick.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1515
9A4CCB621F95E38A00ACF758 /* FlexibleDiff.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A4CCB611F95E38A00ACF758 /* FlexibleDiff.h */; settings = {ATTRIBUTES = (Public, ); }; };
16-
9A4CCB681F95E73200ACF758 /* Placeholder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A4CCB671F95E73200ACF758 /* Placeholder.swift */; };
17-
9A4CCB6A1F95E74800ACF758 /* FlexibleDiffSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A4CCB691F95E74800ACF758 /* FlexibleDiffSpec.swift */; };
16+
9AD5D41A1F95F7FE00E6AE5A /* Changeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD5D4181F95F7FE00E6AE5A /* Changeset.swift */; };
17+
9AD5D41B1F95F7FE00E6AE5A /* Snapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD5D4191F95F7FE00E6AE5A /* Snapshot.swift */; };
18+
9AD5D41E1F95F80900E6AE5A /* Delta+NimbleMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD5D41C1F95F80900E6AE5A /* Delta+NimbleMatcher.swift */; };
19+
9AD5D41F1F95F80900E6AE5A /* ChangesetSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD5D41D1F95F80900E6AE5A /* ChangesetSpec.swift */; };
1820
/* End PBXBuildFile section */
1921

2022
/* Begin PBXContainerItemProxy section */
@@ -78,8 +80,10 @@
7880
9A4CCB5B1F95E21700ACF758 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7981
9A4CCB5C1F95E21700ACF758 /* Quick.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8082
9A4CCB611F95E38A00ACF758 /* FlexibleDiff.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FlexibleDiff.h; sourceTree = "<group>"; };
81-
9A4CCB671F95E73200ACF758 /* Placeholder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Placeholder.swift; sourceTree = "<group>"; };
82-
9A4CCB691F95E74800ACF758 /* FlexibleDiffSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = FlexibleDiffSpec.swift; sourceTree = "<group>"; tabWidth = 4; };
83+
9AD5D4181F95F7FE00E6AE5A /* Changeset.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Changeset.swift; sourceTree = "<group>"; };
84+
9AD5D4191F95F7FE00E6AE5A /* Snapshot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Snapshot.swift; sourceTree = "<group>"; };
85+
9AD5D41C1F95F80900E6AE5A /* Delta+NimbleMatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Delta+NimbleMatcher.swift"; sourceTree = "<group>"; };
86+
9AD5D41D1F95F80900E6AE5A /* ChangesetSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangesetSpec.swift; sourceTree = "<group>"; };
8387
/* End PBXFileReference section */
8488

8589
/* Begin PBXFrameworksBuildPhase section */
@@ -129,9 +133,10 @@
129133
9A4CCB1A1F95DEF000ACF758 /* FlexibleDiff */ = {
130134
isa = PBXGroup;
131135
children = (
136+
9AD5D4181F95F7FE00E6AE5A /* Changeset.swift */,
137+
9AD5D4191F95F7FE00E6AE5A /* Snapshot.swift */,
132138
9A4CCB1C1F95DEF000ACF758 /* Info.plist */,
133139
9A4CCB611F95E38A00ACF758 /* FlexibleDiff.h */,
134-
9A4CCB671F95E73200ACF758 /* Placeholder.swift */,
135140
);
136141
path = FlexibleDiff;
137142
sourceTree = "<group>";
@@ -232,7 +237,8 @@
232237
9A4CCB4D1F95E18900ACF758 /* FlexibleDiffTests */ = {
233238
isa = PBXGroup;
234239
children = (
235-
9A4CCB691F95E74800ACF758 /* FlexibleDiffSpec.swift */,
240+
9AD5D41D1F95F80900E6AE5A /* ChangesetSpec.swift */,
241+
9AD5D41C1F95F80900E6AE5A /* Delta+NimbleMatcher.swift */,
236242
9A4CCB501F95E18900ACF758 /* Info.plist */,
237243
);
238244
path = FlexibleDiffTests;
@@ -359,15 +365,17 @@
359365
isa = PBXSourcesBuildPhase;
360366
buildActionMask = 2147483647;
361367
files = (
362-
9A4CCB681F95E73200ACF758 /* Placeholder.swift in Sources */,
368+
9AD5D41A1F95F7FE00E6AE5A /* Changeset.swift in Sources */,
369+
9AD5D41B1F95F7FE00E6AE5A /* Snapshot.swift in Sources */,
363370
);
364371
runOnlyForDeploymentPostprocessing = 0;
365372
};
366373
9A4CCB481F95E18900ACF758 /* Sources */ = {
367374
isa = PBXSourcesBuildPhase;
368375
buildActionMask = 2147483647;
369376
files = (
370-
9A4CCB6A1F95E74800ACF758 /* FlexibleDiffSpec.swift in Sources */,
377+
9AD5D41E1F95F80900E6AE5A /* Delta+NimbleMatcher.swift in Sources */,
378+
9AD5D41F1F95F80900E6AE5A /* ChangesetSpec.swift in Sources */,
371379
);
372380
runOnlyForDeploymentPostprocessing = 0;
373381
};
@@ -509,7 +517,6 @@
509517
isa = XCBuildConfiguration;
510518
baseConfigurationReference = 9A4CCB461F95E04C00ACF758 /* Framework.xcconfig */;
511519
buildSettings = {
512-
CLANG_ENABLE_MODULES = YES;
513520
DEFINES_MODULE = YES;
514521
DYLIB_COMPATIBILITY_VERSION = 1;
515522
DYLIB_CURRENT_VERSION = 1;
@@ -521,8 +528,6 @@
521528
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
522529
SDKROOT = macosx;
523530
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos watchsimulator watchos appletvsimulator appletvos";
524-
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
525-
SWIFT_VERSION = 3.0;
526531
TARGETED_DEVICE_FAMILY = "1,2,3,4";
527532
VALID_ARCHS = "i386 x86_64 arm64 armv7 armv7s armv7k";
528533
};
@@ -532,7 +537,6 @@
532537
isa = XCBuildConfiguration;
533538
baseConfigurationReference = 9A4CCB461F95E04C00ACF758 /* Framework.xcconfig */;
534539
buildSettings = {
535-
CLANG_ENABLE_MODULES = YES;
536540
DEFINES_MODULE = YES;
537541
DYLIB_COMPATIBILITY_VERSION = 1;
538542
DYLIB_CURRENT_VERSION = 1;
@@ -544,7 +548,6 @@
544548
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
545549
SDKROOT = macosx;
546550
SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos watchsimulator watchos appletvsimulator appletvos";
547-
SWIFT_VERSION = 3.0;
548551
TARGETED_DEVICE_FAMILY = "1,2,3,4";
549552
VALID_ARCHS = "i386 x86_64 arm64 armv7 armv7s armv7k";
550553
};
@@ -554,30 +557,25 @@
554557
isa = XCBuildConfiguration;
555558
buildSettings = {
556559
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
557-
CLANG_ENABLE_MODULES = YES;
558560
INFOPLIST_FILE = FlexibleDiffTests/Info.plist;
559561
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
560562
PRODUCT_BUNDLE_IDENTIFIER = org.reactivecocoa.FlexibleDiffTests;
561563
PRODUCT_NAME = "$(TARGET_NAME)";
562564
SDKROOT = macosx;
563565
SUPPORTED_PLATFORMS = "macosx appletvsimulator watchsimulator iphonesimulator";
564-
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
565-
SWIFT_VERSION = 3.0;
566566
};
567567
name = Debug;
568568
};
569569
9A4CCB561F95E18900ACF758 /* Release */ = {
570570
isa = XCBuildConfiguration;
571571
buildSettings = {
572572
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
573-
CLANG_ENABLE_MODULES = YES;
574573
INFOPLIST_FILE = FlexibleDiffTests/Info.plist;
575574
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
576575
PRODUCT_BUNDLE_IDENTIFIER = org.reactivecocoa.FlexibleDiffTests;
577576
PRODUCT_NAME = "$(TARGET_NAME)";
578577
SDKROOT = macosx;
579578
SUPPORTED_PLATFORMS = "macosx appletvsimulator watchsimulator iphonesimulator";
580-
SWIFT_VERSION = 3.0;
581579
};
582580
name = Release;
583581
};

0 commit comments

Comments
 (0)