Skip to content

Commit 047d9bc

Browse files
jasdeepsainijasdeepsaini
authored
Fixes for the xcodeproj file (#133)
* 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` * - Change the deployment target for the CombineExt target to 10.0. - Change the deployment target for the CombineExtTests target to 13.0. - Removed CombineSchedulers from the CombineExt target and added it to CombineExtTests. * Made the version of CombineSchedulers match the version in Package.swift. * Remove the .DS_Store file from the project. * Add .DS_Store to the .gitignore file. * Remove .DS_Store from the sources folder.
1 parent 5c17b57 commit 047d9bc

File tree

3 files changed

+46
-33
lines changed

3 files changed

+46
-33
lines changed

‎.DS_Store

-6 KB
Binary file not shown.

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ Packages
33
xcuserdata
44
DerivedData/
55
Carthage
6-
CombineExt.framework.zip
6+
CombineExt.framework.zip
7+
.DS_Store

‎CombineExt.xcodeproj/project.pbxproj

+44-32
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,8 @@
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 */; };
31-
BF330EF624F1FFFE001281FC /* CombineSchedulers in Frameworks */ = {isa = PBXBuildFile; productRef = BF330EF524F1FFFE001281FC /* CombineSchedulers */; };
3229
BF330EF924F20032001281FC /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF330EF824F20032001281FC /* Timer.swift */; };
3330
BF330EFB24F20080001281FC /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF330EFA24F20080001281FC /* Lock.swift */; };
3431
BF3D3B5D253B83F300D830ED /* IgnoreFailure.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF3D3B5C253B83F300D830ED /* IgnoreFailure.swift */; };
@@ -43,6 +40,13 @@
4340
C387777F24E6BF8F00FAD2D8 /* NwiseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C387777D24E6BF6C00FAD2D8 /* NwiseTests.swift */; };
4441
D836234824EA9446002353AC /* MergeMany.swift in Sources */ = {isa = PBXBuildFile; fileRef = D836234724EA9446002353AC /* MergeMany.swift */; };
4542
D836234A24EA9888002353AC /* MergeManyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D836234924EA9888002353AC /* MergeManyTests.swift */; };
43+
EA0D86CE287D19CC0085356E /* MapToValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86CB287D19CC0085356E /* MapToValue.swift */; };
44+
EA0D86CF287D19CC0085356E /* MapToResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86CC287D19CC0085356E /* MapToResult.swift */; };
45+
EA0D86D0287D19CC0085356E /* Enumerated.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86CD287D19CC0085356E /* Enumerated.swift */; };
46+
EA0D86D4287D19DC0085356E /* EnumeratedTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86D1287D19DC0085356E /* EnumeratedTests.swift */; };
47+
EA0D86D5287D19DC0085356E /* MapToResultTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86D2287D19DC0085356E /* MapToResultTests.swift */; };
48+
EA0D86D6287D19DC0085356E /* MapToValueTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA0D86D3287D19DC0085356E /* MapToValueTests.swift */; };
49+
EAEAAC72287FB3C900288379 /* CombineSchedulers in Frameworks */ = {isa = PBXBuildFile; productRef = EAEAAC71287FB3C900288379 /* CombineSchedulers */; };
4650
OBJ_100 /* ZipMany.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_33 /* ZipMany.swift */; };
4751
OBJ_101 /* CurrentValueRelay.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_35 /* CurrentValueRelay.swift */; };
4852
OBJ_102 /* PassthroughRelay.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_36 /* PassthroughRelay.swift */; };
@@ -114,8 +118,6 @@
114118
/* Begin PBXFileReference section */
115119
1970A8A925246FBD00799AB6 /* FilterMany.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterMany.swift; sourceTree = "<group>"; };
116120
1970A8B32524730400799AB6 /* FilterManyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterManyTests.swift; sourceTree = "<group>"; };
117-
3793CBD328286BB20060441B /* MapTo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTo.swift; sourceTree = "<group>"; };
118-
3793CBD528286BE90060441B /* MapToTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapToTests.swift; sourceTree = "<group>"; };
119121
712E36C72711B79000A2AAFE /* RetryWhen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetryWhen.swift; sourceTree = "<group>"; };
120122
7182326E26DAAF230026BAD3 /* RetryWhenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RetryWhenTests.swift; sourceTree = "<group>"; };
121123
BF330EF824F20032001281FC /* Timer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Timer.swift; sourceTree = "<group>"; };
@@ -134,6 +136,12 @@
134136
"CombineExt::CombineExtTests::Product" /* CombineExtTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = CombineExtTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
135137
D836234724EA9446002353AC /* MergeMany.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MergeMany.swift; sourceTree = "<group>"; };
136138
D836234924EA9888002353AC /* MergeManyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MergeManyTests.swift; sourceTree = "<group>"; };
139+
EA0D86CB287D19CC0085356E /* MapToValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapToValue.swift; sourceTree = "<group>"; };
140+
EA0D86CC287D19CC0085356E /* MapToResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapToResult.swift; sourceTree = "<group>"; };
141+
EA0D86CD287D19CC0085356E /* Enumerated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Enumerated.swift; sourceTree = "<group>"; };
142+
EA0D86D1287D19DC0085356E /* EnumeratedTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EnumeratedTests.swift; sourceTree = "<group>"; };
143+
EA0D86D2287D19DC0085356E /* MapToResultTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapToResultTests.swift; sourceTree = "<group>"; };
144+
EA0D86D3287D19DC0085356E /* MapToValueTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapToValueTests.swift; sourceTree = "<group>"; };
137145
OBJ_10 /* Sink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sink.swift; sourceTree = "<group>"; };
138146
OBJ_12 /* Optional.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Optional.swift; sourceTree = "<group>"; };
139147
OBJ_14 /* Event.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Event.swift; sourceTree = "<group>"; };
@@ -182,11 +190,9 @@
182190
OBJ_60 /* WithLatestFromTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WithLatestFromTests.swift; sourceTree = "<group>"; };
183191
OBJ_61 /* ZipManyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZipManyTests.swift; sourceTree = "<group>"; };
184192
OBJ_65 /* Resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Resources; sourceTree = SOURCE_ROOT; };
185-
OBJ_66 /* Carthage */ = {isa = PBXFileReference; lastKnownFileType = text; path = Carthage; sourceTree = SOURCE_ROOT; };
186193
OBJ_67 /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = scripts; sourceTree = SOURCE_ROOT; };
187194
OBJ_68 /* codecov.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = codecov.yml; sourceTree = "<group>"; };
188195
OBJ_69 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
189-
OBJ_70 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
190196
OBJ_71 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
191197
OBJ_72 /* CombineExt.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = CombineExt.podspec; sourceTree = "<group>"; };
192198
OBJ_73 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -205,7 +211,7 @@
205211
isa = PBXFrameworksBuildPhase;
206212
buildActionMask = 0;
207213
files = (
208-
BF330EF624F1FFFE001281FC /* CombineSchedulers in Frameworks */,
214+
EAEAAC72287FB3C900288379 /* CombineSchedulers in Frameworks */,
209215
OBJ_144 /* CombineExt.framework in Frameworks */,
210216
);
211217
runOnlyForDeploymentPostprocessing = 0;
@@ -256,26 +262,28 @@
256262
OBJ_20 /* CombineLatestMany.swift */,
257263
OBJ_21 /* Create.swift */,
258264
OBJ_22 /* Dematerialize.swift */,
265+
EA0D86CD287D19CC0085356E /* Enumerated.swift */,
266+
1970A8A925246FBD00799AB6 /* FilterMany.swift */,
267+
BFADDC8025BCE4C200465E9B /* FlatMapBatches.swift */,
259268
OBJ_23 /* FlatMapLatest.swift */,
269+
BF3D3B5C253B83F300D830ED /* IgnoreFailure.swift */,
270+
BF43CC1425008B4F005AFA28 /* IgnoreOutputSetOutputType.swift */,
260271
OBJ_24 /* MapMany.swift */,
261-
D836234724EA9446002353AC /* MergeMany.swift */,
262-
3793CBD328286BB20060441B /* MapTo.swift */,
272+
EA0D86CC287D19CC0085356E /* MapToResult.swift */,
273+
EA0D86CB287D19CC0085356E /* MapToValue.swift */,
263274
OBJ_25 /* Materialize.swift */,
275+
D836234724EA9446002353AC /* MergeMany.swift */,
264276
C387777B24E6BBE900FAD2D8 /* Nwise.swift */,
265277
OBJ_26 /* Partition.swift */,
266278
OBJ_27 /* PrefixDuration.swift */,
267279
BF45214D259C0C610065E60E /* PrefixWhileBehavior.swift */,
268280
OBJ_28 /* RemoveAllDuplicates.swift */,
269281
712E36C72711B79000A2AAFE /* RetryWhen.swift */,
270282
OBJ_29 /* SetOutputType.swift */,
271-
BF43CC1425008B4F005AFA28 /* IgnoreOutputSetOutputType.swift */,
272-
BF3D3B5C253B83F300D830ED /* IgnoreFailure.swift */,
273283
OBJ_30 /* ShareReplay.swift */,
274284
OBJ_31 /* Toggle.swift */,
275285
OBJ_32 /* WithLatestFrom.swift */,
276286
OBJ_33 /* ZipMany.swift */,
277-
1970A8A925246FBD00799AB6 /* FilterMany.swift */,
278-
BFADDC8025BCE4C200465E9B /* FlatMapBatches.swift */,
279287
);
280288
path = Operators;
281289
sourceTree = "<group>";
@@ -308,10 +316,15 @@
308316
OBJ_45 /* CreateTests.swift */,
309317
OBJ_46 /* CurrentValueRelayTests.swift */,
310318
OBJ_47 /* DematerializeTests.swift */,
319+
EA0D86D1287D19DC0085356E /* EnumeratedTests.swift */,
320+
1970A8B32524730400799AB6 /* FilterManyTests.swift */,
321+
BFADDC8A25BCE91E00465E9B /* FlatMapBatchesTests.swift */,
311322
OBJ_48 /* FlatMapLatestTests.swift */,
323+
BF3D3B66253B88E500D830ED /* IgnoreFailureTests.swift */,
324+
BF43CC1625008C45005AFA28 /* IgnoreOutputSetOutputTypeTests.swift */,
312325
OBJ_49 /* MapManyTests.swift */,
313-
3793CBD528286BE90060441B /* MapToTests.swift */,
314-
1970A8B32524730400799AB6 /* FilterManyTests.swift */,
326+
EA0D86D2287D19DC0085356E /* MapToResultTests.swift */,
327+
EA0D86D3287D19DC0085356E /* MapToValueTests.swift */,
315328
OBJ_50 /* MaterializeTests.swift */,
316329
D836234924EA9888002353AC /* MergeManyTests.swift */,
317330
C387777D24E6BF6C00FAD2D8 /* NwiseTests.swift */,
@@ -324,13 +337,10 @@
324337
OBJ_56 /* ReplaySubjectTests.swift */,
325338
7182326E26DAAF230026BAD3 /* RetryWhenTests.swift */,
326339
OBJ_57 /* SetOutputTypeTests.swift */,
327-
BF43CC1625008C45005AFA28 /* IgnoreOutputSetOutputTypeTests.swift */,
328-
BF3D3B66253B88E500D830ED /* IgnoreFailureTests.swift */,
329340
OBJ_58 /* ShareReplayTests.swift */,
330341
OBJ_59 /* ToggleTests.swift */,
331342
OBJ_60 /* WithLatestFromTests.swift */,
332343
OBJ_61 /* ZipManyTests.swift */,
333-
BFADDC8A25BCE91E00465E9B /* FlatMapBatchesTests.swift */,
334344
);
335345
path = Tests;
336346
sourceTree = SOURCE_ROOT;
@@ -343,11 +353,9 @@
343353
OBJ_40 /* Tests */,
344354
OBJ_62 /* Products */,
345355
OBJ_65 /* Resources */,
346-
OBJ_66 /* Carthage */,
347356
OBJ_67 /* scripts */,
348357
OBJ_68 /* codecov.yml */,
349358
OBJ_69 /* LICENSE */,
350-
OBJ_70 /* CHANGELOG.md */,
351359
OBJ_71 /* Makefile */,
352360
OBJ_72 /* CombineExt.podspec */,
353361
OBJ_73 /* README.md */,
@@ -423,7 +431,7 @@
423431
);
424432
name = CombineExtTests;
425433
packageProductDependencies = (
426-
BF330EF524F1FFFE001281FC /* CombineSchedulers */,
434+
EAEAAC71287FB3C900288379 /* CombineSchedulers */,
427435
);
428436
productName = CombineExtTests;
429437
productReference = "CombineExt::CombineExtTests::Product" /* CombineExtTests.xctest */;
@@ -462,7 +470,7 @@
462470
);
463471
mainGroup = OBJ_5;
464472
packageReferences = (
465-
AA9C3E78249858840002A111 /* XCRemoteSwiftPackageReference "combine-schedulers" */,
473+
EAEAAC70287FB3C900288379 /* XCRemoteSwiftPackageReference "combine-schedulers" */,
466474
);
467475
productRefGroup = OBJ_62 /* Products */;
468476
projectDirPath = "";
@@ -564,6 +572,7 @@
564572
isa = PBXSourcesBuildPhase;
565573
buildActionMask = 0;
566574
files = (
575+
EA0D86D4287D19DC0085356E /* EnumeratedTests.swift in Sources */,
567576
OBJ_122 /* AmbTests.swift in Sources */,
568577
OBJ_123 /* AssignOwnershipTests.swift in Sources */,
569578
OBJ_124 /* AssignToManyTests.swift in Sources */,
@@ -586,9 +595,10 @@
586595
OBJ_135 /* PrefixDurationTests.swift in Sources */,
587596
OBJ_136 /* RemoveAllDuplicatesTests.swift in Sources */,
588597
OBJ_137 /* ReplaySubjectTests.swift in Sources */,
589-
3793CBD728286C090060441B /* MapToTests.swift in Sources */,
590598
OBJ_138 /* SetOutputTypeTests.swift in Sources */,
599+
EA0D86D6287D19DC0085356E /* MapToValueTests.swift in Sources */,
591600
OBJ_139 /* ShareReplayTests.swift in Sources */,
601+
EA0D86D5287D19DC0085356E /* MapToResultTests.swift in Sources */,
592602
BFADDC8B25BCE91E00465E9B /* FlatMapBatchesTests.swift in Sources */,
593603
OBJ_140 /* ToggleTests.swift in Sources */,
594604
OBJ_141 /* WithLatestFromTests.swift in Sources */,
@@ -604,9 +614,9 @@
604614
OBJ_79 /* DemandBuffer.swift in Sources */,
605615
OBJ_80 /* Sink.swift in Sources */,
606616
OBJ_81 /* Optional.swift in Sources */,
607-
3793CBD428286BB20060441B /* MapTo.swift in Sources */,
608617
C387777C24E6BBE900FAD2D8 /* Nwise.swift in Sources */,
609618
OBJ_82 /* Event.swift in Sources */,
619+
EA0D86CE287D19CC0085356E /* MapToValue.swift in Sources */,
610620
OBJ_83 /* ObjectOwnership.swift in Sources */,
611621
OBJ_84 /* Amb.swift in Sources */,
612622
OBJ_85 /* AssignOwnership.swift in Sources */,
@@ -620,6 +630,7 @@
620630
OBJ_90 /* FlatMapLatest.swift in Sources */,
621631
OBJ_91 /* MapMany.swift in Sources */,
622632
712E36C82711B79000A2AAFE /* RetryWhen.swift in Sources */,
633+
EA0D86CF287D19CC0085356E /* MapToResult.swift in Sources */,
623634
1970A8AA25246FBD00799AB6 /* FilterMany.swift in Sources */,
624635
OBJ_92 /* Materialize.swift in Sources */,
625636
D836234824EA9446002353AC /* MergeMany.swift in Sources */,
@@ -636,6 +647,7 @@
636647
BF330EF924F20032001281FC /* Timer.swift in Sources */,
637648
OBJ_101 /* CurrentValueRelay.swift in Sources */,
638649
OBJ_102 /* PassthroughRelay.swift in Sources */,
650+
EA0D86D0287D19CC0085356E /* Enumerated.swift in Sources */,
639651
OBJ_103 /* Relay.swift in Sources */,
640652
OBJ_104 /* ReplaySubject.swift in Sources */,
641653
);
@@ -700,7 +712,7 @@
700712
);
701713
HEADER_SEARCH_PATHS = "$(inherited)";
702714
INFOPLIST_FILE = CombineExt.xcodeproj/CombineExtTests_Info.plist;
703-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
715+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
704716
LD_RUNPATH_SEARCH_PATHS = (
705717
"$(inherited)",
706718
"@loader_path/../Frameworks",
@@ -729,7 +741,7 @@
729741
);
730742
HEADER_SEARCH_PATHS = "$(inherited)";
731743
INFOPLIST_FILE = CombineExt.xcodeproj/CombineExtTests_Info.plist;
732-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
744+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
733745
LD_RUNPATH_SEARCH_PATHS = (
734746
"$(inherited)",
735747
"@loader_path/../Frameworks",
@@ -912,20 +924,20 @@
912924
/* End XCConfigurationList section */
913925

914926
/* Begin XCRemoteSwiftPackageReference section */
915-
AA9C3E78249858840002A111 /* XCRemoteSwiftPackageReference "combine-schedulers" */ = {
927+
EAEAAC70287FB3C900288379 /* XCRemoteSwiftPackageReference "combine-schedulers" */ = {
916928
isa = XCRemoteSwiftPackageReference;
917929
repositoryURL = "https://github.com/pointfreeco/combine-schedulers";
918930
requirement = {
919-
kind = upToNextMajorVersion;
920-
minimumVersion = 0.1.0;
931+
kind = upToNextMinorVersion;
932+
minimumVersion = 0.5.0;
921933
};
922934
};
923935
/* End XCRemoteSwiftPackageReference section */
924936

925937
/* Begin XCSwiftPackageProductDependency section */
926-
BF330EF524F1FFFE001281FC /* CombineSchedulers */ = {
938+
EAEAAC71287FB3C900288379 /* CombineSchedulers */ = {
927939
isa = XCSwiftPackageProductDependency;
928-
package = AA9C3E78249858840002A111 /* XCRemoteSwiftPackageReference "combine-schedulers" */;
940+
package = EAEAAC70287FB3C900288379 /* XCRemoteSwiftPackageReference "combine-schedulers" */;
929941
productName = CombineSchedulers;
930942
};
931943
/* End XCSwiftPackageProductDependency section */

0 commit comments

Comments
 (0)