Merge pull request #307 from ably/ablyrealtime-pod

AblyRealtime pod

Ably.xcodeproj/project.pbxproj

@@ -51,7 +51,7 @@
 		856AAC991B6E312F00B07119 /* RestClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 856AAC981B6E312F00B07119 /* RestClient.swift */; };
 		856AAC9B1B6E326E00B07119 /* ably-common in Resources */ = {isa = PBXBuildFile; fileRef = 856AAC9A1B6E326E00B07119 /* ably-common */; };
 		85B2C2191B6FE8DE00EA5254 /* CompatibilityMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 85B2C2181B6FE8DE00EA5254 /* CompatibilityMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		85F0A60B1B6D039F00EFF45A /* Ably.h in Headers */ = {isa = PBXBuildFile; fileRef = 85F0A60A1B6D039F00EFF45A /* Ably.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		85F0A60B1B6D039F00EFF45A /* AblyRealtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 85F0A60A1B6D039F00EFF45A /* AblyRealtime.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		960D07931A45F1D800ED8C8C /* ARTCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 960D07911A45F1D800ED8C8C /* ARTCrypto.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		960D07941A45F1D800ED8C8C /* ARTCrypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 960D07921A45F1D800ED8C8C /* ARTCrypto.m */; };
 		960D07971A46FFC300ED8C8C /* ARTRest+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 960D07951A46FFC300ED8C8C /* ARTRest+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -262,8 +262,8 @@
 		856AAC981B6E312F00B07119 /* RestClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RestClient.swift; sourceTree = "<group>"; };
 		856AAC9A1B6E326E00B07119 /* ably-common */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "ably-common"; sourceTree = SOURCE_ROOT; };
 		85B2C2181B6FE8DE00EA5254 /* CompatibilityMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompatibilityMacros.h; sourceTree = "<group>"; };
-		85F0A60A1B6D039F00EFF45A /* Ably.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ably.h; sourceTree = "<group>"; };
-		85F0A60C1B6D03B700EFF45A /* Ably.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = Ably.modulemap; sourceTree = "<group>"; };
+		85F0A60A1B6D039F00EFF45A /* AblyRealtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AblyRealtime.h; sourceTree = "<group>"; };
+		85F0A60C1B6D03B700EFF45A /* AblyRealtime.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = AblyRealtime.modulemap; sourceTree = "<group>"; };
 		960D07911A45F1D800ED8C8C /* ARTCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARTCrypto.h; sourceTree = "<group>"; };
 		960D07921A45F1D800ED8C8C /* ARTCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTCrypto.m; sourceTree = "<group>"; };
 		960D07951A46FFC300ED8C8C /* ARTRest+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ARTRest+Private.h"; sourceTree = "<group>"; };
@@ -508,7 +508,7 @@
 		96BF61331A35B2AB004CF2B3 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				85F0A60A1B6D039F00EFF45A /* Ably.h */,
+				85F0A60A1B6D039F00EFF45A /* AblyRealtime.h */,
 				85B2C2181B6FE8DE00EA5254 /* CompatibilityMacros.h */,
 				1CD8DC9D1B1C7315007EAF36 /* ARTDefault.h */,
 				D7DC8AF01C6A9FFC005AF165 /* ARTDefault+Private.h */,
@@ -526,7 +526,7 @@
 		96BF61341A35B2AB004CF2B3 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				85F0A60C1B6D03B700EFF45A /* Ably.modulemap */,
+				85F0A60C1B6D03B700EFF45A /* AblyRealtime.modulemap */,
 				1C118A5B1AE63D89006AD19E /* Info.plist */,
 			);
 			name = "Supporting Files";
@@ -737,7 +737,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				85F0A60B1B6D039F00EFF45A /* Ably.h in Headers */,
+				85F0A60B1B6D039F00EFF45A /* AblyRealtime.h in Headers */,
 				96BF61531A35B39C004CF2B3 /* ARTRest.h in Headers */,
 				96A507BD1A3791490077CDF8 /* ARTRealtime.h in Headers */,
 				EB5E058D1C77027600A48B39 /* ARTCrypto+Private.h in Headers */,
@@ -1322,7 +1322,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = mh_dylib;
-				MODULEMAP_FILE = Source/Ably.modulemap;
+				MODULEMAP_FILE = Source/AblyRealtime.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.ably.$(PRODUCT_NAME)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SEPARATE_STRIP = YES;
@@ -1343,7 +1343,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACH_O_TYPE = mh_dylib;
-				MODULEMAP_FILE = Source/Ably.modulemap;
+				MODULEMAP_FILE = Source/AblyRealtime.modulemap;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.ably.$(PRODUCT_NAME)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SEPARATE_STRIP = YES;

AblyRealtime.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = "AblyRealtime"
-  s.version           = "0.8.0-beta.2"
+  s.version           = "0.8.0-beta.3"
   s.summary           = "iOS client for Ably"
   s.description       = <<-DESC
                         iOS client library for ably.io, the realtime messaging service, written in Objective-C and ready for Swift 2.0.
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.platform          = :ios, '8.0'
   s.requires_arc      = true
   s.source_files      = 'Source/*.{h,m}'
