Skip to content
This repository was archived by the owner on Dec 2, 2022. It is now read-only.

Commit e625acb

Browse files
pvzigpvzig
committed
Merge pull request #5 from pvzig/swift-2.2
Swift 2.2
2 parents a33b2d0 + 6d34ea0 commit e625acb

19 files changed

+111
-60
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ DerivedData
1616
*.hmap
1717
*.ipa
1818
*.xcuserstate
19+
.build
20+
Packages/
1921

2022
# CocoaPods
2123
#

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015 Peter Zignego
3+
Copyright (c) 2016 Peter Zignego
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Package.swift‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
//
2+
// Package.swift
3+
//
4+
// Copyright © 2016 Peter Zignego. All rights reserved.
5+
//
6+
// Permission is hereby granted, free of charge, to any person obtaining a copy
7+
// of this software and associated documentation files (the "Software"), to deal
8+
// in the Software without restriction, including without limitation the rights
9+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
// copies of the Software, and to permit persons to whom the Software is
11+
// furnished to do so, subject to the following conditions:
12+
//
13+
// The above copyright notice and this permission notice shall be included in
14+
// all copies or substantial portions of the Software.
15+
//
16+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
// THE SOFTWARE.
23+
24+
import PackageDescription
25+
26+
let package = Package(
27+
name: "SlackKit",
28+
targets: [],
29+
dependencies: [
30+
.Package(url: "https://github.com/pvzig/Starscream.git",
31+
majorVersion: 1),
32+
]
33+
)

