Skip to content

Commit 9a75e92

Browse files
mbucheticsmbuchetics
committed
added Differ via SPM, bumped version
1 parent c1ae0fc commit 9a75e92

6 files changed

Lines changed: 91 additions & 53 deletions

File tree

‎Cartfile‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎DataSource.xcodeproj/project.pbxproj‎

Lines changed: 70 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -40,8 +40,6 @@
4040
39A848691E5E1D9600D7DBC2 /* DataSource.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 395D14A41B90612D00658680 /* DataSource.framework */; };
4141
39A848751E5E2DEC00D7DBC2 /* DataSource.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 395D14A41B90612D00658680 /* DataSource.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4242
39B621801E6D757000BE18EE /* DataSource+UITableViewDataSourcePrefetching.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39B6217F1E6D757000BE18EE /* DataSource+UITableViewDataSourcePrefetching.swift */; };
43-
39D22FF7221C403C00C12A01 /* Differ.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39D22FF6221C403C00C12A01 /* Differ.framework */; };
44-
39D22FF8221C40BB00C12A01 /* Differ.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 39D22FF6221C403C00C12A01 /* Differ.framework */; };
4543
39E9E3A81E6566AD00A3C300 /* PersonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E9E3A51E6566AD00A3C300 /* PersonCell.swift */; };
4644
39E9E3A91E6566AD00A3C300 /* TitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39E9E3A61E6566AD00A3C300 /* TitleCell.swift */; };
4745
39E9E3AA1E6566AD00A3C300 /* TitleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 39E9E3A71E6566AD00A3C300 /* TitleCell.xib */; };
@@ -53,6 +51,7 @@
5351
4C6076DF21490C80002E8BD1 /* SeparatedSectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C6076DE21490C80002E8BD1 /* SeparatedSectionViewController.swift */; };
5452
4CA65F60214F952E004F2F19 /* UIView+AutoLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CA65F5F214F952E004F2F19 /* UIView+AutoLayout.swift */; };
5553
5C61C91820AF0AB0003A08B8 /* SwipeActionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C61C91720AF0AB0003A08B8 /* SwipeActionViewController.swift */; };
54+
5FD722022500F36800835AA1 /* Differ in Frameworks */ = {isa = PBXBuildFile; productRef = 5FD722012500F36800835AA1 /* Differ */; };
5655
D8D61BEE21E4DD3E00937D1C /* SeparatorLineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D61BED21E4DD3E00937D1C /* SeparatorLineViewModel.swift */; };
5756
D8D61BF021E4E11300937D1C /* SeparatorCustomViewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D61BEF21E4E11300937D1C /* SeparatorCustomViewViewModel.swift */; };
5857
/* End PBXBuildFile section */
@@ -130,7 +129,6 @@
130129
398248A91E5C6DDC00F802D1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
131130
398248AB1E5C6DDC00F802D1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
132131
398248AE1E5C6EFB00F802D1 /* DataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataSource.swift; sourceTree = "<group>"; };
133-
398248B31E5C704700F802D1 /* Cartfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
134132
398248B41E5C705000F802D1 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
135133
398248C01E5C7A3500F802D1 /* Row.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Row.swift; sourceTree = "<group>"; };
136134
398248C21E5C7A4000F802D1 /* Section.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Section.swift; sourceTree = "<group>"; };
@@ -145,7 +143,6 @@
145143
39A848661E5E1D9600D7DBC2 /* DataSourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataSourceTests.swift; sourceTree = "<group>"; };
146144
39A848681E5E1D9600D7DBC2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
147145
39B6217F1E6D757000BE18EE /* DataSource+UITableViewDataSourcePrefetching.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DataSource+UITableViewDataSourcePrefetching.swift"; sourceTree = "<group>"; };
148-
39D22FF6221C403C00C12A01 /* Differ.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Differ.framework; path = Carthage/Build/iOS/Differ.framework; sourceTree = "<group>"; };
149146
39E9E3A51E6566AD00A3C300 /* PersonCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersonCell.swift; sourceTree = "<group>"; };
150147
39E9E3A61E6566AD00A3C300 /* TitleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TitleCell.swift; sourceTree = "<group>"; };
151148
39E9E3A71E6566AD00A3C300 /* TitleCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TitleCell.xib; sourceTree = "<group>"; };
@@ -166,7 +163,6 @@
166163
isa = PBXFrameworksBuildPhase;
167164
buildActionMask = 2147483647;
168165
files = (
169-
39D22FF8221C40BB00C12A01 /* Differ.framework in Frameworks */,
170166
395D14B91B90612D00658680 /* DataSource.framework in Frameworks */,
171167
);
172168
runOnlyForDeploymentPostprocessing = 0;
@@ -175,7 +171,7 @@
175171
isa = PBXFrameworksBuildPhase;
176172
buildActionMask = 2147483647;
177173
files = (
178-
39D22FF7221C403C00C12A01 /* Differ.framework in Frameworks */,
174+
5FD722022500F36800835AA1 /* Differ in Frameworks */,
179175
);
180176
runOnlyForDeploymentPostprocessing = 0;
181177
};
@@ -193,12 +189,10 @@
193189
395D14731B90610A00658680 = {
194190
isa = PBXGroup;
195191
children = (
196-
398248B31E5C704700F802D1 /* Cartfile */,
197192
398248B41E5C705000F802D1 /* README.md */,
198193
395D14A51B90612D00658680 /* DataSource */,
199194
39A848651E5E1D9600D7DBC2 /* DataSourceTests */,
200195
395D147E1B90610A00658680 /* Example */,
201-
398248B51E5C707A00F802D1 /* Frameworks */,
202196
395D147D1B90610A00658680 /* Products */,
203197
);
204198
sourceTree = "<group>";
@@ -284,14 +278,6 @@
284278
path = Storyboards;
285279
sourceTree = "<group>";
286280
};
287-
398248B51E5C707A00F802D1 /* Frameworks */ = {
288-
isa = PBXGroup;
289-
children = (
290-
39D22FF6221C403C00C12A01 /* Differ.framework */,
291-
);
292-
name = Frameworks;
293-
sourceTree = "<group>";
294-
};
295281
39913AB61E61BBB900623635 /* Utilities */ = {
296282
isa = PBXGroup;
297283
children = (
@@ -366,7 +352,6 @@
366352
395D14791B90610A00658680 /* Frameworks */,
367353
395D147A1B90610A00658680 /* Resources */,
368354
395D14BE1B90612D00658680 /* Embed Frameworks */,
369-
398248B81E5C70B900F802D1 /* Carthage */,
370355
);
371356
buildRules = (
372357
);
@@ -392,6 +377,9 @@
392377
dependencies = (
393378
);
394379
name = DataSource;
380+
packageProductDependencies = (
381+
5FD722012500F36800835AA1 /* Differ */,
382+
);
395383
productName = DataSource;
396384
productReference = 395D14A41B90612D00658680 /* DataSource.framework */;
397385
productType = "com.apple.product-type.framework";
@@ -464,6 +452,9 @@
464452
Base,
465453
);
466454
mainGroup = 395D14731B90610A00658680;
455+
packageReferences = (
456+
5FD722002500F36800835AA1 /* XCRemoteSwiftPackageReference "Differ" */,
457+
);
467458
productRefGroup = 395D147D1B90610A00658680 /* Products */;
468459
projectDirPath = "";
469460
projectRoot = "";
@@ -504,24 +495,6 @@
504495
};
505496
/* End PBXResourcesBuildPhase section */
506497

