Compare commits

...

6 Commits

Author SHA1 Message Date
Peter Zignego 247fe176fe Version bump 2016-09-26 00:05:56 -04:00
Peter Zignego c7365455d2 Update readme 2016-09-25 18:10:26 -04:00
Peter Zignego 3a03f745bf CocoaPods 2016-09-25 18:10:20 -04:00
Peter Zignego d291975368 SPM doesn’t support Swift 2.3 2016-09-25 18:08:31 -04:00
Peter Zignego cd273f266e Update Cartfile with 2.3 targets 2016-09-25 12:51:15 -04:00
Peter Zignego a01c51dd0d Set SWIFT_VERSION = 2.3 2016-09-25 12:49:07 -04:00
11 changed files with 53 additions and 71 deletions
+1 -1
View File
@@ -1 +1 @@
2.2
2.3
+2 -2
View File
@@ -1,2 +1,2 @@
github "daltoniam/Starscream" ~> 1.0
github "glock45/swifter" "d7c820bfc9260e469094b5f8d3d101b30c4a8fac"
github "daltoniam/Starscream" "swift-23"
github "pvzig/swifter.git" "077f1000d26cc5fa436a26e6d67284130b735a12"
+2 -2
View File
@@ -1,2 +1,2 @@
github "daltoniam/Starscream" "1.1.3"
github "glock45/swifter" "d7c820bfc9260e469094b5f8d3d101b30c4a8fac"
github "daltoniam/Starscream" "8f3761215b3bd70d5111048e5e3ac435c862c13d"
github "pvzig/swifter" "077f1000d26cc5fa436a26e6d67284130b735a12"
-35
View File
@@ -1,35 +0,0 @@
//
// Package.swift
//
// Copyright © 2016 Peter Zignego. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
import PackageDescription
let package = Package(
name: "SlackKit",
targets: [],
dependencies: [
.Package(url: "https://github.com/daltoniam/Starscream",
majorVersion: 1),
.Package(url: "https://github.com/httpswift/swifter", majorVersion: 1)
],
exclude: ["Examples", "Carthage", "Pods"]
)
+15 -6
View File
@@ -3,16 +3,25 @@ source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!
target 'SlackKit OS X' do
pod 'Starscream'
pod 'Swifter'
pod 'Starscream', :git => 'https://github.com/pvzig/Starscream.git', :branch => 'swift-23'
pod 'Swifter', :git => 'https://github.com/pvzig/swifter.git', :branch => 'stable'
end
target 'SlackKit iOS' do
pod 'Starscream'
pod 'Swifter'
pod 'Starscream', :git => 'https://github.com/pvzig/Starscream.git', :branch => 'swift-23'
pod 'Swifter', :git => 'https://github.com/pvzig/swifter.git', :branch => 'stable'
end
target 'SlackKit tvOS' do
pod 'Starscream'
pod 'Swifter'
pod 'Starscream', :git => 'https://github.com/pvzig/Starscream.git', :branch => 'swift-23'
pod 'Swifter', :git => 'https://github.com/pvzig/swifter.git', :branch => 'stable'
end
# Set SWIFT_VERSION to 2.3 manually
post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '2.3'
end
end
end
+21 -5
View File
@@ -1,15 +1,31 @@
PODS:
- Starscream (1.1.3)
- Starscream (1.1.4)
- Swifter (1.2.6)
DEPENDENCIES:
- Starscream
- Swifter
- Starscream (from `https://github.com/pvzig/Starscream.git`, branch `swift-23`)
- Swifter (from `https://github.com/pvzig/swifter.git`, branch `stable`)
EXTERNAL SOURCES:
Starscream:
:branch: swift-23
:git: https://github.com/pvzig/Starscream.git
Swifter:
:branch: stable
:git: https://github.com/pvzig/swifter.git
CHECKOUT OPTIONS:
Starscream:
:commit: fc5529e18f1352fbe18bf8c0d8b333e02b636a1d
:git: https://github.com/pvzig/Starscream.git
Swifter:
:commit: 077f1000d26cc5fa436a26e6d67284130b735a12
:git: https://github.com/pvzig/swifter.git
SPEC CHECKSUMS:
Starscream: d662732354b40dd19ed1ece3e3c44c80b536b83c
Starscream: f919aeaf81afca6d5d4d3e5f6dd136ec92af2aa1
Swifter: c6f13d053398f1e2f209c7a394dfd5e863ae0157
PODFILE CHECKSUM: 372d57254c34897042ce228cf421d7c9cc5caf9f
PODFILE CHECKSUM: eb199f4d00b2166c447035baee5537560b583b38
COCOAPODS: 1.0.1
+3 -17
View File
@@ -1,11 +1,10 @@
![SlackKit](https://cloud.githubusercontent.com/assets/8311605/10260893/5ec60f96-694e-11e5-91fd-da6845942201.png)
![Swift Version](https://img.shields.io/badge/Swift-2.2-orange.svg) ![Plaforms](https://img.shields.io/badge/Platforms-macOS,iOS,tvOS-lightgrey.svg) ![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager) ![Pod Version](https://img.shields.io/badge/Pod-2.0.0-blue.svg) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage)
![Swift Version](https://img.shields.io/badge/Swift-2.3-orange.svg) ![Plaforms](https://img.shields.io/badge/Platforms-macOS,iOS,tvOS-lightgrey.svg) ![License MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg) ![Pod Version](https://img.shields.io/badge/Pod-2.3.0-blue.svg) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage)
## SlackKit: A Swift Slack Client Library
### Description
This is a Slack client library for OS X, iOS, and tvOS written in Swift. It's intended to expose all of the functionality of Slack's [Real Time Messaging API](https://api.slack.com/rtm) as well as the [web APIs](https://api.slack.com/web) that are accessible to [bot users](https://api.slack.com/bot-users). SlackKit also supports Slacks [OAuth 2.0](https://api.slack.com/docs/oauth) flow including the [Add to Slack](https://api.slack.com/docs/slack-button) and [Sign in with Slack](https://api.slack.com/docs/sign-in-with-slack) buttons, [incoming webhooks](https://api.slack.com/incoming-webhooks), [slash commands](https://api.slack.com/slash-commands), and [message buttons](https://api.slack.com/docs/message-buttons).
SlackKit also has alpha support for: [Swift 3](https://github.com/pvzig/SlackKit/tree/swift3), [Linux](https://github.com/pvzig/SlackKit/tree/linux)
This is the Swift 2.3 branch of SlackKit. SlackKit also has support for [Swift 3](https://github.com/pvzig/SlackKit/tree/swift3) and [Linux](https://github.com/pvzig/SlackKit/tree/linux).
#### Building the SlackKit Framework
To build the SlackKit project directly, first build the dependencies using Carthage or CocoaPods. To use the framework in your application, install it in one of the following ways:
@@ -25,7 +24,7 @@ pod install
Add SlackKit to your Cartfile:
```
github "pvzig/SlackKit" ~> 2.0
github "pvzig/SlackKit" ~> 2.3
```
and run
```
@@ -37,19 +36,6 @@ carthage bootstrap --configuration "Debug"
```
Drag the built `SlackKit.framework` into your Xcode project.
#### Swift Package Manager
Add SlackKit to your Package.swift
```swift
import PackageDescription
let package = Package(
dependencies: [
.Package(url: "https://github.com/pvzig/SlackKit.git", majorVersion: 2)
]
)
```
Run `swift build` on your applications main directory.
To use the library in your project import it:
```
import SlackKit
+6
View File
@@ -773,6 +773,7 @@
PRODUCT_NAME = SlackKit;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@@ -798,6 +799,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.launchsoft.SlackKit;
PRODUCT_NAME = SlackKit;
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Release;
};
@@ -828,6 +830,7 @@
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@@ -857,6 +860,7 @@
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_VERSION = 2.3;
};
name = Release;
};
@@ -884,6 +888,7 @@
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 2.3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Debug;
@@ -911,6 +916,7 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "appletvsimulator appletvos";
SWIFT_VERSION = 2.3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Release;
+1 -1
View File
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.0</string>
<string>2.3.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
+1 -1
View File
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.0</string>
<string>2.3.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
+1 -1
View File
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.0</string>
<string>2.3.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>