-  s.module_map        = 'Source/Ably.modulemap'
+  s.module_map        = 'Source/AblyRealtime.modulemap'
   s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '$CONFIGURATION_BUILD_DIR/SwiftWebSocket.framework/Headers' }
   s.dependency 'SwiftWebSocket', '~> 2.5'
 end

README.md

@@ -16,7 +16,7 @@ You can install Ably for iOS through CocoaPods, Carthage or manually.
 
 Add this line to your application's Podfile:
 
-    pod 'Ably', :git => 'https://github.com/ably/ably-ios.git', :branch => '0.8.0-beta.1'
+    pod 'AblyRealtime', '~> 0.8'
 
 And then install the dependency:
 

Source/ARTAuthOptions.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <Ably/ARTTypes.h>
+#import "ARTTypes.h"
 
 @class ARTTokenDetails;
 

Source/AblyRealtime.h

@@ -0,0 +1,58 @@
+//
+//  Ably.h
+//  Ably
+//
+//  Created by vic on 19/04/2015.
+//  Copyright (c) 2015 Ably. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for ably-ios.
+FOUNDATION_EXPORT double ablyVersionNumber;
+
+//! Project version string for ably-ios.
+FOUNDATION_EXPORT const unsigned char ablyVersionString[];
+
+#import "ARTLog.h"
+#import "ARTTypes.h"
+
+#import "ARTAuth.h"
+#import "ARTConnection.h"
+#import "ARTConnectionDetails.h"
+#import "ARTHttp.h"
+#import "ARTBaseMessage.h"
+#import "ARTRestChannels.h"
+#import "ARTChannelOptions.h"
+#import "ARTTokenDetails.h"
+#import "ARTTokenRequest.h"
+#import "ARTTokenParams.h"
+#import "ARTAuthOptions.h"
+#import "ARTClientOptions.h"
+#import "ARTCrypto.h"
+#import "ARTDefault.h"
+#import "ARTEventEmitter.h"
+#import "ARTFallback.h"
+#import "ARTMessage.h"
+#import "ARTDataEncoder.h"
+#import "ARTPresence.h"
+#import "ARTPresenceMap.h"
+#import "ARTPresenceMessage.h"
+#import "ARTProtocolMessage.h"
+#import "ARTQueuedMessage.h"
+#import "ARTRest.h"
+#import "ARTRestChannel.h"
+#import "ARTRestPresence.h"
+#import "ARTRealtime.h"
+#import "ARTRealtimeChannel.h"
+#import "ARTRealtimePresence.h"
+#import "ARTRealtimeTransport.h"
+#import "ARTStats.h"
+#import "ARTWebSocketTransport.h"
+#import "ARTEncoder.h"
+#import "ARTJsonEncoder.h"
+#import "ARTPaginatedResult.h"
+
+#import "ARTNSDictionary+ARTDictionaryUtil.h"
+#import "ARTNSDate+ARTUtil.h"
+#import "ARTNSArray+ARTFunctional.h"

Source/Ably.modulemap → Source/AblyRealtime.modulemap

@@ -1,5 +1,5 @@
-framework module Ably {
-    umbrella header "Ably.h"
+framework module AblyRealtime {
+    umbrella header "AblyRealtime.h"
 
     export *
     module * { export * }

Spec/AblySpec-Bridging-Header.h

@@ -2,7 +2,7 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 
-#include <ably/ably.h>
+#include "AblyRealtime.h"
 #include <asl.h>
 #include "NSObject+TestSuite.h"
 #include "ARTTestUtil.h"

Spec/NSObject+TestSuite.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <ably/CompatibilityMacros.h>
+#import "CompatibilityMacros.h"
 
 /// `NSObject` extensions. Aspects lib allows you to add code to existing methods but it has some limitations with Swift because the NSInvocation is unavailable: https://developer.apple.com/library/mac/documentation/Cocoa/Reference/Foundation/Classes/NSInvocation_Class/
 @interface NSObject (TestSuite)

Spec/RealtimeClientChannel.swift

@@ -10,8 +10,6 @@ import Quick
 import Nimble
 import Aspects
 
-import Ably.Private
-
 class RealtimeClientChannel: QuickSpec {
     override func spec() {
         describe("Channel") {

Spec/RestClient.swift

@@ -9,8 +9,6 @@
 import Nimble
 import Quick
 
-import Ably.Private
-
 class RestClient: QuickSpec {
     override func spec() {
 

Spec/TestUtilities.swift

@@ -13,7 +13,7 @@ import Nimble
 import SwiftyJSON
 import SwiftWebSocket
 
-import Ably.Private
+import AblyRealtime.Private
 
 enum CryptoTest: String {
     case aes128 = "crypto-data-128"

Tests/ARTReadmeExamples.m

@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 #import "ARTTestUtil.h"
-#import "ably.h"
+#import "AblyRealtime.h"
 
 @interface ARTReadmeExamples : XCTestCase
 @end