Skip to content

Commit 74237d4

Browse files
committed
Add CurrentValueRelay and PassthroughRelay and additional fixes
1 parent 84fa0a1 commit 74237d4

17 files changed

+834
-11
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
Packages
22
.build/
33
xcuserdata
4-
DerivedData/
4+
DerivedData/
5+
Carthage
6+
CombineExt.framework.zip

CombineExt.xcodeproj/project.pbxproj

+38
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
/* End PBXAggregateTarget section */
2222

2323
/* Begin PBXBuildFile section */
24+
78002BB5241E910C0018AA28 /* Relay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78002BB4241E910C0018AA28 /* Relay.swift */; };
25+
78002BB7241E915E0018AA28 /* CurrentValueRelay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78002BB6241E915E0018AA28 /* CurrentValueRelay.swift */; };
26+
78002BB9241E91D70018AA28 /* PassthroughRelay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78002BB8241E91D70018AA28 /* PassthroughRelay.swift */; };
27+
78002BBB241E97350018AA28 /* CurrentValueRelayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78002BBA241E97350018AA28 /* CurrentValueRelayTests.swift */; };
28+
78988A1E241EAFDD00F3A4AF /* PassthroughRelayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78988A1D241EAFDD00F3A4AF /* PassthroughRelayTests.swift */; };
29+
78988A20241EB0FE00F3A4AF /* CombineExt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = "CombineExt::CombineExt::Product" /* CombineExt.framework */; };
2430
78AA9297241B8532009BD68B /* AssignToManyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78AA9296241B8532009BD68B /* AssignToManyTests.swift */; };
2531
78AA9299241B8C45009BD68B /* DemandBuffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78AA9298241B8C45009BD68B /* DemandBuffer.swift */; };
2632
78C193CF241C16C40001B7FD /* FlatMapLatest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78C193CE241C16C40001B7FD /* FlatMapLatest.swift */; };
@@ -50,6 +56,11 @@
5056
/* End PBXContainerItemProxy section */
5157

5258
/* Begin PBXFileReference section */
59+
78002BB4241E910C0018AA28 /* Relay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Relay.swift; sourceTree = "<group>"; };
60+
78002BB6241E915E0018AA28 /* CurrentValueRelay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentValueRelay.swift; sourceTree = "<group>"; };
61+
78002BB8241E91D70018AA28 /* PassthroughRelay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PassthroughRelay.swift; sourceTree = "<group>"; };
62+
78002BBA241E97350018AA28 /* CurrentValueRelayTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrentValueRelayTests.swift; sourceTree = "<group>"; };
63+
78988A1D241EAFDD00F3A4AF /* PassthroughRelayTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PassthroughRelayTests.swift; sourceTree = "<group>"; };
5364
78AA9296241B8532009BD68B /* AssignToManyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssignToManyTests.swift; sourceTree = "<group>"; };
5465
78AA9298241B8C45009BD68B /* DemandBuffer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemandBuffer.swift; sourceTree = "<group>"; };
5566
78C193CE241C16C40001B7FD /* FlatMapLatest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlatMapLatest.swift; sourceTree = "<group>"; };
@@ -83,12 +94,30 @@
8394
isa = PBXFrameworksBuildPhase;
8495
buildActionMask = 0;
8596
files = (
97+
78988A20241EB0FE00F3A4AF /* CombineExt.framework in Frameworks */,
8698
);
8799
runOnlyForDeploymentPostprocessing = 0;
88100
};
89101
/* End PBXFrameworksBuildPhase section */
90102

91103
/* Begin PBXGroup section */
104+
78002BB3241E90FE0018AA28 /* Relays */ = {
105+
isa = PBXGroup;
106+
children = (
107+
78002BB4241E910C0018AA28 /* Relay.swift */,
108+
78002BB6241E915E0018AA28 /* CurrentValueRelay.swift */,
109+
78002BB8241E91D70018AA28 /* PassthroughRelay.swift */,
110+
);
111+
path = Relays;
112+
sourceTree = "<group>";
113+
};
114+
78988A1F241EB0FE00F3A4AF /* Frameworks */ = {
115+
isa = PBXGroup;
116+
children = (
117+
);
118+
name = Frameworks;
119+
sourceTree = "<group>";
120+
};
92121
78C193D5241C2E4F0001B7FD /* Models */ = {
93122
isa = PBXGroup;
94123
children = (
@@ -115,6 +144,8 @@
115144
78C193D8241CEEA80001B7FD /* CreateTests.swift */,
116145
78C193DF241D4D8D0001B7FD /* MaterializeTests.swift */,
117146
78C193E3241D63620001B7FD /* DematerializeTests.swift */,
147+
78002BBA241E97350018AA28 /* CurrentValueRelayTests.swift */,
148+
78988A1D241EAFDD00F3A4AF /* PassthroughRelayTests.swift */,
118149
);
119150
path = Tests;
120151
sourceTree = SOURCE_ROOT;
@@ -136,6 +167,7 @@
136167
OBJ_11 /* Tests */,
137168
OBJ_13 /* Products */,
138169
OBJ_16 /* README.md */,
170+
78988A1F241EB0FE00F3A4AF /* Frameworks */,
139171
);
140172
sourceTree = "<group>";
141173
};
@@ -144,6 +176,7 @@
144176
children = (
145177
78C193DA241D07160001B7FD /* Common */,
146178
78C193D5241C2E4F0001B7FD /* Models */,
179+
78002BB3241E90FE0018AA28 /* Relays */,
147180
OBJ_8 /* Operators */,
148181
);
149182
path = Sources;
@@ -268,13 +301,16 @@
268301
files = (
269302
78C193CF241C16C40001B7FD /* FlatMapLatest.swift in Sources */,
270303
78C193DC241D0A9F0001B7FD /* Sink.swift in Sources */,
304+
78002BB9241E91D70018AA28 /* PassthroughRelay.swift in Sources */,
271305
78AA9299241B8C45009BD68B /* DemandBuffer.swift in Sources */,
272306
78C193E2241D596F0001B7FD /* Dematerialize.swift in Sources */,
307+
78002BB7241E915E0018AA28 /* CurrentValueRelay.swift in Sources */,
273308
78C193DE241D46F40001B7FD /* Materialize.swift in Sources */,
274309
78C193D4241C2DE00001B7FD /* Create.swift in Sources */,
275310
OBJ_22 /* AssignToMany.swift in Sources */,
276311
78C193D7241C2E580001B7FD /* Event.swift in Sources */,
277312
OBJ_23 /* WithLatestFrom.swift in Sources */,
313+
78002BB5241E910C0018AA28 /* Relay.swift in Sources */,
278314
);
279315
runOnlyForDeploymentPostprocessing = 0;
280316
};
@@ -294,7 +330,9 @@
294330
78AA9297241B8532009BD68B /* AssignToManyTests.swift in Sources */,
295331
OBJ_41 /* WithLatestFromTests.swift in Sources */,
296332
78C193E0241D4D8D0001B7FD /* MaterializeTests.swift in Sources */,
333+
78002BBB241E97350018AA28 /* CurrentValueRelayTests.swift in Sources */,
297334
78C193E4241D63620001B7FD /* DematerializeTests.swift in Sources */,
335+
78988A1E241EAFDD00F3A4AF /* PassthroughRelayTests.swift in Sources */,
298336
78C193D9241CEEA80001B7FD /* CreateTests.swift in Sources */,
299337
);
300338
runOnlyForDeploymentPostprocessing = 0;

Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
archive:
2+
scripts/carthage-archive.sh

0 commit comments

Comments
 (0)