Skip to content

Commit c16a11a

Browse files
jasdeepsainijasdeepsaini
committed
Fixes to get the project and tests to build:
- Deleted the missing `MapTo` and `MapToTests` files. - Changed the deployment target to iOS 13 to match the minimum target of the Package file. - Updated the CombineSchedulers package to 0.5.3 to match the Package file. - The Package.resolved file automatically got updated to v2 since I am using Xcode 13. Project cleanup - Deleted the missing `Carthage` and `CHANGELOG.MD` files. Missing library and test files added to the project: - `MapToValue.swift` - `MapToValueTests.swift` - `MapToResult.swift` - `MapToResultTests.swift` - `Enumerated.swift` - `EnumeratedTests.swift`
1 parent 5818492 commit c16a11a

5 files changed

Lines changed: 59 additions & 40 deletions

File tree

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Packages
33
xcuserdata
44
DerivedData/
55
Carthage
6-
CombineExt.framework.zip
6+
CombineExt.framework.zip

‎CombineExt.xcodeproj/project.pbxproj‎

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
/* Begin PBXBuildFile section */
2525
1970A8AA25246FBD00799AB6 /* FilterMany.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1970A8A925246FBD00799AB6 /* FilterMany.swift */; };
2626
1970A8B42524730500799AB6 /* FilterManyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1970A8B32524730400799AB6 /* FilterManyTests.swift */; };
27-
3793CBD428286BB20060441B /* MapTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3793CBD328286BB20060441B /* MapTo.swift */; };
28-
3793CBD728286C090060441B /* MapToTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3793CBD528286BE90060441B /* MapToTests.swift */; };
2927
712E36C82711B79000A2AAFE /* RetryWhen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 712E36C72711B79000A2AAFE /* RetryWhen.swift */; };
3028
7182326F26DAAF230026BAD3 /* RetryWhenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7182326E26DAAF230026BAD3 /* RetryWhenTests.swift */; };
3129
BF330EF624F1FFFE001281FC /* CombineSchedulers in Frameworks */ = {isa = PBXBuildFile; productRef = BF330EF524F1FFFE001281FC /* CombineSchedulers */; };
@@ -41,6 +39,12 @@
4139
C387777F24E6BF8F00FAD2D8 /* NwiseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C387777D24E6BF6C00FAD2D8 /* NwiseTests.swift */; };
4240
D836234824EA9446002353AC /* MergeMany.swift in Sources */ = {isa = PBXBuildFile; fileRef = D836234724EA9446002353AC /* MergeMany.swift */; };
4341
D836234A24EA9888002353AC /* MergeManyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D836234924EA9888002353AC /* MergeManyTests.swift */; };
42+
EA0D86CE287D19CC0085356E /* MapToValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86CB287D19CC0085356E /* MapToValue.swift */; };
43+
EA0D86CF287D19CC0085356E /* MapToResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86CC287D19CC0085356E /* MapToResult.swift */; };
44+
EA0D86D0287D19CC0085356E /* Enumerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86CD287D19CC0085356E /* Enumerated.swift */; };
45+
EA0D86D4287D19DC0085356E /* EnumeratedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86D1287D19DC0085356E /* EnumeratedTests.swift */; };
46+
EA0D86D5287D19DC0085356E /* MapToResultTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86D2287D19DC0085356E /* MapToResultTests.swift */; };
47+
EA0D86D6287D19DC0085356E /* MapToValueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86D3287D19DC0085356E /* MapToValueTests.swift */; };
4448
OBJ_100 /* ZipMany.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_33 /* ZipMany.swift */; };
4549
OBJ_101 /* CurrentValueRelay.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_35 /* CurrentValueRelay.swift */; };
4650
OBJ_102 /* PassthroughRelay.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_36 /* PassthroughRelay.swift */; };
@@ -112,8 +116,6 @@
112116
/* Begin PBXFileReference section */
113117
1970A8A925246FBD00799AB6 /* FilterMany.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterMany.swift; sourceTree = "<group>"; };
114118
1970A8B32524730400799AB6 /* FilterManyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterManyTests.swift; sourceTree = "<group>"; };
115-
3793CBD328286BB20060441B /* MapTo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTo.swift; sourceTree = "<group>"; };
116-
3793CBD528286BE90060441B /* MapToTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapToTests.swift; sourceTree = "<group>"; };
117119
712E36C72711B79000A2AAFE /* RetryWhen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetryWhen.swift; sourceTree = "<group>"; };
118120
7182326E26DAAF230026BAD3 /* RetryWhenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetryWhenTests.swift; sourceTree = "<group>"; };
119121
BF330EF824F20032001281FC /* Timer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Timer.swift; sourceTree = "<group>"; };
@@ -130,6 +132,12 @@
130132
"CombineExt::CombineExtTests::Product" /* CombineExtTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = CombineExtTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
131133
D836234724EA9446002353AC /* MergeMany.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MergeMany.swift; sourceTree = "<group>"; };
132134
D836234924EA9888002353AC /* MergeManyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MergeManyTests.swift; sourceTree = "<group>"; };
135+
EA0D86CB287D19CC0085356E /* MapToValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapToValue.swift; sourceTree = "<group>"; };
136+
EA0D86CC287D19CC0085356E /* MapToResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapToResult.swift; sourceTree = "<group>"; };
137+
EA0D86CD287D19CC0085356E /* Enumerated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Enumerated.swift; sourceTree = "<group>"; };
138+
EA0D86D1287D19DC0085356E /* EnumeratedTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumeratedTests.swift; sourceTree = "<group>"; };
139+
EA0D86D2287D19DC0085356E /* MapToResultTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapToResultTests.swift; sourceTree = "<group>"; };
140+
EA0D86D3287D19DC0085356E /* MapToValueTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapToValueTests.swift; sourceTree = "<group>"; };
133141
OBJ_10 /* Sink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sink.swift; sourceTree = "<group>"; };
134142
OBJ_12 /* Optional.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Optional.swift; sourceTree = "<group>"; };
135143
OBJ_14 /* Event.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Event.swift; sourceTree = "<group>"; };
@@ -178,11 +186,9 @@
178186
OBJ_60 /* WithLatestFromTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WithLatestFromTests.swift; sourceTree = "<group>"; };
179187
OBJ_61 /* ZipManyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZipManyTests.swift; sourceTree = "<group>"; };
180188
OBJ_65 /* Resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Resources; sourceTree = SOURCE_ROOT; };
181-
OBJ_66 /* Carthage */ = {isa = PBXFileReference; lastKnownFileType = text; path = Carthage; sourceTree = SOURCE_ROOT; };
182189
OBJ_67 /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = scripts; sourceTree = SOURCE_ROOT; };
183190
OBJ_68 /* codecov.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = codecov.yml; sourceTree = "<group>"; };
184191
OBJ_69 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
185-
OBJ_70 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
186192
OBJ_71 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
187193
OBJ_72 /* CombineExt.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = CombineExt.podspec; sourceTree = "<group>"; };
188194
OBJ_73 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -252,25 +258,27 @@
252258
OBJ_20 /* CombineLatestMany.swift */,
253259
OBJ_21 /* Create.swift */,
254260
OBJ_22 /* Dematerialize.swift */,
261+
EA0D86CD287D19CC0085356E /* Enumerated.swift */,
262+
1970A8A925246FBD00799AB6 /* FilterMany.swift */,
263+
BFADDC8025BCE4C200465E9B /* FlatMapBatches.swift */,
255264
OBJ_23 /* FlatMapLatest.swift */,
265+
BF3D3B5C253B83F300D830ED /* IgnoreFailure.swift */,
266+
BF43CC1425008B4F005AFA28 /* IgnoreOutputSetOutputType.swift */,
256267
OBJ_24 /* MapMany.swift */,
257-
D836234724EA9446002353AC /* MergeMany.swift */,
258-
3793CBD328286BB20060441B /* MapTo.swift */,
268+
EA0D86CC287D19CC0085356E /* MapToResult.swift */,
269+
EA0D86CB287D19CC0085356E /* MapToValue.swift */,
259270
OBJ_25 /* Materialize.swift */,
271+
D836234724EA9446002353AC /* MergeMany.swift */,
260272
C387777B24E6BBE900FAD2D8 /* Nwise.swift */,
261273
OBJ_26 /* Partition.swift */,
262274
OBJ_27 /* PrefixDuration.swift */,
263275
OBJ_28 /* RemoveAllDuplicates.swift */,
264276
712E36C72711B79000A2AAFE /* RetryWhen.swift */,
265277
OBJ_29 /* SetOutputType.swift */,
266-
BF43CC1425008B4F005AFA28 /* IgnoreOutputSetOutputType.swift */,
267-
BF3D3B5C253B83F300D830ED /* IgnoreFailure.swift */,
268278
OBJ_30 /* ShareReplay.swift */,
269279
OBJ_31 /* Toggle.swift */,
270280
OBJ_32 /* WithLatestFrom.swift */,
271281
OBJ_33 /* ZipMany.swift */,
272-
1970A8A925246FBD00799AB6 /* FilterMany.swift */,
273-
BFADDC8025BCE4C200465E9B /* FlatMapBatches.swift */,
274282
);
275283
path = Operators;
276284
sourceTree = "<group>";
@@ -303,10 +311,15 @@
303311
OBJ_45 /* CreateTests.swift */,
304312
OBJ_46 /* CurrentValueRelayTests.swift */,
305313
OBJ_47 /* DematerializeTests.swift */,
314+
EA0D86D1287D19DC0085356E /* EnumeratedTests.swift */,
315+
1970A8B32524730400799AB6 /* FilterManyTests.swift */,
316+
BFADDC8A25BCE91E00465E9B /* FlatMapBatchesTests.swift */,
306317
OBJ_48 /* FlatMapLatestTests.swift */,
318+
BF3D3B66253B88E500D830ED /* IgnoreFailureTests.swift */,
319+
BF43CC1625008C45005AFA28 /* IgnoreOutputSetOutputTypeTests.swift */,
307320
OBJ_49 /* MapManyTests.swift */,
308-
3793CBD528286BE90060441B /* MapToTests.swift */,
309-
1970A8B32524730400799AB6 /* FilterManyTests.swift */,
321+
EA0D86D2287D19DC0085356E /* MapToResultTests.swift */,
322+
EA0D86D3287D19DC0085356E /* MapToValueTests.swift */,
310323
OBJ_50 /* MaterializeTests.swift */,
311324
D836234924EA9888002353AC /* MergeManyTests.swift */,
312325
C387777D24E6BF6C00FAD2D8 /* NwiseTests.swift */,
@@ -318,13 +331,10 @@
318331
OBJ_56 /* ReplaySubjectTests.swift */,
319332
7182326E26DAAF230026BAD3 /* RetryWhenTests.swift */,
320333
OBJ_57 /* SetOutputTypeTests.swift */,
321-
BF43CC1625008C45005AFA28 /* IgnoreOutputSetOutputTypeTests.swift */,
322-
BF3D3B66253B88E500D830ED /* IgnoreFailureTests.swift */,
323334
OBJ_58 /* ShareReplayTests.swift */,
324335
OBJ_59 /* ToggleTests.swift */,
325336
OBJ_60 /* WithLatestFromTests.swift */,
326337
OBJ_61 /* ZipManyTests.swift */,
327-
BFADDC8A25BCE91E00465E9B /* FlatMapBatchesTests.swift */,
328338
);
329339
path = Tests;
330340
sourceTree = SOURCE_ROOT;
@@ -337,11 +347,9 @@
337347
OBJ_40 /* Tests */,
338348
OBJ_62 /* Products */,
339349
OBJ_65 /* Resources */,
340-
OBJ_66 /* Carthage */,
341350
OBJ_67 /* scripts */,
342351
OBJ_68 /* codecov.yml */,
343352
OBJ_69 /* LICENSE */,
344-
OBJ_70 /* CHANGELOG.md */,
345353
OBJ_71 /* Makefile */,
346354
OBJ_72 /* CombineExt.podspec */,
347355
OBJ_73 /* README.md */,
@@ -558,6 +566,7 @@
558566
isa = PBXSourcesBuildPhase;
559567
buildActionMask = 0;
560568
files = (
569+
EA0D86D4287D19DC0085356E /* EnumeratedTests.swift in Sources */,
561570
OBJ_122 /* AmbTests.swift in Sources */,
562571
OBJ_123 /* AssignOwnershipTests.swift in Sources */,
563572
OBJ_124 /* AssignToManyTests.swift in Sources */,
@@ -579,9 +588,10 @@
579588
OBJ_135 /* PrefixDurationTests.swift in Sources */,
580589
OBJ_136 /* RemoveAllDuplicatesTests.swift in Sources */,
581590
OBJ_137 /* ReplaySubjectTests.swift in Sources */,
582-
3793CBD728286C090060441B /* MapToTests.swift in Sources */,
583591
OBJ_138 /* SetOutputTypeTests.swift in Sources */,
592+
EA0D86D6287D19DC0085356E /* MapToValueTests.swift in Sources */,
584593
OBJ_139 /* ShareReplayTests.swift in Sources */,
594+
EA0D86D5287D19DC0085356E /* MapToResultTests.swift in Sources */,
585595
BFADDC8B25BCE91E00465E9B /* FlatMapBatchesTests.swift in Sources */,
586596
OBJ_140 /* ToggleTests.swift in Sources */,
587597
OBJ_141 /* WithLatestFromTests.swift in Sources */,
@@ -597,9 +607,9 @@
597607
OBJ_79 /* DemandBuffer.swift in Sources */,
598608
OBJ_80 /* Sink.swift in Sources */,
599609
OBJ_81 /* Optional.swift in Sources */,
600-
3793CBD428286BB20060441B /* MapTo.swift in Sources */,
601610
C387777C24E6BBE900FAD2D8 /* Nwise.swift in Sources */,
602611
OBJ_82 /* Event.swift in Sources */,
612+
EA0D86CE287D19CC0085356E /* MapToValue.swift in Sources */,
603613
OBJ_83 /* ObjectOwnership.swift in Sources */,
604614
OBJ_84 /* Amb.swift in Sources */,
605615
OBJ_85 /* AssignOwnership.swift in Sources */,
@@ -613,6 +623,7 @@
613623
OBJ_90 /* FlatMapLatest.swift in Sources */,
614624
OBJ_91 /* MapMany.swift in Sources */,
615625
712E36C82711B79000A2AAFE /* RetryWhen.swift in Sources */,
626+
EA0D86CF287D19CC0085356E /* MapToResult.swift in Sources */,
616627
1970A8AA25246FBD00799AB6 /* FilterMany.swift in Sources */,
617628
OBJ_92 /* Materialize.swift in Sources */,
618629
D836234824EA9446002353AC /* MergeMany.swift in Sources */,
@@ -628,6 +639,7 @@
628639
BF330EF924F20032001281FC /* Timer.swift in Sources */,
629640
OBJ_101 /* CurrentValueRelay.swift in Sources */,
630641
OBJ_102 /* PassthroughRelay.swift in Sources */,
642+
EA0D86D0287D19CC0085356E /* Enumerated.swift in Sources */,
631643
OBJ_103 /* Relay.swift in Sources */,
632644
OBJ_104 /* ReplaySubject.swift in Sources */,
633645
);
@@ -692,7 +704,7 @@
692704
);
693705
HEADER_SEARCH_PATHS = "$(inherited)";
694706
INFOPLIST_FILE = CombineExt.xcodeproj/CombineExtTests_Info.plist;
695-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
707+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
696708
LD_RUNPATH_SEARCH_PATHS = (
697709
"$(inherited)",
698710
"@loader_path/../Frameworks",
@@ -721,7 +733,7 @@
721733
);
722734
HEADER_SEARCH_PATHS = "$(inherited)";
723735
INFOPLIST_FILE = CombineExt.xcodeproj/CombineExtTests_Info.plist;
724-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
736+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
725737
LD_RUNPATH_SEARCH_PATHS = (
726738
"$(inherited)",
727739
"@loader_path/../Frameworks",
@@ -801,7 +813,7 @@
801813
);
802814
HEADER_SEARCH_PATHS = "$(inherited)";
803815
INFOPLIST_FILE = CombineExt.xcodeproj/CombineExt_Info.plist;
804-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
816+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
805817
LD_RUNPATH_SEARCH_PATHS = (
806818
"$(inherited)",
807819
"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
@@ -832,7 +844,7 @@
832844
);
833845
HEADER_SEARCH_PATHS = "$(inherited)";
834846
INFOPLIST_FILE = CombineExt.xcodeproj/CombineExt_Info.plist;
835-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
847+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
836848
LD_RUNPATH_SEARCH_PATHS = (
837849
"$(inherited)",
838850
"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
@@ -909,7 +921,7 @@
909921
repositoryURL = "https://github.com/pointfreeco/combine-schedulers";
910922
requirement = {
911923
kind = upToNextMajorVersion;
912-
minimumVersion = 0.1.0;
924+
minimumVersion = 0.5.0;
913925
};
914926
};
915927
/* End XCRemoteSwiftPackageReference section */

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

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

‎Sources/.DS_Store‎

6 KB
Binary file not shown.

0 commit comments

Comments
 (0)