Skip to content

Commit 8e5e3fe

Browse files
stephenceliskzaher
stephencelis
authored and
kzaher
committed
Fix Build / Carthage
1 parent a18cee0 commit 8e5e3fe

File tree

3 files changed

+185
-0
lines changed

3 files changed

+185
-0
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Carthage/Checkouts/RxSwift"]
2+
path = Carthage/Checkouts/RxSwift
3+
url = https://github.com/ReactiveX/RxSwift.git

‎Carthage/Checkouts/RxSwift

Submodule RxSwift added at b3e888b

‎RxDataSources.xcodeproj/project.pbxproj

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
03EEEE961F5B7D71006068BC /* Randomizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03EEEE851F5B7D5C006068BC /* Randomizer.swift */; };
1616
03EEEE971F5B7D71006068BC /* s.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03EEEE861F5B7D5C006068BC /* s.swift */; };
1717
03EEEE981F5B7D71006068BC /* XCTest+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03EEEE871F5B7D5C006068BC /* XCTest+Extensions.swift */; };
18+
80FB1F5C228489FF009D6516 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80FB1F48228489EC009D6516 /* RxSwift.framework */; };
19+
80FB1F5D22848A0E009D6516 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80FB1F4A228489EC009D6516 /* RxCocoa.framework */; };
1820
C81FBF461F3B9CED0094061E /* Differentiator.podspec in Resources */ = {isa = PBXBuildFile; fileRef = C81FBF451F3B9CED0094061E /* Differentiator.podspec */; };
1921
C81FBF5E1F3B9D660094061E /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF5B1F3B9D4C0094061E /* Array+Extensions.swift */; };
2022
C81FBF601F3B9D8B0094061E /* FloatingPointType+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF5F1F3B9D8B0094061E /* FloatingPointType+IdentifiableType.swift */; };
@@ -52,6 +54,76 @@
5254
/* End PBXBuildFile section */
5355

