Skip to content
This repository has been archived by the owner on Apr 4, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mogol
mogol committed Oct 22, 2016
2 parents 3026740 + 0ed4b81 commit 8ff91fe
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 27 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
language: objective-c
cache: cocoapods
podfile: Example/Podfile
osx_image: xcode7.3
osx_image: xcode8
rvm:
- 2.2.2
before_install:
- gem install cocoapods xcpretty --no-ri --no-rdoc
- pod repo update
- pod install --project-directory=Example
script:
- set -o pipefail && xcodebuild test -workspace Example/CentrifugeiOS.xcworkspace -scheme CentrifugeiOS-Example -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 5' ONLY_ACTIVE_ARCH=NO | xcpretty
Expand Down
9 changes: 6 additions & 3 deletions CentrifugeiOS.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "CentrifugeiOS"
s.version = "1.0.0"
s.version = "2.0.0"
s.summary = "Swifty iOS client for Centrifuge."
s.description = <<-DESC
iOS client for Centrifuge https://github.com/centrifugal/Centrifuge. It uses SwiftWebSocket and helpers classes to communicate with Centrifuge server.
Expand All @@ -12,10 +12,13 @@ Pod::Spec.new do |s|
s.source = { :git => "https://github.com/centrifugal/centrifuge-ios.git", :tag => s.version.to_s }
s.social_media_url = 'https://twitter.com/saprykinh'

s.ios.deployment_target = '8.0'
s.ios.deployment_target = '9.3'

s.source_files = 'CentrifugeiOS/Classes/**/*'

s.dependency 'SwiftWebSocket', '2.6.4'
s.dependency 'IDZSwiftCommonCrypto', '0.8.1'
s.dependency 'IDZSwiftCommonCrypto', '0.8.3'
s.xcconfig = {
'SWIFT_VERSION' => '2.3'
}
end
44 changes: 22 additions & 22 deletions Example/CentrifugeiOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 607FACEF1AFB9204008FA782 /* Build configuration list for PBXNativeTarget "CentrifugeiOS_Example" */;
buildPhases = (
53C30FFB2485660AACB4F2A9 /* Check Pods Manifest.lock */,
53C30FFB2485660AACB4F2A9 /* [CP] Check Pods Manifest.lock */,
607FACCC1AFB9204008FA782 /* Sources */,
607FACCD1AFB9204008FA782 /* Frameworks */,
607FACCE1AFB9204008FA782 /* Resources */,
52D32607063DF07BF4EAE227 /* Embed Pods Frameworks */,
D3695F3D6BB14C5DD278A2CA /* Copy Pods Resources */,
52D32607063DF07BF4EAE227 /* [CP] Embed Pods Frameworks */,
D3695F3D6BB14C5DD278A2CA /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -207,12 +207,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 607FACF21AFB9204008FA782 /* Build configuration list for PBXNativeTarget "CentrifugeiOS_Tests" */;
buildPhases = (
F7A970C317D648607CFE4595 /* Check Pods Manifest.lock */,
F7A970C317D648607CFE4595 /* [CP] Check Pods Manifest.lock */,
607FACE11AFB9204008FA782 /* Sources */,
607FACE21AFB9204008FA782 /* Frameworks */,
607FACE31AFB9204008FA782 /* Resources */,
F7C77600DD5EC9486A927B36 /* Embed Pods Frameworks */,
C82D15DBF4CD35FC4A384A43 /* Copy Pods Resources */,
F7C77600DD5EC9486A927B36 /* [CP] Embed Pods Frameworks */,
C82D15DBF4CD35FC4A384A43 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -283,89 +283,89 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
52D32607063DF07BF4EAE227 /* Embed Pods Frameworks */ = {
52D32607063DF07BF4EAE227 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CentrifugeiOS_Example/Pods-CentrifugeiOS_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
53C30FFB2485660AACB4F2A9 /* Check Pods Manifest.lock */ = {
53C30FFB2485660AACB4F2A9 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
C82D15DBF4CD35FC4A384A43 /* Copy Pods Resources */ = {
C82D15DBF4CD35FC4A384A43 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CentrifugeiOS_Tests/Pods-CentrifugeiOS_Tests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
D3695F3D6BB14C5DD278A2CA /* Copy Pods Resources */ = {
D3695F3D6BB14C5DD278A2CA /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CentrifugeiOS_Example/Pods-CentrifugeiOS_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
F7A970C317D648607CFE4595 /* Check Pods Manifest.lock */ = {
F7A970C317D648607CFE4595 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
F7C77600DD5EC9486A927B36 /* Embed Pods Frameworks */ = {
F7C77600DD5EC9486A927B36 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -444,7 +444,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -482,7 +482,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand Down
2 changes: 2 additions & 0 deletions Example/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ end
post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |configuration|
target.build_settings(configuration.name)['SWIFT_VERSION'] = '2.3'

if target.name == 'CentrifugeiOS'
target.build_settings(configuration.name)['ENABLE_TESTABILITY'] = 'YES'
end
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ See the example project and [docs](https://fzambia.gitbooks.io/centrifugal/conte
## Requirements

* Version 0.1.0: Swift 2.2, iOS 8.0+
* Version 1.0.0: Swift 2.3, iOS 8.0+
* Version 1.0.0: Swift 2.3, iOS 8.0+, Xcode 7
* Version 2.0.0: Swift 2.3, iOS 9.3+, Xcode 8

## Installation

Expand Down

0 comments on commit 8ff91fe

Please sign in to comment.