Skip to content

Commit cb98a90

Browse files
committed
Host of Swift 4 changes and updates. Also Source -> Sources in root dir
1 parent 4121c94 commit cb98a90

26 files changed

+1672
-1369
lines changed

PusherSwift.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'PusherSwift'
3-
s.version = '4.2.0'
3+
s.version = '5.0.0rc1'
44
s.summary = 'A Pusher client library in Swift'
55
s.homepage = 'https://github.com/pusher/pusher-websocket-swift'
66
s.license = 'MIT'
@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
99
s.social_media_url = 'https://twitter.com/pusher'
1010

1111
s.requires_arc = true
12-
s.source_files = 'Source/*.swift'
12+
s.source_files = 'Sources/*.swift'
1313

1414
s.ios.deployment_target = '8.0'
1515
s.osx.deployment_target = '10.10'

PusherSwift/PusherSwift.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
33831C891A9CF61600B124F1 /* PusherSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PusherSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5959
33831C8D1A9CF61600B124F1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6060
33831C941A9CF61600B124F1 /* PusherSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PusherSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
61-
33831CD31A9CFFD900B124F1 /* PusherSwift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PusherSwift.swift; path = ../Source/PusherSwift.swift; sourceTree = SOURCE_ROOT; };
62-
33831CD61A9CFFF200B124F1 /* PusherSwift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PusherSwift.h; path = ../Source/PusherSwift.h; sourceTree = SOURCE_ROOT; };
63-
3384C1B81CAECD9C00F10796 /* PusherChannel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PusherChannel.swift; path = ../Source/PusherChannel.swift; sourceTree = SOURCE_ROOT; };
61+
33831CD31A9CFFD900B124F1 /* PusherSwift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PusherSwift.swift; path = ../Sources/PusherSwift.swift; sourceTree = SOURCE_ROOT; };
62+
33831CD61A9CFFF200B124F1 /* PusherSwift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PusherSwift.h; path = ../Sources/PusherSwift.h; sourceTree = SOURCE_ROOT; };
63+
3384C1B81CAECD9C00F10796 /* PusherChannel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PusherChannel.swift; path = ../Sources/PusherChannel.swift; sourceTree = SOURCE_ROOT; };
6464
3389F5651CAEDD5F00563F49 /* PusherConnection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PusherConnection.swift; sourceTree = "<group>"; };
6565
3389F5691CAEDD9100563F49 /* PusherWebsocketDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PusherWebsocketDelegate.swift; sourceTree = "<group>"; };
6666
3389F56D1CAEDDD800563F49 /* PusherPresenceChannel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PusherPresenceChannel.swift; sourceTree = "<group>"; };
@@ -109,7 +109,7 @@
109109
33831C491A9CEDF800B124F1 = {
110110
isa = PBXGroup;
111111
children = (
112-
33831C8B1A9CF61600B124F1 /* Source */,
112+
33831C8B1A9CF61600B124F1 /* Sources */,
113113
33BB995C1D21225B00B25C2A /* Tests */,
114114
33831C8A1A9CF61600B124F1 /* Products */,
115115
42D29A655054030A9B238900 /* Frameworks */,
@@ -125,7 +125,7 @@
125125
name = Products;
126126
sourceTree = "<group>";
127127
};
128-
33831C8B1A9CF61600B124F1 /* Source */ = {
128+
33831C8B1A9CF61600B124F1 /* Sources */ = {
129129
isa = PBXGroup;
130130
children = (
131131
33831CD31A9CFFD900B124F1 /* PusherSwift.swift */,
@@ -145,8 +145,8 @@
145145
33831CD61A9CFFF200B124F1 /* PusherSwift.h */,
146146
33831C8C1A9CF61600B124F1 /* Supporting Files */,
147147
);
148-
name = Source;
149-
path = ../Source;
148+
name = Sources;
149+
path = ../Sources;
150150
sourceTree = "<group>";
151151
};
152152
33831C8C1A9CF61600B124F1 /* Supporting Files */ = {
@@ -491,7 +491,7 @@
491491
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
492492
GCC_WARN_UNUSED_FUNCTION = YES;
493493
GCC_WARN_UNUSED_VARIABLE = YES;
494-
INFOPLIST_FILE = "$(SRCROOT)/../Source/Info.plist";
494+
INFOPLIST_FILE = "$(SRCROOT)/../Sources/Info.plist";
495495
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
496496
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
497497
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -548,7 +548,7 @@
548548
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
549549
GCC_WARN_UNUSED_FUNCTION = YES;
550550
GCC_WARN_UNUSED_VARIABLE = YES;
551-
INFOPLIST_FILE = "$(SRCROOT)/../Source/Info.plist";
551+
INFOPLIST_FILE = "$(SRCROOT)/../Sources/Info.plist";
552552
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
553553
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
554554
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

0 commit comments

Comments
 (0)