3.1.11

Merge branch 'master' of https://github.com/pvzig/SlackKit
Update podfile
2017-03-19 19:11:16 -04:00 · 2017-03-18 15:21:42 -04:00 · 2017-03-18 15:21:01 -04:00 · 2017-03-18 15:17:30 -04:00 · 2017-03-18 14:07:58 -04:00 · 2017-03-18 12:20:55 -04:00
10 changed files with 17 additions and 45 deletions
@@ -1,2 +1,2 @@
-github "https://github.com/daltoniam/Starscream" == 2.0.2
-github "https://github.com/pvzig/swifter.git" == 3.0.4
+github "https://github.com/daltoniam/Starscream" == 2.0.3
+github "https://github.com/httpswift/swifter" == 1.3.3
@@ -1,2 +0,0 @@
-github "daltoniam/Starscream" "2.0.2"
-github "pvzig/swifter" "3.0.4"
@@ -4,8 +4,7 @@ let package = Package(
    name: "SlackKit",
    targets: [],
    dependencies: [
-        .Package(url: "https://github.com/pvzig/swifter.git",
-                 majorVersion: 3, minor: 0),
-        .Package(url: "https://github.com/daltoniam/Starscream", majorVersion: 2, minor: 0)
+        .Package(url: "https://github.com/httpswift/swifter", majorVersion: 1),
+        .Package(url: "https://github.com/daltoniam/Starscream", majorVersion: 2)
    ]
 )
@@ -3,16 +3,16 @@ source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!

 target 'SlackKit OS X' do
-	pod 'Starscream', '~> 2.0.2'
-	pod 'Swifter', :git => 'https://github.com/pvzig/swifter.git', :tag => '3.0.4'
+	pod 'Starscream', '~> 2.0.3'
+	pod 'Swifter', '~> 1.3.3'
 end

 target 'SlackKit iOS' do
-	pod 'Starscream', '~> 2.0.2'
-	pod 'Swifter', :git => 'https://github.com/pvzig/swifter.git', :tag => '3.0.4'
+	pod 'Starscream', '~> 2.0.3'
+	pod 'Swifter', '~> 1.3.3'
 end

 target 'SlackKit tvOS' do
-	pod 'Starscream', '~> 2.0.2'
-	pod 'Swifter', :git => 'https://github.com/pvzig/swifter.git', :tag => '3.0.4'
-end
+	pod 'Starscream', '~> 2.0.3'
+	pod 'Swifter', '~> 1.3.3'
+end
@@ -1,25 +0,0 @@
-PODS:
-  - Starscream (2.0.2)
-  - Swifter (1.3.2)
-
-DEPENDENCIES:
-  - Starscream (~> 2.0.2)
-  - Swifter (from `https://github.com/pvzig/swifter.git`, tag `3.0.4`)
-
-EXTERNAL SOURCES:
-  Swifter:
-    :git: https://github.com/pvzig/swifter.git
-    :tag: 3.0.4
-
-CHECKOUT OPTIONS:
-  Swifter:
-    :git: https://github.com/pvzig/swifter.git
-    :tag: 3.0.4
-
-SPEC CHECKSUMS:
-  Starscream: 6c135a34e0a6e60cedaa0b30db67a4c05cf7cd38
-  Swifter: dd1800ba8eb3e28b22b8bd20f91a8561a0110fac
-
-PODFILE CHECKSUM: cd86ea0f8422027c9d5fa3c40243ae7a816fb79a
-
-COCOAPODS: 1.1.0.rc.3
@@ -1,6 +1,6 @@
 ![SlackKit](https://cloud.githubusercontent.com/assets/8311605/10260893/5ec60f96-694e-11e5-91fd-da6845942201.png)

-![Swift Version](https://img.shields.io/badge/Swift-3.0-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) [![CocoaPods compatible](https://img.shields.io/badge/CocoaPods-compatible-brightgreen.svg)](https://cocoapods.org) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
+![Swift Version](https://img.shields.io/badge/Swift-3.0.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) [![CocoaPods compatible](https://img.shields.io/badge/CocoaPods-compatible-brightgreen.svg)](https://cocoapods.org) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg)](https://github.com/Carthage/Carthage) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg)](https://github.com/apple/swift-package-manager)
 ## SlackKit: A Swift Slack Client Library
 ### Description

@@ -18,7 +18,7 @@ To build the SlackKit project directly, first build the dependencies using Carth
 Add SlackKit to your pod file:
 ```
 use_frameworks!
-pod 'SlackKit', '~> 3.1.7'
+pod 'SlackKit', '~> 3.1.11'
 ```
 and run
 ```
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name             = "SlackKit"
-  s.version          = "3.1.9"
+  s.version          = "3.1.10"
  s.summary          = "a Slack client library for OS X, iOS, and tvOS written in Swift"
  s.homepage         = "https://github.com/pvzig/SlackKit"
  s.license          = 'MIT'
@@ -48,7 +48,7 @@ internal struct NetworkInterface {
    }
    
    internal func customRequest(_ url: String, data: Data, success: @escaping (Bool)->Void, errorClosure: @escaping (SlackError)->Void) {
-        guard let url =  URL(string: url.removePercentEncoding()) else {
+        guard let string = url.removingPercentEncoding, let url =  URL(string: string) else {
            errorClosure(SlackError.clientNetworkError)
            return
        }
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.9</string>
+	<string>3.1.11</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.9</string>
+	<string>3.1.11</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
Author	SHA1	Message	Date
Peter Zignego	0eb9ea31e1	3.1.11	2017-03-19 19:11:16 -04:00
Peter Zignego	8865376c3c	Merge branch 'master' of https://github.com/pvzig/SlackKit	2017-03-18 15:21:42 -04:00
Peter Zignego	d86d0108ff	Update podfile	2017-03-18 15:21:01 -04:00
Peter Zignego	b45b7085ce	Update Package.swift	2017-03-18 15:17:30 -04:00
Peter Zignego	91193c6b2e	Update podspec	2017-03-18 14:07:58 -04:00
Peter Zignego	9720b1c05c	Merge branch 'master' of https://github.com/pvzig/SlackKit	2017-03-18 12:20:55 -04:00
Peter Zignego	9766a5ad6c	Bump version strings	2017-03-18 12:20:48 -04:00
Peter Zignego	1e181e7580	Update README.md	2017-03-18 12:07:10 -04:00
Peter Zignego	f6d6c779ae	Update dependencies	2017-03-18 11:14:56 -04:00
Peter Zignego	11bb50f8d2	Delete Podfile.lock	2017-03-13 11:56:05 -04:00
Peter Zignego	d721e0ba1a	Delete Cartfile.resolved	2017-03-13 11:55:54 -04:00
Peter Zignego	ba6066875c	Update Package.swift	2017-03-13 11:55:40 -04:00
Peter Zignego	0f1a1a9de5	Update Cartfile	2017-03-13 11:54:43 -04:00
Peter Zignego	a81cebf5c8	Update Podfile	2017-03-13 11:54:05 -04:00