‎README.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,21 @@
44
This is a Slack client library for iOS and OS X written in Swift. It's intended to expose all of the functionality of Slack's [Real Time Messaging API](https://api.slack.com/rtm).
55

66
###Installation
7+
####Swift Package Manager (Swift 2.2 and up)
8+
Add SlackKit to your Package.swift
9+
10+
```swift
11+
import PackageDescription
12+
13+
let package = Package(
14+
dependencies: [
15+
.Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 0)
16+
]
17+
)
18+
```
19+
20+
Run `swift-build` on your application’s main directory.
21+
722
####CocoaPods
823
Add the pod to your podfile:
924
```

‎SlackKit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// SlackKit.h
33
//
4-
// Copyright © 2015 Peter Zignego. All rights reserved.
4+
// Copyright © 2016 Peter Zignego. All rights reserved.
55
//
66
// Permission is hereby granted, free of charge, to any person obtaining a copy
77
// of this software and associated documentation files (the "Software"), to deal

‎SlackKit.xcodeproj/project.pbxproj‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,39 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
2661A68F1BBF60E60026F67B /* Bot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6821BBF60E60026F67B /* Bot.swift */; };
11-
2661A6901BBF60E60026F67B /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6831BBF60E60026F67B /* Channel.swift */; };
12-
2661A6911BBF60E60026F67B /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6841BBF60E60026F67B /* Client.swift */; };
13-
2661A6921BBF60E60026F67B /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6851BBF60E60026F67B /* Event.swift */; };
14-
2661A6931BBF60E60026F67B /* EventDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6861BBF60E60026F67B /* EventDispatcher.swift */; };
15-
2661A6941BBF60E60026F67B /* EventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6871BBF60E60026F67B /* EventHandler.swift */; };
16-
2661A6951BBF60E60026F67B /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A6881BBF60E60026F67B /* File.swift */; };
17-
2661A6971BBF60E60026F67B /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A68A1BBF60E60026F67B /* Message.swift */; };
18-
2661A6991BBF60E60026F67B /* Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A68C1BBF60E60026F67B /* Team.swift */; };
19-
2661A69A1BBF60E60026F67B /* Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A68D1BBF60E60026F67B /* Types.swift */; };
20-
2661A69B1BBF60E60026F67B /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2661A68E1BBF60E60026F67B /* User.swift */; };
21-
26EB95961C285CEE00BD1F13 /* EventDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EB95951C285CEE00BD1F13 /* EventDelegate.swift */; };
22-
26EB959D1C2F10CA00BD1F13 /* UserGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EB959C1C2F10CA00BD1F13 /* UserGroup.swift */; };
10+
26BBA1941C398E3C00BF7225 /* Bot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1871C398E3C00BF7225 /* Bot.swift */; };
11+
26BBA1951C398E3C00BF7225 /* Channel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1881C398E3C00BF7225 /* Channel.swift */; };
12+
26BBA1961C398E3C00BF7225 /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1891C398E3C00BF7225 /* Client.swift */; };
13+
26BBA1971C398E3C00BF7225 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18A1C398E3C00BF7225 /* Event.swift */; };
14+
26BBA1981C398E3C00BF7225 /* EventDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */; };
15+
26BBA1991C398E3C00BF7225 /* EventDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18C1C398E3C00BF7225 /* EventDispatcher.swift */; };
16+
26BBA19A1C398E3C00BF7225 /* EventHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18D1C398E3C00BF7225 /* EventHandler.swift */; };
17+
26BBA19B1C398E3C00BF7225 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18E1C398E3C00BF7225 /* File.swift */; };
18+
26BBA19C1C398E3C00BF7225 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA18F1C398E3C00BF7225 /* Message.swift */; };
19+
26BBA19D1C398E3C00BF7225 /* Team.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1901C398E3C00BF7225 /* Team.swift */; };
20+
26BBA19E1C398E3C00BF7225 /* Types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1911C398E3C00BF7225 /* Types.swift */; };
21+
26BBA19F1C398E3C00BF7225 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1921C398E3C00BF7225 /* User.swift */; };
22+
26BBA1A01C398E3C00BF7225 /* UserGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26BBA1931C398E3C00BF7225 /* UserGroup.swift */; };
2323
FFE3AC870D1C42EF276CCA2D /* Pods_SlackKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 407A2ABFC0611867E2BE34D0 /* Pods_SlackKit.framework */; };
2424
/* End PBXBuildFile section */
2525

2626
/* Begin PBXFileReference section */
2727
26072A341BB48B3A00CD650C /* SlackKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SlackKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
28-
2661A6821BBF60E60026F67B /* Bot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bot.swift; sourceTree = "<group>"; };
29-
2661A6831BBF60E60026F67B /* Channel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Channel.swift; sourceTree = "<group>"; };
30-
2661A6841BBF60E60026F67B /* Client.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
31-
2661A6851BBF60E60026F67B /* Event.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Event.swift; sourceTree = "<group>"; };
32-
2661A6861BBF60E60026F67B /* EventDispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDispatcher.swift; sourceTree = "<group>"; };
33-
2661A6871BBF60E60026F67B /* EventHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventHandler.swift; sourceTree = "<group>"; };
34-
2661A6881BBF60E60026F67B /* File.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
35-
2661A68A1BBF60E60026F67B /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Message.swift; sourceTree = "<group>"; };
36-
2661A68C1BBF60E60026F67B /* Team.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Team.swift; sourceTree = "<group>"; };
37-
2661A68D1BBF60E60026F67B /* Types.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Types.swift; sourceTree = "<group>"; };
38-
2661A68E1BBF60E60026F67B /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
3928
2661A6A41BBF62FF0026F67B /* SlackKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SlackKit.h; sourceTree = "<group>"; };
4029
266E05F01BBF780C00840D76 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
41-
26EB95951C285CEE00BD1F13 /* EventDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EventDelegate.swift; sourceTree = "<group>"; };
42-
26EB959C1C2F10CA00BD1F13 /* UserGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserGroup.swift; sourceTree = "<group>"; };
30+
26BBA1871C398E3C00BF7225 /* Bot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Bot.swift; path = Sources/Bot.swift; sourceTree = "<group>"; };
31+
26BBA1881C398E3C00BF7225 /* Channel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Channel.swift; path = Sources/Channel.swift; sourceTree = "<group>"; };
32+
26BBA1891C398E3C00BF7225 /* Client.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Client.swift; path = Sources/Client.swift; sourceTree = "<group>"; };
33+
26BBA18A1C398E3C00BF7225 /* Event.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Event.swift; path = Sources/Event.swift; sourceTree = "<group>"; };
34+
26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EventDelegate.swift; path = Sources/EventDelegate.swift; sourceTree = "<group>"; };
35+
26BBA18C1C398E3C00BF7225 /* EventDispatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EventDispatcher.swift; path = Sources/EventDispatcher.swift; sourceTree = "<group>"; };
36+
26BBA18D1C398E3C00BF7225 /* EventHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EventHandler.swift; path = Sources/EventHandler.swift; sourceTree = "<group>"; };
37+
26BBA18E1C398E3C00BF7225 /* File.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = File.swift; path = Sources/File.swift; sourceTree = "<group>"; };
38+
26BBA18F1C398E3C00BF7225 /* Message.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Message.swift; path = Sources/Message.swift; sourceTree = "<group>"; };
39+
26BBA1901C398E3C00BF7225 /* Team.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Team.swift; path = Sources/Team.swift; sourceTree = "<group>"; };
40+
26BBA1911C398E3C00BF7225 /* Types.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Types.swift; path = Sources/Types.swift; sourceTree = "<group>"; };
41+
26BBA1921C398E3C00BF7225 /* User.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = User.swift; path = Sources/User.swift; sourceTree = "<group>"; };
42+
26BBA1931C398E3C00BF7225 /* UserGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserGroup.swift; path = Sources/UserGroup.swift; sourceTree = "<group>"; };
4343
407A2ABFC0611867E2BE34D0 /* Pods_SlackKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SlackKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4444
4347F92F3932C96C23B10B2A /* Pods-SlackKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SlackKit.release.xcconfig"; path = "Pods/Target Support Files/Pods-SlackKit/Pods-SlackKit.release.xcconfig"; sourceTree = "<group>"; };
4545
F59B6A12F1C4C4E24C58E1BF /* Pods-SlackKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SlackKit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SlackKit/Pods-SlackKit.debug.xcconfig"; sourceTree = "<group>"; };
@@ -87,19 +87,19 @@
8787
2661A6811BBF60E60026F67B /* SlackKit */ = {
8888
isa = PBXGroup;
8989
children = (
90-
2661A6821BBF60E60026F67B /* Bot.swift */,
91-
2661A6831BBF60E60026F67B /* Channel.swift */,
92-
2661A6841BBF60E60026F67B /* Client.swift */,
93-
2661A6851BBF60E60026F67B /* Event.swift */,
94-
2661A6861BBF60E60026F67B /* EventDispatcher.swift */,
95-
2661A6871BBF60E60026F67B /* EventHandler.swift */,
96-
26EB95951C285CEE00BD1F13 /* EventDelegate.swift */,
97-
2661A6881BBF60E60026F67B /* File.swift */,
98-
2661A68A1BBF60E60026F67B /* Message.swift */,
99-
2661A68C1BBF60E60026F67B /* Team.swift */,
100-
2661A68D1BBF60E60026F67B /* Types.swift */,
101-
2661A68E1BBF60E60026F67B /* User.swift */,
102-
26EB959C1C2F10CA00BD1F13 /* UserGroup.swift */,
90+
26BBA1871C398E3C00BF7225 /* Bot.swift */,
91+
26BBA1881C398E3C00BF7225 /* Channel.swift */,
92+
26BBA1891C398E3C00BF7225 /* Client.swift */,
93+
26BBA18A1C398E3C00BF7225 /* Event.swift */,
94+
26BBA18B1C398E3C00BF7225 /* EventDelegate.swift */,
95+
26BBA18C1C398E3C00BF7225 /* EventDispatcher.swift */,
96+
26BBA18D1C398E3C00BF7225 /* EventHandler.swift */,
97+
26BBA18E1C398E3C00BF7225 /* File.swift */,
98+
26BBA18F1C398E3C00BF7225 /* Message.swift */,
99+
26BBA1901C398E3C00BF7225 /* Team.swift */,
100+
26BBA1911C398E3C00BF7225 /* Types.swift */,
101+
26BBA1921C398E3C00BF7225 /* User.swift */,
102+
26BBA1931C398E3C00BF7225 /* UserGroup.swift */,
103103
2661A6A41BBF62FF0026F67B /* SlackKit.h */,
104104
266E05F01BBF780C00840D76 /* Info.plist */,
105105
);
@@ -227,19 +227,19 @@
227227
isa = PBXSourcesBuildPhase;
228228
buildActionMask = 2147483647;
229229
files = (
230-
2661A69A1BBF60E60026F67B /* Types.swift in Sources */,
231-
2661A6901BBF60E60026F67B /* Channel.swift in Sources */,
232-
2661A6921BBF60E60026F67B /* Event.swift in Sources */,
233-
2661A6971BBF60E60026F67B /* Message.swift in Sources */,
234-
2661A6991BBF60E60026F67B /* Team.swift in Sources */,
235-
2661A69B1BBF60E60026F67B /* User.swift in Sources */,
236-
2661A6951BBF60E60026F67B /* File.swift in Sources */,
237-
2661A6931BBF60E60026F67B /* EventDispatcher.swift in Sources */,
238-
2661A6911BBF60E60026F67B /* Client.swift in Sources */,
239-
2661A6941BBF60E60026F67B /* EventHandler.swift in Sources */,
240-
2661A68F1BBF60E60026F67B /* Bot.swift in Sources */,
241-
26EB959D1C2F10CA00BD1F13 /* UserGroup.swift in Sources */,
242-
26EB95961C285CEE00BD1F13 /* EventDelegate.swift in Sources */,
230+
26BBA1991C398E3C00BF7225 /* EventDispatcher.swift in Sources */,
231+
26BBA1951C398E3C00BF7225 /* Channel.swift in Sources */,
232+
26BBA19F1C398E3C00BF7225 /* User.swift in Sources */,
233+
26BBA19E1C398E3C00BF7225 /* Types.swift in Sources */,
234+
26BBA1961C398E3C00BF7225 /* Client.swift in Sources */,
235+
26BBA19A1C398E3C00BF7225 /* EventHandler.swift in Sources */,
236+
26BBA1971C398E3C00BF7225 /* Event.swift in Sources */,
237+
26BBA1941C398E3C00BF7225 /* Bot.swift in Sources */,
238+
26BBA19B1C398E3C00BF7225 /* File.swift in Sources */,
239+
26BBA19C1C398E3C00BF7225 /* Message.swift in Sources */,
240+
26BBA19D1C398E3C00BF7225 /* Team.swift in Sources */,
241+
26BBA1A01C398E3C00BF7225 /* UserGroup.swift in Sources */,
242+
26BBA1981C398E3C00BF7225 /* EventDelegate.swift in Sources */,
243243
);
244244
runOnlyForDeploymentPostprocessing = 0;
245245
};

‎SlackKit/Bot.swift‎ renamed to ‎SlackKit/Sources/Bot.swift‎

File renamed without changes.

‎SlackKit/Channel.swift‎ renamed to ‎SlackKit/Sources/Channel.swift‎

File renamed without changes.

‎SlackKit/Client.swift‎ renamed to ‎SlackKit/Sources/Client.swift‎

File renamed without changes.

‎SlackKit/Event.swift‎ renamed to ‎SlackKit/Sources/Event.swift‎

File renamed without changes.

0 commit comments

Comments
 (0)