update to OT 2.24.0 (#70)

* update to OT 2.24.0

* update podspec

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   lint:
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Xcode version
         uses: maxim-lobanov/[email protected]
         with: 
-          xcode-version: '11.6'
+          xcode-version: '14.1'
       - name: Lint Podspec
         run: pod lib lint --use-libraries --allow-warnings --verbose   
 
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         scheme: [OTAcceleratorCore, OTAnnotationSample, OTTextChatSample]
-        destination: ['platform=iOS Simulator,name=iPhone 6s,OS=12.4', 'platform=iOS Simulator,name=iPhone 11,OS=13.6']
+        destination: ['platform=iOS Simulator,name=iPhone 14,OS=16.1']
 
     steps:
       - name: Checkout
@@ -41,11 +41,7 @@ jobs:
       - name: Setup Xcode version
         uses: maxim-lobanov/[email protected]
         with: 
-          xcode-version: '11.6'
-      - name: Prepare iOS 12 simulator
-        run: |
-            sudo mkdir -p /Library/Developer/CoreSimulator/Profiles/Runtimes
-            sudo ln -s /Applications/Xcode_10.3.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime /Library/Developer/CoreSimulator/Profiles/Runtimes/iOS\ 12.4.simruntime
+          xcode-version: '14.1'
       - name: Cocoapods
         run: pod update
       - name: Test ${{ matrix.scheme }}

.gitignore

@@ -59,3 +59,4 @@ fastlane/screenshots
 
 OTAcceleratorCore.xcworkspace
 iOSInjectionProject/
+.DS_Store

OTAcceleratorCore.podspec

@@ -27,6 +27,12 @@ Pod::Spec.new do |s|
       'OTTextChatSampleBundle/**/*.xib', 'OTTextChatSampleBundle/Assets.xcassets',
       'OTAnnotationSampleBundle/**/*.xib', 'OTAnnotationSampleBundle/Assets.xcassets']
   }
+
+   # See https://github.com/CocoaPods/CocoaPods/issues/10065
+   s.pod_target_xcconfig = {
+     'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'
+   }
+   s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
 
   s.dependency 'OTKAnalytics', '2.1.2'
   s.dependency 'OpenTok', '2.18.1'

OTAcceleratorCore.xcodeproj/xcshareddata/xcschemes/OTAcceleratorCore.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

OTAcceleratorCore.xcodeproj/xcshareddata/xcschemes/OTAcceleratorCoreTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

OTAcceleratorCore.xcodeproj/xcshareddata/xcschemes/OTAcceleratorCoreUITests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1410"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

OTAcceleratorCore/OTScreenCapture.m

@@ -356,5 +356,4 @@ - (void) consumeFrame:(CGImageRef)frame {
     CVPixelBufferUnlockBaseAddress(ref, 0);
 }
 
-
 @end

OTAnnotationSample/SendAnnotationViewController.swift

@@ -31,9 +31,6 @@ class SendAnnotationViewController: UIViewController, OTOneToOneCommunicatorData
                     self.sharer?.isPublishVideo = false
                 }
                 else if signal == .subscriberReady {
-                    self.sharer?.subscriberView.frame = self.shareView.bounds
-                    self.shareView.addSubview(self.sharer!.subscriberView)
-
                     self.annotator.dataSource = self
                     self.annotator.connect {
                         (signal, error) in

Podfile

@@ -1,9 +1,9 @@
 project 'OTAcceleratorCore.xcodeproj'
 
-platform :ios, '11.0'
+platform :ios, '12.0'
 
 def opentok_pod 
-  pod 'OpenTok', '2.18.0'
+  pod 'OpenTok', '2.24.0'
 end
 
 def shared_pods 
@@ -35,4 +35,4 @@ end
 target 'OTAnnotationTests' do
   opentok_pod
   pod 'Kiwi'
-end
+end

Podfile.lock

@@ -1,12 +1,14 @@
 PODS:
   - Kiwi (3.0.0)
-  - OpenTok (2.18.0)
+  - OpenTok (2.24.0):
+    - VonageWebRTC (= 99.2.39)
   - OTKAnalytics (2.1.2)
   - SVProgressHUD (2.2.5)
+  - VonageWebRTC (99.2.39)
 
 DEPENDENCIES:
   - Kiwi
-  - OpenTok (= 2.18.0)
+  - OpenTok (= 2.24.0)
   - OTKAnalytics (~> 2.1.2)
   - SVProgressHUD (~> 2.2.5)
 
@@ -16,13 +18,15 @@ SPEC REPOS:
     - OpenTok
     - OTKAnalytics
     - SVProgressHUD
+    - VonageWebRTC
 
 SPEC CHECKSUMS:
   Kiwi: fbeafef0f00e4d8f7dcb3420a4930afe70af77f7
-  OpenTok: bf4c81ff741e7976542c61b8f317882f8076eede
+  OpenTok: 6995850a6a7a37464ffece03ae0b8563b0f5445d
   OTKAnalytics: 2de2f8971b5af7f313882ada0b1eae25104296f4
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
+  VonageWebRTC: 4b57187170ef4ea435006e932600646a0521d6b0
 
-PODFILE CHECKSUM: ae6e6613dcc2470123bfbe5ca9e5834f241c46f5
+PODFILE CHECKSUM: d267e07ef26d14a58243988e5e487e02231ebc77
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.11.3