Skip to content

Commit e09e085

Browse files
TomKempTomKemp
authored
Merge pull request #207 from pusher/wip-remove-pn
Remove Push Notifications BETA and fix example app configuration
2 parents 9d2f1c1 + 47d3ffd commit e09e085

File tree

27 files changed

+114
-2410
lines changed

27 files changed

+114
-2410
lines changed

‎Cartfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
github "krzyzanowskim/CryptoSwift" ~> 0.15.0
22
github "ashleymills/Reachability.swift" == 4.3.0
3-
github "icanzilb/TaskQueue" ~> 1.1.1
43
github "daltoniam/Starscream" == 3.0.6

‎Cartfile.resolved

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
github "ashleymills/Reachability.swift" "v4.3.0"
22
github "daltoniam/Starscream" "3.0.6"
3-
github "icanzilb/TaskQueue" "1.1.1"
43
github "krzyzanowskim/CryptoSwift" "0.15.0"

‎PusherSwift.podspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Pod::Spec.new do |s|
1414

1515
s.dependency 'CryptoSwift', '~> 0.9'
1616
s.dependency 'ReachabilitySwift', '4.3.0'
17-
s.dependency 'TaskQueue', '~> 1.1'
1817
s.dependency 'Starscream', '~> 3.0.5'
1918

2019
s.ios.deployment_target = '8.0'

‎PusherSwift.xcodeproj/project.pbxproj

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
330D7A6A1CAEDA6C0032FF2C /* PusherSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33831CD31A9CFFD900B124F1 /* PusherSwift.swift */; };
1111
330D7A6D1CAEDA750032FF2C /* PusherChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3384C1B81CAECD9C00F10796 /* PusherChannel.swift */; };
12-
3341A33A1D819FBC007191AD /* NativePusher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3341A3391D819FBC007191AD /* NativePusher.swift */; };
1312
3342F3BD1D808AC900C0296E /* ClientEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3342F3BB1D808AC500C0296E /* ClientEventTests.swift */; };
1413
335BCA0D1C38ABF000B47A66 /* PusherSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 33831CD61A9CFFF200B124F1 /* PusherSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
1514
3389F5661CAEDD5F00563F49 /* PusherConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3389F5651CAEDD5F00563F49 /* PusherConnection.swift */; };
@@ -21,7 +20,6 @@
2120
3390D1E61F054D0400E1944D /* AuthRequestBuilderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3390D1E51F054D0400E1944D /* AuthRequestBuilderProtocol.swift */; };
2221
3390D1E81F054D1E00E1944D /* Authorizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3390D1E71F054D1E00E1944D /* Authorizer.swift */; };
2322
33A962771D89483600DA421E /* PusherConnectionDelegateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33A962751D8943CA00DA421E /* PusherConnectionDelegateTests.swift */; };
24-
33BA541E1D90351B00CD853B /* NativePusherTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33BA541D1D90351B00CD853B /* NativePusherTests.swift */; };
2523
33BA54201D9035BD00CD853B /* PusherDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33BA541F1D9035BD00CD853B /* PusherDelegate.swift */; };
2624
33BB99731D21230100B25C2A /* AuthenticationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33BB995D1D21226C00B25C2A /* AuthenticationTests.swift */; };
2725
33BB99751D21230100B25C2A /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33BB995F1D21226C00B25C2A /* Helpers.swift */; };
@@ -48,7 +46,6 @@
4846