507-
/* Begin PBXShellScriptBuildPhase section */
508-
398248B81E5C70B900F802D1 /* Carthage */ = {
509-
isa = PBXShellScriptBuildPhase;
510-
buildActionMask = 2147483647;
511-
files = (
512-
);
513-
inputPaths = (
514-
"$(SRCROOT)/Carthage/Build/iOS/Differ.framework",
515-
);
516-
name = Carthage;
517-
outputPaths = (
518-
);
519-
runOnlyForDeploymentPostprocessing = 0;
520-
shellPath = /bin/sh;
521-
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
522-
};
523-
/* End PBXShellScriptBuildPhase section */
524-
525498
/* Begin PBXSourcesBuildPhase section */
526499
395D14781B90610A00658680 /* Sources */ = {
527500
isa = PBXSourcesBuildPhase;
@@ -727,14 +700,19 @@
727700
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
728701
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
729702
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
703+
CURRENT_PROJECT_VERSION = 80;
730704
DEVELOPMENT_TEAM = M8F9QH57A6;
731705
FRAMEWORK_SEARCH_PATHS = (
732706
"$(inherited)",
733707
"$(PROJECT_DIR)/Carthage/Build/iOS",
734708
);
735709
INFOPLIST_FILE = Example/Info.plist;
736710
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
737-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
711+
LD_RUNPATH_SEARCH_PATHS = (
712+
"$(inherited)",
713+
"@executable_path/Frameworks",
714+
);
715+
MARKETING_VERSION = 8.1.0;
738716
PRODUCT_BUNDLE_IDENTIFIER = com.buchetics.DataSourceExample;
739717
PRODUCT_NAME = "$(TARGET_NAME)";
740718
PROVISIONING_PROFILE = "";
@@ -749,19 +727,25 @@
749727
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
750728
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
751729
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
730+
CURRENT_PROJECT_VERSION = 80;
752731
DEVELOPMENT_TEAM = M8F9QH57A6;
753732
FRAMEWORK_SEARCH_PATHS = (
754733
"$(inherited)",
755734
"$(PROJECT_DIR)/Carthage/Build/iOS",
756735
);
757736
INFOPLIST_FILE = Example/Info.plist;
758737
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
759-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
738+
LD_RUNPATH_SEARCH_PATHS = (
739+
"$(inherited)",
740+
"@executable_path/Frameworks",
741+
);
742+
MARKETING_VERSION = 8.1.0;
760743
PRODUCT_BUNDLE_IDENTIFIER = com.buchetics.DataSourceExample;
761744
PRODUCT_NAME = "$(TARGET_NAME)";
762745
PROVISIONING_PROFILE = "";
763746
PROVISIONING_PROFILE_SPECIFIER = "";
764-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
747+
SWIFT_COMPILATION_MODE = wholemodule;
748+
SWIFT_OPTIMIZATION_LEVEL = "-O";
765749
SWIFT_VERSION = 5.0;
766750
};
767751
name = Release;
@@ -773,7 +757,7 @@
773757
CODE_SIGN_IDENTITY = "";
774758
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
775759
CODE_SIGN_STYLE = Automatic;
776-
CURRENT_PROJECT_VERSION = 1;
760+
CURRENT_PROJECT_VERSION = 80;
777761
DEFINES_MODULE = YES;
778762
DEVELOPMENT_TEAM = M8F9QH57A6;
779763
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -785,7 +769,12 @@
785769
);
786770
INFOPLIST_FILE = DataSource/Info.plist;
787771
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
788-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
772+
LD_RUNPATH_SEARCH_PATHS = (
773+
"$(inherited)",
774+
"@executable_path/Frameworks",
775+
"@loader_path/Frameworks",
776+
);
777+
MARKETING_VERSION = 8.1.0;
789778
PRODUCT_BUNDLE_IDENTIFIER = com.buchetics.DataSource;
790779
PRODUCT_NAME = "$(TARGET_NAME)";
791780
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -805,7 +794,7 @@
805794
CODE_SIGN_IDENTITY = "";
806795
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
807796
CODE_SIGN_STYLE = Automatic;
808-
CURRENT_PROJECT_VERSION = 1;
797+
CURRENT_PROJECT_VERSION = 80;
809798
DEFINES_MODULE = YES;
810799
DEVELOPMENT_TEAM = M8F9QH57A6;
811800
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -817,12 +806,18 @@
817806
);
818807
INFOPLIST_FILE = DataSource/Info.plist;
819808
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
820-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
809+
LD_RUNPATH_SEARCH_PATHS = (
810+
"$(inherited)",
811+
"@executable_path/Frameworks",
812+
"@loader_path/Frameworks",
813+
);
814+
MARKETING_VERSION = 8.1.0;
821815
PRODUCT_BUNDLE_IDENTIFIER = com.buchetics.DataSource;
822816
PRODUCT_NAME = "$(TARGET_NAME)";
823817
PROVISIONING_PROFILE_SPECIFIER = "";
824818
SKIP_INSTALL = YES;
825-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
819+
SWIFT_COMPILATION_MODE = wholemodule;
820+
SWIFT_OPTIMIZATION_LEVEL = "-O";
826821
SWIFT_VERSION = 5.0;
827822
TARGETED_DEVICE_FAMILY = "1,2";
828823
VERSIONING_SYSTEM = "apple-generic";
@@ -843,7 +838,11 @@
843838
);
844839
INFOPLIST_FILE = DataSourceTests/Info.plist;
845840
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
846-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
841+
LD_RUNPATH_SEARCH_PATHS = (
842+
"$(inherited)",
843+
"@executable_path/Frameworks",
844+
"@loader_path/Frameworks",
845+
);
847846
PRODUCT_BUNDLE_IDENTIFIER = com.buchetics.DataSourceTests;
848847
PRODUCT_NAME = "$(TARGET_NAME)";
849848
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -865,10 +864,15 @@
865864
);
866865
INFOPLIST_FILE = DataSourceTests/Info.plist;
867866
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
868-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
867+
LD_RUNPATH_SEARCH_PATHS = (
868+
"$(inherited)",
869+
"@executable_path/Frameworks",
870+
"@loader_path/Frameworks",
871+
);
869872
PRODUCT_BUNDLE_IDENTIFIER = com.buchetics.DataSourceTests;
870873
PRODUCT_NAME = "$(TARGET_NAME)";
871-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
874+
SWIFT_COMPILATION_MODE = wholemodule;
875+
SWIFT_OPTIMIZATION_LEVEL = "-O";
872876
SWIFT_VERSION = 5.0;
873877
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
874878
};
@@ -914,6 +918,25 @@
914918
defaultConfigurationName = Release;
915919
};
916920
/* End XCConfigurationList section */
921+
922+
/* Begin XCRemoteSwiftPackageReference section */
923+
5FD722002500F36800835AA1 /* XCRemoteSwiftPackageReference "Differ" */ = {
924+
isa = XCRemoteSwiftPackageReference;
925+
repositoryURL = "https://github.com/tonyarnold/Differ";
926+
requirement = {
927+
kind = upToNextMajorVersion;
928+
minimumVersion = 1.4.5;
929+
};
930+
};
931+
/* End XCRemoteSwiftPackageReference section */
932+
933+
/* Begin XCSwiftPackageProductDependency section */
934+
5FD722012500F36800835AA1 /* Differ */ = {
935+
isa = XCSwiftPackageProductDependency;
936+
package = 5FD722002500F36800835AA1 /* XCRemoteSwiftPackageReference "Differ" */;
937+
productName = Differ;
938+
};
939+
/* End XCSwiftPackageProductDependency section */
917940
};
918941
rootObject = 395D14741B90610A00658680 /* Project object */;
919942
}

‎DataSource.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DataSource.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DataSource/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>5.2.0</string>
18+
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>50</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>NSPrincipalClass</key>
2424
<string></string>
2525
</dict>

‎Example/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>5.2.0</string>
18+
<string>$(MARKETING_VERSION)</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>50</string>
22+
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>UILaunchStoryboardName</key>

0 commit comments

Comments
 (0)