Skip to content

Commit e1b8592

Browse files
CodaFiCodaFi
committed
Merge remote-tracking branch 'upstream/master'
2 parents 6d48233 + 6a97548 commit e1b8592

File tree

1 file changed

+8
-32
lines changed

1 file changed

+8
-32
lines changed

‎Concurrent.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
8410224B1B1A9F9E00E799A0 /* SwiftCheck.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84A53E011B1A9F1900E8A107 /* SwiftCheck.framework */; };
1111
8410224F1B1A9FAC00E799A0 /* SwiftCheck.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84A53DFD1B1A9F1900E8A107 /* SwiftCheck.framework */; };
1212
841022501B1A9FBE00E799A0 /* SwiftCheck.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84A53DFD1B1A9F1900E8A107 /* SwiftCheck.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
13-
841022511B1A9FD100E799A0 /* Swiftz.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84A53DD21B1A964400E8A107 /* Swiftz.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1413
841022551B1AA00D00E799A0 /* MVarSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 841022531B1AA00D00E799A0 /* MVarSpec.swift */; };
1514
84152B7A1A818C95006387D5 /* SVar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84152B791A818C95006387D5 /* SVar.swift */; };
1615
842874721B24195300D6AAC2 /* Swiftz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84A53DD21B1A964400E8A107 /* Swiftz.framework */; };
16+
842874821B24E7A300D6AAC2 /* Swiftz.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84A53DD61B1A964400E8A107 /* Swiftz.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
17+
842874831B24E7AC00D6AAC2 /* Swiftz.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84A53DD21B1A964400E8A107 /* Swiftz.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1718
8434F98619E9CD76008D9909 /* Concurrent.h in Headers */ = {isa = PBXBuildFile; fileRef = 8434F98519E9CD76008D9909 /* Concurrent.h */; settings = {ATTRIBUTES = (Public, ); }; };
1819
8434F98C19E9CD76008D9909 /* Concurrent.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8434F98019E9CD76008D9909 /* Concurrent.framework */; };
1920
8434F9B019E9CDC0008D9909 /* Chan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8434F99D19E9CDC0008D9909 /* Chan.swift */; };
@@ -46,7 +47,6 @@
4647
84A53DDF1B1A966700E8A107 /* Concurrent.h in Headers */ = {isa = PBXBuildFile; fileRef = 8434F98519E9CD76008D9909 /* Concurrent.h */; settings = {ATTRIBUTES = (Public, ); }; };
4748
84A53DE01B1A966E00E8A107 /* CONCRealWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 8434F99E19E9CDC0008D9909 /* CONCRealWorld.h */; settings = {ATTRIBUTES = (Public, ); }; };
4849
84A53DE11B1A966E00E8A107 /* Concurrent-ObjCBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 8434F9A019E9CDC0008D9909 /* Concurrent-ObjCBridge.h */; };
49-
84A53DED1B1A9C6400E8A107 /* Swiftz.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84A53DD61B1A964400E8A107 /* Swiftz.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
5050
84A53E081B1A9F2C00E8A107 /* SwiftCheck.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84A53E011B1A9F1900E8A107 /* SwiftCheck.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
5151
84EA2C591B23AE5D0001FB3F /* ChanSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84F467811B1B9244002A4C4C /* ChanSpec.swift */; };
5252
84EA2C5A1B23AE5F0001FB3F /* MVarSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 841022531B1AA00D00E799A0 /* MVarSpec.swift */; };
@@ -70,13 +70,6 @@
7070
remoteGlobalIDString = 844FCC8C198B320500EB242A;
7171
remoteInfo = SwiftCheck;
7272
};
73-
842874701B24194100D6AAC2 /* PBXContainerItemProxy */ = {
74-
isa = PBXContainerItemProxy;
75-
containerPortal = 84A53DC91B1A964300E8A107 /* Swiftz.xcodeproj */;
76-
proxyType = 1;
77-
remoteGlobalIDString = 84DF751D1B0BD17700C912B0;
78-
remoteInfo = "Swiftz-iOS";
79-
};
8073
8434F98D19E9CD76008D9909 /* PBXContainerItemProxy */ = {
8174
isa = PBXContainerItemProxy;
8275
containerPortal = 8434F97719E9CD76008D9909 /* Project object */;
@@ -119,13 +112,6 @@
119112
remoteGlobalIDString = 84DF75281B0BD17700C912B0;
120113
remoteInfo = "Swiftz-iOSTests";
121114
};
122-
84A53DD91B1A964C00E8A107 /* PBXContainerItemProxy */ = {
123-
isa = PBXContainerItemProxy;
124-
containerPortal = 84A53DC91B1A964300E8A107 /* Swiftz.xcodeproj */;
125-
proxyType = 1;
126-
remoteGlobalIDString = 84A88F971A71DF7F003D53CF;
127-
remoteInfo = Swiftz;
128-
};
129115
84A53DFC1B1A9F1900E8A107 /* PBXContainerItemProxy */ = {
130116
isa = PBXContainerItemProxy;
131117
containerPortal = 84A53DF51B1A9F1800E8A107 /* SwiftCheck.xcodeproj */;
@@ -163,7 +149,7 @@
163149
dstPath = "";
164150
dstSubfolderSpec = 10;
165151
files = (
166-
841022511B1A9FD100E799A0 /* Swiftz.framework in CopyFiles */,
152+
842874831B24E7AC00D6AAC2 /* Swiftz.framework in CopyFiles */,
167153
841022501B1A9FBE00E799A0 /* SwiftCheck.framework in CopyFiles */,
168154
849AA3AF1A09850400472F08 /* Concurrent.framework in CopyFiles */,
169155
);
@@ -175,8 +161,8 @@
175161
dstPath = "";
176162
dstSubfolderSpec = 10;
177163
files = (
164+
842874821B24E7A300D6AAC2 /* Swiftz.framework in CopyFiles */,
178165
84A53E081B1A9F2C00E8A107 /* SwiftCheck.framework in CopyFiles */,
179-
84A53DED1B1A9C6400E8A107 /* Swiftz.framework in CopyFiles */,
180166
84A53D6B1B1A8F8B00E8A107 /* Concurrent.framework in CopyFiles */,
181167
);
182168
runOnlyForDeploymentPostprocessing = 0;
@@ -380,7 +366,6 @@
380366
buildRules = (
381367
);
382368
dependencies = (
383-
84A53DDA1B1A964C00E8A107 /* PBXTargetDependency */,
384369
);
385370
name = Concurrent;
386371
productName = Concurrent;
@@ -419,7 +404,6 @@
419404
buildRules = (
420405
);
421406
dependencies = (
422-
842874711B24194100D6AAC2 /* PBXTargetDependency */,
423407
);
424408
name = "Concurrent-iOS";
425409
productName = "Concurrent-iOS";
@@ -659,11 +643,6 @@
659643
name = SwiftCheck;
660644
targetProxy = 8410224C1B1A9FA300E799A0 /* PBXContainerItemProxy */;
661645
};
662-
842874711B24194100D6AAC2 /* PBXTargetDependency */ = {
663-
isa = PBXTargetDependency;
664-
name = "Swiftz-iOS";
665-
targetProxy = 842874701B24194100D6AAC2 /* PBXContainerItemProxy */;
666-
};
667646
8434F98E19E9CD76008D9909 /* PBXTargetDependency */ = {
668647
isa = PBXTargetDependency;
669648
target = 8434F97F19E9CD76008D9909 /* Concurrent */;
@@ -674,11 +653,6 @@
674653
target = 84A53D391B1A8F1800E8A107 /* Concurrent-iOS */;
675654
targetProxy = 84A53D461B1A8F1800E8A107 /* PBXContainerItemProxy */;
676655
};
677-
84A53DDA1B1A964C00E8A107 /* PBXTargetDependency */ = {
678-
isa = PBXTargetDependency;
679-
name = Swiftz;
680-
targetProxy = 84A53DD91B1A964C00E8A107 /* PBXContainerItemProxy */;
681-
};
682656
/* End PBXTargetDependency section */
683657

684658
/* Begin XCBuildConfiguration section */
@@ -853,7 +827,8 @@
853827
INFOPLIST_FILE = Concurrent/Info.plist;
854828
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
855829
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
856-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
830+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
831+
OTHER_LDFLAGS = "";
857832
PRODUCT_NAME = Concurrent;
858833
SDKROOT = iphoneos;
859834
SKIP_INSTALL = YES;
@@ -876,7 +851,8 @@
876851
INFOPLIST_FILE = Concurrent/Info.plist;
877852
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
878853
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
879-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
854+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
855+
OTHER_LDFLAGS = "";
880856
PRODUCT_NAME = Concurrent;
881857
SDKROOT = iphoneos;
882858
SKIP_INSTALL = YES;

0 commit comments

Comments
 (0)