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

Commit cb41a7d

Browse files
committed
Updated files to swift 3.0
1 parent 2f2145c commit cb41a7d

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3
1+
3.0

CentrifugeiOS.podspec

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "CentrifugeiOS"
3-
s.version = "2.0.0"
3+
s.version = "3.0.0"
44
s.summary = "Swifty iOS client for Centrifuge."
55
s.description = <<-DESC
66
iOS client for Centrifuge https://github.com/centrifugal/Centrifuge. It uses SwiftWebSocket and helpers classes to communicate with Centrifuge server.
@@ -16,9 +16,6 @@ Pod::Spec.new do |s|
1616

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

19-
s.dependency 'SwiftWebSocket', '2.6.4'
20-
s.dependency 'IDZSwiftCommonCrypto', '0.8.3'
21-
s.xcconfig = {
22-
'SWIFT_VERSION' => '2.3'
23-
}
19+
s.dependency 'SwiftWebSocket', '~>2.6.0'
20+
s.dependency 'IDZSwiftCommonCrypto', '~>0.9.0'
2421
end

Example/CentrifugeiOS.xcodeproj/project.pbxproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
isa = PBXProject;
232232
attributes = {
233233
LastSwiftUpdateCheck = 0730;
234-
LastUpgradeCheck = 0720;
234+
LastUpgradeCheck = 0810;
235235
ORGANIZATIONNAME = CocoaPods;
236236
TargetAttributes = {
237237
607FACCF1AFB9204008FA782 = {
@@ -410,6 +410,7 @@
410410
607FACED1AFB9204008FA782 /* Debug */ = {
411411
isa = XCBuildConfiguration;
412412
buildSettings = {
413+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
413414
ALWAYS_SEARCH_USER_PATHS = NO;
414415
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
415416
CLANG_CXX_LIBRARY = "libc++";
@@ -420,8 +421,10 @@
420421
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
421422
CLANG_WARN_EMPTY_BODY = YES;
422423
CLANG_WARN_ENUM_CONVERSION = YES;
424+
CLANG_WARN_INFINITE_RECURSION = YES;
423425
CLANG_WARN_INT_CONVERSION = YES;
424426
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
427+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
425428
CLANG_WARN_UNREACHABLE_CODE = YES;
426429
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
427430
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -449,12 +452,14 @@
449452
ONLY_ACTIVE_ARCH = YES;
450453
SDKROOT = iphoneos;
451454
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
455+
SWIFT_VERSION = 3.0.1;
452456
};
453457
name = Debug;
454458
};
455459
607FACEE1AFB9204008FA782 /* Release */ = {
456460
isa = XCBuildConfiguration;
457461
buildSettings = {
462+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
458463
ALWAYS_SEARCH_USER_PATHS = NO;
459464
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
460465
CLANG_CXX_LIBRARY = "libc++";
@@ -465,8 +470,10 @@
465470
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
466471
CLANG_WARN_EMPTY_BODY = YES;
467472
CLANG_WARN_ENUM_CONVERSION = YES;
473+
CLANG_WARN_INFINITE_RECURSION = YES;
468474
CLANG_WARN_INT_CONVERSION = YES;
469475
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
476+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
470477
CLANG_WARN_UNREACHABLE_CODE = YES;
471478
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
472479
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -485,6 +492,8 @@
485492
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
486493
MTL_ENABLE_DEBUG_INFO = NO;
487494
SDKROOT = iphoneos;
495+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
496+
SWIFT_VERSION = 3.0.1;
488497
VALIDATE_PRODUCT = YES;
489498
};
490499
name = Release;
@@ -522,6 +531,7 @@
522531
isa = XCBuildConfiguration;
523532
baseConfigurationReference = 43B68F71967CC843D9E1A086 /* Pods-CentrifugeiOS_Tests.debug.xcconfig */;
524533
buildSettings = {
534+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
525535
FRAMEWORK_SEARCH_PATHS = (
526536
"$(SDKROOT)/Developer/Library/Frameworks",
527537
"$(inherited)",
@@ -541,6 +551,7 @@
541551
isa = XCBuildConfiguration;
542552
baseConfigurationReference = 2881904D9F759B915BFBD765 /* Pods-CentrifugeiOS_Tests.release.xcconfig */;
543553
buildSettings = {
554+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
544555
FRAMEWORK_SEARCH_PATHS = (
545556
"$(SDKROOT)/Developer/Library/Frameworks",
546557
"$(inherited)",

Example/CentrifugeiOS.xcodeproj/xcshareddata/xcschemes/CentrifugeiOS-Example.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0720"
3+
LastUpgradeVersion = "0810"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Example/Podfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ end
1111
post_install do |installer|
1212
installer.pods_project.targets.each do |target|
1313
target.build_configurations.each do |configuration|
14-
target.build_settings(configuration.name)['SWIFT_VERSION'] = '2.3'
15-
1614
if target.name == 'CentrifugeiOS'
1715
target.build_settings(configuration.name)['ENABLE_TESTABILITY'] = 'YES'
1816
end

0 commit comments

Comments
 (0)