Skip to content

Commit b6e8339

Browse files
goncalocostamendesgoncalocostamendes
authored
OPENTOK-48553: Update all samples to 2.23.1 (#265)
* Update Basic Video Chat to latest Opentok SDK version * Update minSdkVersion * Solve architecture problem * Add Archiving workspace * Add new instructions * Rollback Archiving to previous version * Upgrade version for Archiving * Exclude i386 architecture * Update SDK version * Exclude arm64 arch * Remove changes to Appi icon file * Rename min ios sdk version needed to be used * Remove undesired pod commands * Update samples to point to new min ios sdk version allowed
1 parent a4397ba commit b6e8339

File tree

32 files changed

+189
-45
lines changed

32 files changed

+189
-45
lines changed

‎Archiving/Archiving.xcodeproj/project.pbxproj

+47
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
1F1C01201AE1E3AD005B4396 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F1C01121AE1E3AD005B4396 /* CoreGraphics.framework */; };
2323
1F1C01211AE1E3AD005B4396 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F1C01131AE1E3AD005B4396 /* UIKit.framework */; };
2424
1F1C01271AE1E5F0005B4396 /* OpenTok.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F1C01261AE1E5F0005B4396 /* OpenTok.framework */; };
25+
4FF1947232FFA5AEA0687859 /* Pods_Archiving.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85AE61EAEA7E32C8C10EF0C9 /* Pods_Archiving.framework */; };
2526
A06E8B5D1EAE5B04003DF42F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A06E8B491EAE5B04003DF42F /* AppDelegate.m */; };
2627
A06E8B5E1EAE5B04003DF42F /* archiving_on-10.png in Resources */ = {isa = PBXBuildFile; fileRef = A06E8B4A1EAE5B04003DF42F /* archiving_on-10.png */; };
2728
A06E8B5F1EAE5B04003DF42F /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = A06E8B4B1EAE5B04003DF42F /* LaunchScreen.xib */; };
@@ -48,6 +49,8 @@
4849
1F1C01131AE1E3AD005B4396 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
4950
1F1C01261AE1E5F0005B4396 /* OpenTok.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = OpenTok.framework; sourceTree = "<group>"; };
5051
1F3FEE601AE19ECA002E2CF8 /* Archiving.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Archiving.app; sourceTree = BUILT_PRODUCTS_DIR; };
52+
749AFA94F73FBC5FD27684CF /* Pods-Archiving.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Archiving.release.xcconfig"; path = "Target Support Files/Pods-Archiving/Pods-Archiving.release.xcconfig"; sourceTree = "<group>"; };
53+
85AE61EAEA7E32C8C10EF0C9 /* Pods_Archiving.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Archiving.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5154
A06E8B481EAE5B04003DF42F /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
5255
A06E8B491EAE5B04003DF42F /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
5356
A06E8B4A1EAE5B04003DF42F /* archiving_on-10.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "archiving_on-10.png"; sourceTree = "<group>"; };
@@ -60,6 +63,7 @@
6063
A06E8B5C1EAE5B04003DF42F /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
6164
A072973F1EAE5C2900A2DB1E /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config.h; sourceTree = "<group>"; };
6265
A07297401EAE5D2C00A2DB1E /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
66+
C28E98648C2A3599531DD748 /* Pods-Archiving.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Archiving.debug.xcconfig"; path = "Target Support Files/Pods-Archiving/Pods-Archiving.debug.xcconfig"; sourceTree = "<group>"; };
6367
/* End PBXFileReference section */
6468