5456
/* Begin PBXContainerItemProxy section */
57+
80FB1F47228489EC009D6516 /* PBXContainerItemProxy */ = {
58+
isa = PBXContainerItemProxy;
59+
containerPortal = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
60+
proxyType = 2;
61+
remoteGlobalIDString = C8A56AD71AD7424700B4673B;
62+
remoteInfo = RxSwift;
63+
};
64+
80FB1F49228489EC009D6516 /* PBXContainerItemProxy */ = {
65+
isa = PBXContainerItemProxy;
66+
containerPortal = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
67+
proxyType = 2;
68+
remoteGlobalIDString = C809396D1B8A71760088E94D;
69+
remoteInfo = RxCocoa;
70+
};
71+
80FB1F4B228489EC009D6516 /* PBXContainerItemProxy */ = {
72+
isa = PBXContainerItemProxy;
73+
containerPortal = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
74+
proxyType = 2;
75+
remoteGlobalIDString = A2897D53225CA1E7004EA481;
76+
remoteInfo = RxRelay;
77+
};
78+
80FB1F4D228489EC009D6516 /* PBXContainerItemProxy */ = {
79+
isa = PBXContainerItemProxy;
80+
containerPortal = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
81+
proxyType = 2;
82+
remoteGlobalIDString = C8093BC71B8A71F00088E94D;
83+
remoteInfo = RxBlocking;
84+
};
85+
80FB1F4F228489EC009D6516 /* PBXContainerItemProxy */ = {
86+
isa = PBXContainerItemProxy;
87+
containerPortal = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
88+
proxyType = 2;
89+
remoteGlobalIDString = C88FA50C1C25C44800CCFEA4;
90+
remoteInfo = RxTest;
91+
};
92+
80FB1F51228489EC009D6516 /* PBXContainerItemProxy */ = {
93+
isa = PBXContainerItemProxy;
94+
containerPortal = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
95+
proxyType = 2;
96+
remoteGlobalIDString = C83508C31C386F6F0027C24C;
97+
remoteInfo = "AllTests-iOS";
98+
};
99+
80FB1F53228489EC009D6516 /* PBXContainerItemProxy */ = {
100+
isa = PBXContainerItemProxy;
101+
containerPortal = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
102+
proxyType = 2;
103+
remoteGlobalIDString = C83509841C38740E0027C24C;
104+
remoteInfo = "AllTests-tvOS";
105+
};
106+
80FB1F55228489EC009D6516 /* PBXContainerItemProxy */ = {
107+
isa = PBXContainerItemProxy;
108+
containerPortal = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
109+
proxyType = 2;
110+
remoteGlobalIDString = C83509941C38742C0027C24C;
111+
remoteInfo = "AllTests-macOS";
112+
};
113+
80FB1F57228489EC009D6516 /* PBXContainerItemProxy */ = {
114+
isa = PBXContainerItemProxy;
115+
containerPortal = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
116+
proxyType = 2;
117+
remoteGlobalIDString = C85BA04B1C3878740075D68E;
118+
remoteInfo = Microoptimizations;
119+
};
120+
80FB1F59228489EC009D6516 /* PBXContainerItemProxy */ = {
121+
isa = PBXContainerItemProxy;
122+
containerPortal = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
123+
proxyType = 2;
124+
remoteGlobalIDString = C8E8BA551E2C181A00A4AC2C;
125+
remoteInfo = Benchmarks;
126+
};
55127
C82C3C9A1F3B93D200309AE8 /* PBXContainerItemProxy */ = {
56128
isa = PBXContainerItemProxy;
57129
containerPortal = C8984C511C36AF35001E4272 /* Project object */;
@@ -72,6 +144,7 @@
72144
03EEEE861F5B7D5C006068BC /* s.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = s.swift; sourceTree = "<group>"; };
73145
03EEEE871F5B7D5C006068BC /* XCTest+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "XCTest+Extensions.swift"; sourceTree = "<group>"; };
74146
1E38DA4A22778D1A00C07A09 /* Package.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
147+
80FB1F3A228489EB009D6516 /* Rx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Rx.xcodeproj; path = Carthage/Checkouts/RxSwift/Rx.xcodeproj; sourceTree = "<group>"; };
75148
C81905AE1DEA019100AE679C /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
76149
C81FBF451F3B9CED0094061E /* Differentiator.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Differentiator.podspec; sourceTree = "<group>"; };
77150
C81FBF5B1F3B9D4C0094061E /* Array+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Extensions.swift"; sourceTree = "<group>"; };
@@ -133,6 +206,8 @@
133206
isa = PBXFrameworksBuildPhase;
134207
buildActionMask = 2147483647;
135208
files = (
209+
80FB1F5D22848A0E009D6516 /* RxCocoa.framework in Frameworks */,
210+
80FB1F5C228489FF009D6516 /* RxSwift.framework in Frameworks */,
136211
);
137212
runOnlyForDeploymentPostprocessing = 0;
138213
};
@@ -164,6 +239,30 @@
164239
path = RxDataSourcesTests;
165240
sourceTree = "<group>";
166241
};
242+
80FB1F3B228489EB009D6516 /* Products */ = {
243+
isa = PBXGroup;
244+
children = (
245+
80FB1F48228489EC009D6516 /* RxSwift.framework */,
246+
80FB1F4A228489EC009D6516 /* RxCocoa.framework */,
247+
80FB1F4C228489EC009D6516 /* RxRelay.framework */,
248+
80FB1F4E228489EC009D6516 /* RxBlocking.framework */,
249+
80FB1F50228489EC009D6516 /* RxTest.framework */,
250+
80FB1F52228489EC009D6516 /* AllTests-iOS.xctest */,
251+
80FB1F54228489EC009D6516 /* AllTests-tvOS.xctest */,
252+
80FB1F56228489EC009D6516 /* AllTests-macOS.xctest */,
253+
80FB1F58228489EC009D6516 /* PerformanceTests.app */,
254+
80FB1F5A228489EC009D6516 /* Benchmarks.xctest */,
255+
);
256+
name = Products;
257+
sourceTree = "<group>";
258+
};
259+
80FB1F5B228489FF009D6516 /* Frameworks */ = {
260+
isa = PBXGroup;
261+
children = (
262+
);
263+
name = Frameworks;
264+
sourceTree = "<group>";
265+
};
167266
C81FBF5A1F3B9CF10094061E /* Podspecs */ = {
168267
isa = PBXGroup;
169268
children = (
@@ -212,6 +311,8 @@
212311
C85EE5461C36F1FC0090614D /* Sources */,
213312
03EEEE7D1F5B7D5C006068BC /* Tests */,
214313
C8984C5B1C36AF35001E4272 /* Products */,
314+
80FB1F3A228489EB009D6516 /* Rx.xcodeproj */,
315+
80FB1F5B228489FF009D6516 /* Frameworks */,
215316
);
216317
sourceTree = "<group>";
217318
};
@@ -361,6 +462,12 @@
361462
mainGroup = C8984C501C36AF35001E4272;
362463
productRefGroup = C8984C5B1C36AF35001E4272 /* Products */;
363464
projectDirPath = "";
465+
projectReferences = (
466+
{
467+
ProductGroup = 80FB1F3B228489EB009D6516 /* Products */;
468+
ProjectRef = 80FB1F3A228489EB009D6516 /* Rx.xcodeproj */;
469+
},
470+
);
364471
projectRoot = "";
365472
targets = (
366473
C8984C591C36AF35001E4272 /* RxDataSources */,
@@ -370,6 +477,80 @@
370477
};
371478
/* End PBXProject section */
372479

