Skip to content

Commit 9686ddf

Browse files
author
Tom Kemp
committed
Remove TaskQueue from example apps and fix configurations
1 parent 99ec35c commit 9686ddf

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

iOS Example Obj-C/iOS Example Obj-C.xcodeproj/project.pbxproj

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
buildConfigurationList = 331F373F1D82CAB900AE2852 /* Build configuration list for PBXNativeTarget "iOS Example Obj-C" */;
117117
buildPhases = (
118118
331F37241D82CAB900AE2852 /* Sources */,
119+
E22966B12260A7E00050D509 /* Copy Carthage Frameworks */,
119120
331F37251D82CAB900AE2852 /* Frameworks */,
120121
331F37261D82CAB900AE2852 /* Resources */,
121122
339CC9B71DAB8D6D00E7F97B /* Embed Frameworks */,
@@ -155,6 +156,7 @@
155156
developmentRegion = English;
156157
hasScannedForEncodings = 0;
157158
knownRegions = (
159+
English,
158160
en,
159161
Base,
160162
);
@@ -181,6 +183,30 @@
181183
};
182184
/* End PBXResourcesBuildPhase section */
183185

186+
/* Begin PBXShellScriptBuildPhase section */
187+
E22966B12260A7E00050D509 /* Copy Carthage Frameworks */ = {
188+
isa = PBXShellScriptBuildPhase;
189+
buildActionMask = 2147483647;
190+
files = (
191+
);
192+
inputFileListPaths = (
193+
);
194+
inputPaths = (
195+
"$(SRCROOT)/../Carthage/Build/iOS/CryptoSwift.framework",
196+
"$(SRCROOT)/../Carthage/Build/iOS/Reachability.framework",
197+
"$(SRCROOT)/../Carthage/Build/iOS/Starscream.framework",
198+
);
199+
name = "Copy Carthage Frameworks";
200+
outputFileListPaths = (
201+
);
202+
outputPaths = (
203+
);
204+
runOnlyForDeploymentPostprocessing = 0;
205+
shellPath = /bin/sh;
206+
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
207+
};
208+
/* End PBXShellScriptBuildPhase section */
209+
184210
/* Begin PBXSourcesBuildPhase section */
185211
331F37241D82CAB900AE2852 /* Sources */ = {
186212
isa = PBXSourcesBuildPhase;

iOS Example Swift/iOS Example Swift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
335AD5AA20569C3C000D4D08 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A620569C3B000D4D08 /* CryptoSwift.framework */; };
11-
335AD5AB20569C3C000D4D08 /* TaskQueue.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A720569C3B000D4D08 /* TaskQueue.framework */; };
1211
335AD5AC20569C3C000D4D08 /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A820569C3B000D4D08 /* Reachability.framework */; };
1312
335AD5B220569F14000D4D08 /* PusherSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 33CC82EA1D7F16A8003B699F /* PusherSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1413
33831CC21A9CFCDB00B124F1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33831CBE1A9CFCDB00B124F1 /* AppDelegate.swift */; };
@@ -45,7 +44,6 @@
4544

4645
/* Begin PBXFileReference section */
4746
335AD5A620569C3B000D4D08 /* CryptoSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CryptoSwift.framework; path = ../Carthage/Build/iOS/CryptoSwift.framework; sourceTree = "<group>"; };
48-
335AD5A720569C3B000D4D08 /* TaskQueue.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TaskQueue.framework; path = ../Carthage/Build/iOS/TaskQueue.framework; sourceTree = "<group>"; };
4947
335AD5A820569C3B000D4D08 /* Reachability.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Reachability.framework; path = ../Carthage/Build/iOS/Reachability.framework; sourceTree = "<group>"; };
5048
335AD5A920569C3B000D4D08 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = ../Carthage/Build/iOS/Starscream.framework; sourceTree = "<group>"; };
5149
335AD5AF20569DC3000D4D08 /* Carthage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Carthage.xcconfig; sourceTree = "<group>"; };
@@ -66,7 +64,6 @@
6664
files = (
6765
33E94E7620766DBE0005399D /* Starscream.framework in Frameworks */,
6866
335AD5AA20569C3C000D4D08 /* CryptoSwift.framework in Frameworks */,
69-
335AD5AB20569C3C000D4D08 /* TaskQueue.framework in Frameworks */,
7067
335AD5AC20569C3C000D4D08 /* Reachability.framework in Frameworks */,
7168
33CC82EB1D7F16A8003B699F /* PusherSwift.framework in Frameworks */,
7269
);
@@ -101,9 +98,8 @@
10198
33831CC01A9CFCDB00B124F1 /* Main.storyboard */,
10299
33831C611A9CEEE900B124F1 /* Supporting Files */,
103100
);
104-
name = "iOS Example Swift";
105-
path = "/Users/hami/pusher/pusher-websocket-swift/iOS Example Swift/iOS Example Swift";
106-
sourceTree = "<absolute>";
101+
path = "iOS Example Swift";
102+
sourceTree = "<group>";
107103
};
108104
33831C611A9CEEE900B124F1 /* Supporting Files */ = {
109105
isa = PBXGroup;
@@ -121,7 +117,6 @@
121117
335AD5A620569C3B000D4D08 /* CryptoSwift.framework */,
122118
335AD5A820569C3B000D4D08 /* Reachability.framework */,
123119
335AD5A920569C3B000D4D08 /* Starscream.framework */,
124-
335AD5A720569C3B000D4D08 /* TaskQueue.framework */,
125120
33CC82EA1D7F16A8003B699F /* PusherSwift.framework */,
126121
);
127122
name = Frameworks;
@@ -180,6 +175,7 @@
180175
developmentRegion = English;
181176
hasScannedForEncodings = 0;
182177
knownRegions = (
178+
English,
183179
en,
184180
Base,
185181
);
@@ -213,7 +209,6 @@
213209
);
214210
inputPaths = (
215211
"$(SRCROOT)/../Carthage/Build/iOS/CryptoSwift.framework",
216-
"$(SRCROOT)/../Carthage/Build/iOS/TaskQueue.framework",
217212
"$(SRCROOT)/../Carthage/Build/iOS/Reachability.framework",
218213
"$(SRCROOT)/../Carthage/Build/iOS/Starscream.framework",
219214
);
@@ -222,7 +217,7 @@
222217
);
223218
runOnlyForDeploymentPostprocessing = 0;
224219
shellPath = /bin/sh;
225-
shellScript = "/usr/local/bin/carthage copy-frameworks";
220+
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
226221
};
227222
/* End PBXShellScriptBuildPhase section */
228223

0 commit comments

Comments
 (0)