merge accelerators (#65)

* merge text chat

* merge annotation

* remove OTAcceleratorCore dependency for annotation

* fix textchat sample

* Update OTAcceleratorCore.podspec

* merge accelerators: update travis & README (#66)

* add new projects to travis file

* update README

* remove old sample repo

* pod deintegrate

.travis.yml

@@ -5,15 +5,19 @@ cache: cocoapods
 env:
   global:
   - LANG=en_US.UTF-8
-
   - WORKSPACE="OTAcceleratorCore.xcworkspace"
-  - IOS_SCHEME="OTAcceleratorCore"
   - IOS_SDK=iphonesimulator13.6
 
   matrix:
+  - DESTINATION="OS=12.4,name=iPhone 6s"   SDK="$IOS_SDK" SCHEME="OTAcceleratorCore" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="YES" RUN_UI_TESTS="YES"
+  - DESTINATION="OS=13.6,name=iPhone 11 Pro"   SDK="$IOS_SDK" SCHEME="OTAcceleratorCore" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="YES" RUN_UI_TESTS="YES"
+
+  - DESTINATION="OS=12.4,name=iPhone 6s"   SDK="$IOS_SDK" SCHEME="OTAnnotationSample" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="YES" RUN_UI_TESTS="YES"
+  - DESTINATION="OS=13.6,name=iPhone 11 Pro"   SDK="$IOS_SDK" SCHEME="OTAnnotationSample" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="YES" RUN_UI_TESTS="YES"
+
+  - DESTINATION="OS=12.4,name=iPhone 6s"     SDK="$IOS_SDK" SCHEME="OTTextChatSample" RUN_TESTS="YES" BUILD_EXAMPLE="NO"  POD_LINT="YES" RUN_UI_TESTS="NO"
+  - DESTINATION="OS=13.6,name=iPhone 11 Pro"   SDK="$IOS_SDK" SCHEME="OTTextChatSample" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES" RUN_UI_TESTS="NO"
 
-  - DESTINATION="OS=12.4,name=iPhone 6s"   SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="YES" RUN_UI_TESTS="YES"
-  - DESTINATION="OS=13.6,name=iPhone 11 Pro"   SDK="$IOS_SDK" SCHEME="$IOS_SCHEME" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="YES" RUN_UI_TESTS="YES"
 before_install:
   - gem install cocoapods --pre
   - pod update
@@ -30,6 +34,7 @@ script:
   else
     travis_retry xcodebuild clean build -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug | xcpretty -c;
   fi
+
 notifications:
   slack:
     rooms:

OTAcceleratorCore.podspec

@@ -1,12 +1,11 @@
 Pod::Spec.new do |s|
   s.name             = "OTAcceleratorCore"
 
-  s.version          = "2.0.1"
-  s.summary          = "A painless way to integrate WebRTC audio/video(screen sharing) to any iOS applications via OpenTok."
+  s.version          = "3.0.0"
+  s.summary          = "A painless way to integrate WebRTC audio/video(camera + screen sharing)/text to any iOS applications via OpenTok."
 
-  s.description      = "The OpenTok Accelerator Core is required whenever you use any of the OpenTok accelerators. The OpenTok Accelerator Core is a common layer that permits all accelerators and samples to share the same OpenTok session. The accelerator packs and sample app access the OpenTok session through the Accelerator Core Pack layer, which allows them to share a single OpenTok session.
-
-On the Android and iOS mobile platforms, when you try to set a listener (Android) or delegate (iOS), it is not normally possible to set multiple listeners or delegates for the same event. For example, on these mobile platforms you can only set one OpenTok signal listener. The Common Accelerator Session Pack, however, allows you to set up several listeners for the same event."
+  s.description      = "The OpenTok Accelerator Core is a collection of reusable components built on top of the OpenTok iOS SDK using best practices. The core components help you to use OpenTok to add one to one or multiparty audio and video calls to your application with screen sharing. The text chat components help add text messaging to your application, and the annotation components will help with sharing screen annotations.
+  For examples of the components in action clone the repository and try out the sample apps."
 
   s.homepage         = "https://github.com/opentok/accelerator-core-ios"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
@@ -15,17 +14,21 @@ On the Android and iOS mobile platforms, when you try to set a listener (Android
   s.social_media_url = 'https://twitter.com/vonagedev'
 
   s.platform     = :ios, '11.0'
+
   s.requires_arc = true
+  s.static_framework = true
 
   s.source_files = 'OTAcceleratorCore/**/*.{h,m}'
+  s.public_header_files = 'OTAcceleratorCore/**/*.{h}'
 
   s.resource_bundles = {
-    'OTAcceleratorCoreBundle' => ['OTAcceleratorCoreBundle/**/*.xib', 'OTAcceleratorCoreBundle/Assets.xcassets']
+    'OTAcceleratorCoreBundle' => [
+      'OTAcceleratorCoreBundle/**/*.xib', 'OTAcceleratorCoreBundle/Assets.xcassets',
+      'OTTextChatSampleBundle/**/*.xib', 'OTTextChatSampleBundle/Assets.xcassets',
+      'OTAnnotationSampleBundle/**/*.xib', 'OTAnnotationSampleBundle/Assets.xcassets']
   }
-
-  s.static_framework = true
-  s.public_header_files = 'OTAcceleratorCore/**/*.{h}'
-  s.dependency 'OTKAnalytics', '= 2.1.2'
-  s.dependency 'OpenTok', '2.18.0'
-  s.dependency 'SVProgressHUD', '= 2.2.5'
+
+  s.dependency 'OTKAnalytics', '2.1.2'
+  s.dependency 'OpenTok', '2.18.1'
+  s.dependency 'SVProgressHUD', '2.2.5'
 end