480+
/* Begin PBXReferenceProxy section */
481+
80FB1F48228489EC009D6516 /* RxSwift.framework */ = {
482+
isa = PBXReferenceProxy;
483+
fileType = wrapper.framework;
484+
path = RxSwift.framework;
485+
remoteRef = 80FB1F47228489EC009D6516 /* PBXContainerItemProxy */;
486+
sourceTree = BUILT_PRODUCTS_DIR;
487+
};
488+
80FB1F4A228489EC009D6516 /* RxCocoa.framework */ = {
489+
isa = PBXReferenceProxy;
490+
fileType = wrapper.framework;
491+
path = RxCocoa.framework;
492+
remoteRef = 80FB1F49228489EC009D6516 /* PBXContainerItemProxy */;
493+
sourceTree = BUILT_PRODUCTS_DIR;
494+
};
495+
80FB1F4C228489EC009D6516 /* RxRelay.framework */ = {
496+
isa = PBXReferenceProxy;
497+
fileType = wrapper.framework;
498+
path = RxRelay.framework;
499+
remoteRef = 80FB1F4B228489EC009D6516 /* PBXContainerItemProxy */;
500+
sourceTree = BUILT_PRODUCTS_DIR;
501+
};
502+
80FB1F4E228489EC009D6516 /* RxBlocking.framework */ = {
503+
isa = PBXReferenceProxy;
504+
fileType = wrapper.framework;
505+
path = RxBlocking.framework;
506+
remoteRef = 80FB1F4D228489EC009D6516 /* PBXContainerItemProxy */;
507+
sourceTree = BUILT_PRODUCTS_DIR;
508+
};
509+
80FB1F50228489EC009D6516 /* RxTest.framework */ = {
510+
isa = PBXReferenceProxy;
511+
fileType = wrapper.framework;
512+
path = RxTest.framework;
513+
remoteRef = 80FB1F4F228489EC009D6516 /* PBXContainerItemProxy */;
514+
sourceTree = BUILT_PRODUCTS_DIR;
515+
};
516+
80FB1F52228489EC009D6516 /* AllTests-iOS.xctest */ = {
517+
isa = PBXReferenceProxy;
518+
fileType = wrapper.cfbundle;
519+
path = "AllTests-iOS.xctest";
520+
remoteRef = 80FB1F51228489EC009D6516 /* PBXContainerItemProxy */;
521+
sourceTree = BUILT_PRODUCTS_DIR;
522+
};
523+
80FB1F54228489EC009D6516 /* AllTests-tvOS.xctest */ = {
524+
isa = PBXReferenceProxy;
525+
fileType = wrapper.cfbundle;
526+
path = "AllTests-tvOS.xctest";
527+
remoteRef = 80FB1F53228489EC009D6516 /* PBXContainerItemProxy */;
528+
sourceTree = BUILT_PRODUCTS_DIR;
529+
};
530+
80FB1F56228489EC009D6516 /* AllTests-macOS.xctest */ = {
531+
isa = PBXReferenceProxy;
532+
fileType = wrapper.cfbundle;
533+
path = "AllTests-macOS.xctest";
534+
remoteRef = 80FB1F55228489EC009D6516 /* PBXContainerItemProxy */;
535+
sourceTree = BUILT_PRODUCTS_DIR;
536+
};
537+
80FB1F58228489EC009D6516 /* PerformanceTests.app */ = {
538+
isa = PBXReferenceProxy;
539+
fileType = wrapper.application;
540+
name = PerformanceTests.app;
541+
path = Microoptimizations.app;
542+
remoteRef = 80FB1F57228489EC009D6516 /* PBXContainerItemProxy */;
543+
sourceTree = BUILT_PRODUCTS_DIR;
544+
};
545+
80FB1F5A228489EC009D6516 /* Benchmarks.xctest */ = {
546+
isa = PBXReferenceProxy;
547+
fileType = wrapper.cfbundle;
548+
path = Benchmarks.xctest;
549+
remoteRef = 80FB1F59228489EC009D6516 /* PBXContainerItemProxy */;
550+
sourceTree = BUILT_PRODUCTS_DIR;
551+
};
552+
/* End PBXReferenceProxy section */
553+
373554
/* Begin PBXResourcesBuildPhase section */
374555
C81905AC1DEA019100AE679C /* Resources */ = {
375556
isa = PBXResourcesBuildPhase;

0 commit comments

Comments
 (0)