Merge pull request #2 from twilio/public-beta-changes

Supporting public beta changes

.gitignore

@@ -0,0 +1 @@
+.DS_Store

QuickStart-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.16.1</string>
+	<string>0.20.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

QuickStart.xcodeproj/project.pbxproj

@@ -10,8 +10,6 @@
 		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
 		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
 		288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
-		4B830A6C1B8D3E29008337AB /* TwilioConversationsClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B830A6B1B8D3E29008337AB /* TwilioConversationsClient.framework */; };
-		4BDF83CB1C0FFD0C00A1785D /* TwilioCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BDF83CA1C0FFD0C00A1785D /* TwilioCommon.framework */; };
 		582432311AD729F900B261D7 /* CreateConversationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5824322C1AD729F900B261D7 /* CreateConversationViewController.m */; };
 		80250E4313B178C4009B4E18 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80250E4213B178C4009B4E18 /* AudioToolbox.framework */; };
 		80250E4713B178C9009B4E18 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 80250E4613B178C9009B4E18 /* CFNetwork.framework */; };
@@ -41,8 +39,6 @@
 		1D6058910D05DD3D006BFB54 /* QuickStart.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QuickStart.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		4B830A6B1B8D3E29008337AB /* TwilioConversationsClient.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TwilioConversationsClient.framework; path = ../../TwilioConversationsClient.framework; sourceTree = SOURCE_ROOT; };
-		4BDF83CA1C0FFD0C00A1785D /* TwilioCommon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TwilioCommon.framework; path = ../../TwilioCommon.framework; sourceTree = "<group>"; };
 		5824322B1AD729F900B261D7 /* CreateConversationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = CreateConversationViewController.h; path = Modules/CreateConversationViewController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		5824322C1AD729F900B261D7 /* CreateConversationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = CreateConversationViewController.m; path = Modules/CreateConversationViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		80250E4213B178C4009B4E18 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -78,8 +74,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4BDF83CB1C0FFD0C00A1785D /* TwilioCommon.framework in Frameworks */,
-				4B830A6C1B8D3E29008337AB /* TwilioConversationsClient.framework in Frameworks */,
 				CEF910E51A8BA79A00908DE7 /* VideoToolbox.framework in Frameworks */,
 				E16F56411A3B5D2F0043BE48 /* CoreMedia.framework in Frameworks */,
 				E10672AF1A2DA21600241589 /* CoreVideo.framework in Frameworks */,
@@ -136,8 +130,6 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				4BDF83CA1C0FFD0C00A1785D /* TwilioCommon.framework */,
-				4B830A6B1B8D3E29008337AB /* TwilioConversationsClient.framework */,
 				CEF910E41A8BA79A00908DE7 /* VideoToolbox.framework */,
 				E16F56401A3B5D2F0043BE48 /* CoreMedia.framework */,
 				E16F56341A3B391F0043BE48 /* libc++.dylib */,
@@ -309,13 +301,13 @@
 					"$(SRCROOT)/../TwilioSDK/TwilioSDK/Sources/Objective-C/Interfaces",
 				);
 				INFOPLIST_FILE = "QuickStart-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.TwilioRTCQuickstart;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.TwilioConversationsQuickstart;
 				PRODUCT_NAME = QuickStart;
 				PROVISIONING_PROFILE = "";
 				VALIDATE_PRODUCT = YES;
@@ -342,13 +334,13 @@
 					"$(SRCROOT)/../TwilioSDK/TwilioSDK/Sources/Objective-C/Interfaces",
 				);
 				INFOPLIST_FILE = "QuickStart-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.TwilioRTCQuickstart;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.TwilioConversationsQuickstart;
 				PRODUCT_NAME = QuickStart;
 				PROVISIONING_PROFILE = "";
 				VALIDATE_PRODUCT = YES;

Resources/Base.lproj/LaunchScreen.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1509" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
@@ -12,15 +12,15 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="iOS Private Beta Quickstart" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="jmf-3S-EFm">
-                    <rect key="frame" x="118" y="178" width="245" height="26"/>
-                    <fontDescription key="fontDescription" type="system" weight="light" pointSize="21"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Twilio Video - Conversations Framework" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                    <rect key="frame" x="20" y="153" width="440" height="16"/>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="13"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Twilio Real-Time Communications SDK" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="153" width="440" height="16"/>
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="13"/>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="iOS Beta Quickstart" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="jmf-3S-EFm">
+                    <rect key="frame" x="152" y="177" width="178" height="26"/>
+                    <fontDescription key="fontDescription" type="system" weight="light" pointSize="21"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>

Resources/Base.lproj/Main.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="aUV-86-IWw">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1509" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="aUV-86-IWw">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>

Sources/AppDelegate.h

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.h
-//  Twilio RTC iOS Quickstart
+//  Twilio Video - Conversations Quickstart
 //
 
 #import <UIKit/UIKit.h>

Sources/AppDelegate.m

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.m
-//  Twilio RTC iOS Quickstart
+//  Twilio Video - Conversations Quickstart
 //
 
 #import "AppDelegate.h"

Sources/Modules/ConversationViewController.h

@@ -1,6 +1,6 @@
 //
 //  ConversationViewController.h
-//  Twilio RTC iOS Quickstart
+//  Twilio Video - Conversations Quickstart
 //
 
 #import <UIKit/UIKit.h>

Sources/Modules/ConversationViewController.m

@@ -1,6 +1,6 @@
 //
 //  ConversationViewController.m
-//  Twilio RTC iOS Quickstart
+//  Twilio Video - Conversations Quickstart
 //
 
 

Sources/Modules/CreateConversationViewController.h

@@ -1,6 +1,6 @@
 //
 //  CreateConversationViewController.h
-//  Twilio RTC iOS Quickstart
+//  Twilio Video - Conversations Quickstart
 //
 
 #import <UIKit/UIKit.h>

Sources/Modules/CreateConversationViewController.m

@@ -1,6 +1,6 @@
 //
 //  CreateConversationViewController.m
-//  Twilio RTC iOS Quickstart
+//  Twilio Video - Conversations Quickstart
 //
 
 #import "CreateConversationViewController.h"

Sources/main.m

@@ -1,6 +1,6 @@
 //
 //  main.m
-//  Twilio RTC iOS Quickstart
+//  Twilio Video - Conversations Quickstart
 //
 
 #import "AppDelegate.h"