4947
/* Begin PBXFileReference section */
5048
3301FED22051AB6400AE591A /* Carthage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Carthage.xcconfig; path = ../Carthage.xcconfig; sourceTree = "<group>"; };
51-
3341A3391D819FBC007191AD /* NativePusher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NativePusher.swift; sourceTree = "<group>"; };
5249
3342F3BB1D808AC500C0296E /* ClientEventTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ClientEventTests.swift; path = ../Tests/ClientEventTests.swift; sourceTree = "<group>"; };
5350
33831C891A9CF61600B124F1 /* PusherSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PusherSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5451
33831C8D1A9CF61600B124F1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -65,7 +62,6 @@
6562
3390D1E51F054D0400E1944D /* AuthRequestBuilderProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthRequestBuilderProtocol.swift; sourceTree = "<group>"; };
6663
3390D1E71F054D1E00E1944D /* Authorizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Authorizer.swift; sourceTree = "<group>"; };
6764
33A962751D8943CA00DA421E /* PusherConnectionDelegateTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PusherConnectionDelegateTests.swift; path = ../Tests/PusherConnectionDelegateTests.swift; sourceTree = "<group>"; };
68-
33BA541D1D90351B00CD853B /* NativePusherTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NativePusherTests.swift; path = ../Tests/NativePusherTests.swift; sourceTree = "<group>"; };
6965
33BA541F1D9035BD00CD853B /* PusherDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PusherDelegate.swift; sourceTree = "<group>"; };
7066
33BB995D1D21226C00B25C2A /* AuthenticationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AuthenticationTests.swift; path = ../Tests/AuthenticationTests.swift; sourceTree = "<group>"; };
7167
33BB995F1D21226C00B25C2A /* Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Helpers.swift; path = ../Tests/Helpers.swift; sourceTree = "<group>"; };
@@ -129,7 +125,6 @@
129125
3389F56D1CAEDDD800563F49 /* PusherPresenceChannel.swift */,
130126
3389F5751CAEDE2800563F49 /* PusherGlobalChannel.swift */,
131127
3389F5711CAEDDF300563F49 /* PusherChannels.swift */,
132-
3341A3391D819FBC007191AD /* NativePusher.swift */,
133128
3390D1E51F054D0400E1944D /* AuthRequestBuilderProtocol.swift */,
134129
3390D1E71F054D1E00E1944D /* Authorizer.swift */,
135130
33C1FD6E1D81BFC300921AD7 /* ObjectiveC.swift */,
@@ -162,7 +157,6 @@
162157
33A962751D8943CA00DA421E /* PusherConnectionDelegateTests.swift */,
163158
33BB99651D21226C00B25C2A /* PusherIncomingEventHandlingTests.swift */,
164159
33BB99661D21226C00B25C2A /* PusherTopLevelAPITests.swift */,
165-
33BA541D1D90351B00CD853B /* NativePusherTests.swift */,
166160
33BB99671D21226C00B25C2A /* Info.plist */,
167161
);
168162
path = Tests;
@@ -297,7 +291,6 @@
297291
);
298292
inputPaths = (
299293
Starscream,
300-
TaskQueue,
301294
CryptoSwift,
302295
Reachability,
303296
);
@@ -306,7 +299,7 @@
306299
);
307300
runOnlyForDeploymentPostprocessing = 0;
308301
shellPath = /bin/sh;
309-
shellScript = "case \"$PLATFORM_NAME\" in\nmacosx) plat=Mac;;\niphone*) plat=iOS;;\nwatch*) plat=watchOS;;\ntv*) plat=tvOS;;\nappletv*) plat=tvOS;;\n*) echo \"error: Unknown PLATFORM_NAME: $PLATFORM_NAME\"; exit 1;;\nesac\nfor (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do\nVAR=SCRIPT_INPUT_FILE_$n\nframework=$(basename \"${!VAR}\")\nexport SCRIPT_INPUT_FILE_$n=\"$SRCROOT\"/Carthage/Build/$plat/\"$framework\".framework\ndone\n\n/usr/local/bin/carthage copy-frameworks || exit\n\nfor (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do\nVAR=SCRIPT_INPUT_FILE_$n\nsource=${!VAR}.dSYM\ndest=${BUILT_PRODUCTS_DIR}/$(basename \"$source\")\nditto \"$source\" \"$dest\" || exit\ndone";
302+
shellScript = "case \"$PLATFORM_NAME\" in\nmacosx) plat=Mac;;\niphone*) plat=iOS;;\nwatch*) plat=watchOS;;\ntv*) plat=tvOS;;\nappletv*) plat=tvOS;;\n*) echo \"error: Unknown PLATFORM_NAME: $PLATFORM_NAME\"; exit 1;;\nesac\nfor (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do\nVAR=SCRIPT_INPUT_FILE_$n\nframework=$(basename \"${!VAR}\")\nexport SCRIPT_INPUT_FILE_$n=\"$SRCROOT\"/Carthage/Build/$plat/\"$framework\".framework\ndone\n\n/usr/local/bin/carthage copy-frameworks || exit\n\nfor (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do\nVAR=SCRIPT_INPUT_FILE_$n\nsource=${!VAR}.dSYM\ndest=${BUILT_PRODUCTS_DIR}/$(basename \"$source\")\nditto \"$source\" \"$dest\" || exit\ndone\n";
310303
};
311304
/* End PBXShellScriptBuildPhase section */
312305

@@ -324,7 +317,6 @@
324317
3389F5761CAEDE2800563F49 /* PusherGlobalChannel.swift in Sources */,
325318
3389F57A1CAEDEC800563F49 /* PusherClientOptions.swift in Sources */,
326319
3389F56E1CAEDDD800563F49 /* PusherPresenceChannel.swift in Sources */,
327-
3341A33A1D819FBC007191AD /* NativePusher.swift in Sources */,
328320
33C1FD6F1D81BFC300921AD7 /* ObjectiveC.swift in Sources */,
329321
3390D1E61F054D0400E1944D /* AuthRequestBuilderProtocol.swift in Sources */,
330322
330D7A6A1CAEDA6C0032FF2C /* PusherSwift.swift in Sources */,
@@ -342,7 +334,6 @@
342334
33BB997B1D21230100B25C2A /* PusherIncomingEventHandlingTests.swift in Sources */,
343335
3342F3BD1D808AC900C0296E /* ClientEventTests.swift in Sources */,
344336
33BB99751D21230100B25C2A /* Helpers.swift in Sources */,
345-
33BA541E1D90351B00CD853B /* NativePusherTests.swift in Sources */,
346337
33BB99731D21230100B25C2A /* AuthenticationTests.swift in Sources */,
347338
33BB99781D21230100B25C2A /* PusherChannelTests.swift in Sources */,
348339
33BB99761D21230100B25C2A /* Mocks.swift in Sources */,

‎PusherSwift.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎macOS Example Swift/macOS Example Swift/macOS Example Swift.entitlements renamed to ‎PusherSwift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>com.apple.developer.aps-environment</key>
6-
<string>development</string>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
77
</dict>
88
</plist>

0 commit comments

Comments
 (0)