From 48672d8df3e6db460e4c5f995a7418bbce7d8017 Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 15 Oct 2015 13:50:05 -0400 Subject: [PATCH 1/3] bump version: --- README.md | 4 ++-- Socket.IO-Client-Swift.podspec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 37055ae..e649531 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ Carthage ----------------- Add this line to your `Cartfile`: ``` -github "socketio/socket.io-client-swift" ~> 3.1.4 # Or latest version +github "socketio/socket.io-client-swift" ~> 3.1.5 # Or latest version ``` Run `carthage update --platform ios,macosx`. @@ -83,7 +83,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' use_frameworks! -pod 'Socket.IO-Client-Swift', '~> 3.1.4' # Or latest version +pod 'Socket.IO-Client-Swift', '~> 3.1.5' # Or latest version ``` Install pods: diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec index f09d17b..eefb99c 100644 --- a/Socket.IO-Client-Swift.podspec +++ b/Socket.IO-Client-Swift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Socket.IO-Client-Swift" - s.version = "3.1.4" + s.version = "3.1.5" s.summary = "Socket.IO-client for iOS and OS X" s.description = <<-DESC Socket.IO-client for iOS and OS X. @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.author = { "Erik" => "nuclear.ace@gmail.com" } s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.10' - s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v3.1.4' } + s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v3.1.5' } s.source_files = "SocketIOClientSwift/**/*.swift" s.requires_arc = true # s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files From ad7043c9184068db21f9ba25726b484403e977c7 Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 15 Oct 2015 14:01:52 -0400 Subject: [PATCH 2/3] try and fix carthage builds --- Socket.IO-Client-Swift.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj index 83a7549..e1304e4 100644 --- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj +++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj @@ -598,6 +598,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -652,6 +653,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; From 1648a51b6f6506506d91c7ee2268ca45805a799b Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 15 Oct 2015 14:06:28 -0400 Subject: [PATCH 3/3] bump version --- README.md | 22 +++++++++++----------- Socket.IO-Client-Swift.podspec | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index e649531..3d69a8a 100644 --- a/README.md +++ b/README.md @@ -60,20 +60,20 @@ If you need Swift 1.2/Xcode 6.3/4 use v2.4.5 (Pre-Swift 2 support is no longer m If you need Swift 1.1/Xcode 6.2 use v1.5.2. (Pre-Swift 1.2 support is no longer maintained) -Carthage ------------------ -Add this line to your `Cartfile`: -``` -github "socketio/socket.io-client-swift" ~> 3.1.5 # Or latest version -``` - -Run `carthage update --platform ios,macosx`. - Manually (iOS 7+) ----------------- 1. Copy the SocketIOClientSwift folder into your Xcode project. (Make sure you add the files to your target(s)) 2. If you plan on using this from Objective-C, read [this](https://developer.apple.com/library/ios/documentation/Swift/Conceptual/BuildingCocoaApps/MixandMatch.html) on exposing Swift code to Objective-C. +Carthage +----------------- +Add this line to your `Cartfile`: +``` +github "socketio/socket.io-client-swift" ~> 3.1.6 # Or latest version +``` + +Run `carthage update --platform ios,macosx`. + CocoaPods 0.36.0 or later (iOS 8+) ------------------ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`: @@ -83,7 +83,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' use_frameworks! -pod 'Socket.IO-Client-Swift', '~> 3.1.5' # Or latest version +pod 'Socket.IO-Client-Swift', '~> 3.1.6' # Or latest version ``` Install pods: @@ -111,7 +111,7 @@ CocoaSeeds Add this line to your `Seedfile`: ``` -github "socketio/socket.io-client-swift", "v3.1.4", :files => "SocketIOClientSwift/*.swift" # Or latest version +github "socketio/socket.io-client-swift", "v3.1.6", :files => "SocketIOClientSwift/*.swift" # Or latest version ``` Run `seed install`. diff --git a/Socket.IO-Client-Swift.podspec b/Socket.IO-Client-Swift.podspec index eefb99c..14a6831 100644 --- a/Socket.IO-Client-Swift.podspec +++ b/Socket.IO-Client-Swift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Socket.IO-Client-Swift" - s.version = "3.1.5" + s.version = "3.1.6" s.summary = "Socket.IO-client for iOS and OS X" s.description = <<-DESC Socket.IO-client for iOS and OS X. @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.author = { "Erik" => "nuclear.ace@gmail.com" } s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.10' - s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v3.1.5' } + s.source = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v3.1.6' } s.source_files = "SocketIOClientSwift/**/*.swift" s.requires_arc = true # s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files