6569
/* Begin PBXFrameworksBuildPhase section */
@@ -82,6 +86,7 @@
8286
1F1C011B1AE1E3AD005B4396 /* SystemConfiguration.framework in Frameworks */,
8387
1F1C01151AE1E3AD005B4396 /* libxml2.dylib in Frameworks */,
8488
1F1C011D1AE1E3AD005B4396 /* CoreVideo.framework in Frameworks */,
89+
4FF1947232FFA5AEA0687859 /* Pods_Archiving.framework in Frameworks */,
8590
);
8691
runOnlyForDeploymentPostprocessing = 0;
8792
};
@@ -106,6 +111,7 @@
106111
1F1C01111AE1E3AD005B4396 /* Foundation.framework */,
107112
1F1C01121AE1E3AD005B4396 /* CoreGraphics.framework */,
108113
1F1C01131AE1E3AD005B4396 /* UIKit.framework */,
114+
85AE61EAEA7E32C8C10EF0C9 /* Pods_Archiving.framework */,
109115
);
110116
name = Frameworks;
111117
sourceTree = "<group>";
@@ -117,6 +123,7 @@
117123
A06E8B471EAE5B04003DF42F /* Archiving */,
118124
1F1C01051AE1E399005B4396 /* Frameworks */,
119125
1F3FEE611AE19ECA002E2CF8 /* Products */,
126+
DDCD9B90DDB444A26BF28AC7 /* Pods */,
120127
);
121128
sourceTree = "<group>";
122129
};
@@ -146,13 +153,23 @@
146153
path = Archiving;
147154
sourceTree = "<group>";
148155
};
156+
DDCD9B90DDB444A26BF28AC7 /* Pods */ = {
157+
isa = PBXGroup;
158+
children = (
159+
C28E98648C2A3599531DD748 /* Pods-Archiving.debug.xcconfig */,
160+
749AFA94F73FBC5FD27684CF /* Pods-Archiving.release.xcconfig */,
161+
);
162+
path = Pods;
163+
sourceTree = "<group>";
164+
};
149165
/* End PBXGroup section */
150166

151167
/* Begin PBXNativeTarget section */
152168
1F3FEE5F1AE19ECA002E2CF8 /* Archiving */ = {
153169
isa = PBXNativeTarget;
154170
buildConfigurationList = 1F3FEE831AE19ECA002E2CF8 /* Build configuration list for PBXNativeTarget "Archiving" */;
155171
buildPhases = (
172+
6EB2644BD0AEFCED2D1F9D28 /* [CP] Check Pods Manifest.lock */,
156173
1F3FEE5C1AE19ECA002E2CF8 /* Sources */,
157174
1F3FEE5D1AE19ECA002E2CF8 /* Frameworks */,
158175
1F3FEE5E1AE19ECA002E2CF8 /* Resources */,
@@ -214,6 +231,31 @@
214231
};
215232
/* End PBXResourcesBuildPhase section */
216233

234+
/* Begin PBXShellScriptBuildPhase section */
235+
6EB2644BD0AEFCED2D1F9D28 /* [CP] Check Pods Manifest.lock */ = {
236+
isa = PBXShellScriptBuildPhase;
237+
buildActionMask = 2147483647;
238+
files = (
239+
);
240+
inputFileListPaths = (
241+
);
242+
inputPaths = (
243+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
244+
"${PODS_ROOT}/Manifest.lock",
245+
);
246+
name = "[CP] Check Pods Manifest.lock";
247+
outputFileListPaths = (
248+
);
249+
outputPaths = (
250+
"$(DERIVED_FILE_DIR)/Pods-Archiving-checkManifestLockResult.txt",
251+
);
252+
runOnlyForDeploymentPostprocessing = 0;
253+
shellPath = /bin/sh;
254+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
255+
showEnvVarsInLog = 0;
256+
};
257+
/* End PBXShellScriptBuildPhase section */
258+
217259
/* Begin PBXSourcesBuildPhase section */
218260
1F3FEE5C1AE19ECA002E2CF8 /* Sources */ = {
219261
isa = PBXSourcesBuildPhase;
@@ -350,16 +392,19 @@
350392
};
351393
1F3FEE841AE19ECA002E2CF8 /* Debug */ = {
352394
isa = XCBuildConfiguration;
395+
baseConfigurationReference = C28E98648C2A3599531DD748 /* Pods-Archiving.debug.xcconfig */;
353396
buildSettings = {
354397
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
355398
CODE_SIGN_STYLE = Manual;
356399
DEVELOPMENT_TEAM = "";
400+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
357401
FRAMEWORK_SEARCH_PATHS = (
358402
"$(inherited)",
359403
"$(PROJECT_DIR)",
360404
);
361405
INFOPLIST_FILE = "$(SRCROOT)/Archiving/Info.plist";
362406
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
407+
ONLY_ACTIVE_ARCH = YES;
363408
PRODUCT_BUNDLE_IDENTIFIER = "com.tokbox.$(PRODUCT_NAME:rfc1034identifier)";
364409
PRODUCT_NAME = "$(TARGET_NAME)";
365410
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -368,10 +413,12 @@
368413
};
369414
1F3FEE851AE19ECA002E2CF8 /* Release */ = {
370415
isa = XCBuildConfiguration;
416+
baseConfigurationReference = 749AFA94F73FBC5FD27684CF /* Pods-Archiving.release.xcconfig */;
371417
buildSettings = {
372418
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
373419
CODE_SIGN_STYLE = Manual;
374420
DEVELOPMENT_TEAM = "";
421+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64";
375422
FRAMEWORK_SEARCH_PATHS = (
376423
"$(inherited)",
377424
"$(PROJECT_DIR)",

‎Archiving/Archiving.xcworkspace/contents.xcworkspacedata

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Archiving/Archiving.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Archiving/Podfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
platform :ios, '9.0'
2-
use_frameworks!
3-
41
require_relative '../OpenTokSDKVersion'
52

3+
platform :ios, '12.0'
4+
use_frameworks!
5+
66
target 'Archiving' do
7-
pod 'OpenTok', OpenTokSDKVersion
7+
pod 'OpenTok', '2.23.0'
88
end

‎Audio-Levels/Audio-Levels.xcodeproj/project.pbxproj

+2
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@
358358
COPY_PHASE_STRIP = NO;
359359
ENABLE_STRICT_OBJC_MSGSEND = YES;
360360
ENABLE_TESTABILITY = YES;
361+
"EXCLUDED_ARCHS[sdk=*]" = i386;
361362
GCC_C_LANGUAGE_STANDARD = gnu99;
362363
GCC_DYNAMIC_NO_PIC = NO;
363364
GCC_NO_COMMON_BLOCKS = YES;
@@ -412,6 +413,7 @@
412413
COPY_PHASE_STRIP = YES;
413414
ENABLE_NS_ASSERTIONS = NO;
414415
ENABLE_STRICT_OBJC_MSGSEND = YES;
416+
"EXCLUDED_ARCHS[sdk=*]" = i386;
415417
GCC_C_LANGUAGE_STANDARD = gnu99;
416418
GCC_NO_COMMON_BLOCKS = YES;
417419
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

‎Audio-Levels/Podfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
platform :ios, '12.0'
2-
use_frameworks!
3-
41
require_relative '../OpenTokSDKVersion'
52

3+
platform :ios, MinIosSdkVersion
4+
use_frameworks!
5+
66
target 'Audio-Levels' do
77
pod 'OpenTok', OpenTokSDKVersion
88
end

‎Basic-Video-Chat-XCFramework/Basic-Video-Chat.xcodeproj/project.pbxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
DCF43CEF4CF932797089F41D /* Pods-Basic-Video-Chat.release.xcconfig */,
103103
ABA0364B307041AF8D0D0FC6 /* Pods-Basic-Video-Chat.debug.xcconfig */,
104104
);
105-
name = Pods;
106105
path = Pods;
107106
sourceTree = "<group>";
108107
};
@@ -289,6 +288,7 @@
289288
COPY_PHASE_STRIP = YES;
290289
ENABLE_NS_ASSERTIONS = NO;
291290
ENABLE_STRICT_OBJC_MSGSEND = YES;
291+
"EXCLUDED_ARCHS[sdk=*]" = i386;
292292
GCC_C_LANGUAGE_STANDARD = gnu99;
293293
GCC_NO_COMMON_BLOCKS = YES;
294294
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -355,6 +355,8 @@
355355
ENABLE_NS_ASSERTIONS = NO;
356356
ENABLE_STRICT_OBJC_MSGSEND = YES;
357357
ENABLE_TESTABILITY = YES;
358+
EXCLUDED_ARCHS = "";
359+
"EXCLUDED_ARCHS[sdk=*]" = i386;
358360
GCC_C_LANGUAGE_STANDARD = gnu99;
359361
GCC_NO_COMMON_BLOCKS = YES;
360362
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

‎Basic-Video-Chat-XCFramework/Podfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
platform :ios, '9.0'
2-
use_frameworks!
3-
41
require_relative '../OpenTokSDKVersion'
52

3+
platform :ios, MinIosSdkVersion
4+
use_frameworks!
5+
66
target 'Basic-Video-Chat' do
77
pod 'OTXCFramework', OpenTokSDKVersion
88
end

‎Basic-Video-Chat/Podfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
platform :ios, '9.0'
2-
use_frameworks!
3-
41
require_relative '../OpenTokSDKVersion'
52

3+
platform :ios, MinIosSdkVersion
4+
use_frameworks!
5+
66
target 'Basic-Video-Chat' do
77
pod 'OpenTok', OpenTokSDKVersion
88
end

0 commit comments

Comments
 (0)